From 14ac5fc4d20d9a75431a370e8b0da12555dbaed8 Mon Sep 17 00:00:00 2001
From: Thomas Wolf <thomas.wolf@paranor.ch>
Date: Sun, 24 Oct 2021 17:39:37 +0200
Subject: [PATCH] Include JNA in the target platform

It's needed by the SSH agent support in JGit. Also add it to the extra
bundles in the p2 repository.

Change-Id: Ie89995bbf93ef74d0ed34d17837d356f646aee32
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
---
 org.eclipse.egit.repository/category.xml                  | 12 ++++++++++++
 org.eclipse.egit.target/egit-4.17.target                  |  6 +++++-
 org.eclipse.egit.target/egit-4.18.target                  |  6 +++++-
 org.eclipse.egit.target/egit-4.19.target                  |  6 +++++-
 org.eclipse.egit.target/egit-4.20.target                  |  6 +++++-
 org.eclipse.egit.target/egit-4.21.target                  |  6 +++++-
 org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd |  4 ++++
 7 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
index 42f8b7b9b..728166d79 100644
--- a/org.eclipse.egit.repository/category.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -153,6 +153,18 @@
    <bundle id="com.jcraft.jsch.source">
       <category name="EGit.dependencies"/>
    </bundle>
+   <bundle id="com.sun.jna">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="com.sun.jna.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="com.sun.jna.platform">
+      <category name="EGit.dependencies"/>
+   </bundle>
+   <bundle id="com.sun.jna.platform.source">
+      <category name="EGit.dependencies"/>
+   </bundle>
    <bundle id="javax.servlet">
       <category name="EGit.dependencies"/>
    </bundle>
diff --git a/org.eclipse.egit.target/egit-4.17.target b/org.eclipse.egit.target/egit-4.17.target
index 000a95cdc..0d0412548 100644
--- a/org.eclipse.egit.target/egit-4.17.target
+++ b/org.eclipse.egit.target/egit-4.17.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.17" sequenceNumber="1635981859">
+<target name="egit-4.17" sequenceNumber="1635982182">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@@ -41,6 +41,10 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+      <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
       <unit id="javaewah" version="1.1.12.v20210622-2206"/>
       <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
diff --git a/org.eclipse.egit.target/egit-4.18.target b/org.eclipse.egit.target/egit-4.18.target
index 9ebc197d9..968913a89 100644
--- a/org.eclipse.egit.target/egit-4.18.target
+++ b/org.eclipse.egit.target/egit-4.18.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.18" sequenceNumber="1635981859">
+<target name="egit-4.18" sequenceNumber="1635982182">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@@ -41,6 +41,10 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+      <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
       <unit id="javaewah" version="1.1.12.v20210622-2206"/>
       <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
diff --git a/org.eclipse.egit.target/egit-4.19.target b/org.eclipse.egit.target/egit-4.19.target
index 144c51967..47ae9c189 100644
--- a/org.eclipse.egit.target/egit-4.19.target
+++ b/org.eclipse.egit.target/egit-4.19.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.19" sequenceNumber="1635981859">
+<target name="egit-4.19" sequenceNumber="1635982182">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@@ -41,6 +41,10 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+      <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
       <unit id="javaewah" version="1.1.12.v20210622-2206"/>
       <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
diff --git a/org.eclipse.egit.target/egit-4.20.target b/org.eclipse.egit.target/egit-4.20.target
index 4f8424963..6ee8ffff4 100644
--- a/org.eclipse.egit.target/egit-4.20.target
+++ b/org.eclipse.egit.target/egit-4.20.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.20" sequenceNumber="1635981859">
+<target name="egit-4.20" sequenceNumber="1635982182">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@@ -41,6 +41,10 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+      <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
       <unit id="javaewah" version="1.1.12.v20210622-2206"/>
       <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
diff --git a/org.eclipse.egit.target/egit-4.21.target b/org.eclipse.egit.target/egit-4.21.target
index 63e9ee057..8ef5e7845 100644
--- a/org.eclipse.egit.target/egit-4.21.target
+++ b/org.eclipse.egit.target/egit-4.21.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.21" sequenceNumber="1635981859">
+<target name="egit-4.21" sequenceNumber="1635982182">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.4.43.v20210629"/>
@@ -41,6 +41,10 @@
       <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/>
       <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
       <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
+      <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
+      <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
+      <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/>
       <unit id="javaewah" version="1.1.12.v20210622-2206"/>
       <unit id="javaewah.source" version="1.1.12.v20210622-2206"/>
       <unit id="javax.activation" version="1.1.0.v201211130549"/>
diff --git a/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd b/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd
index 9eac5b6ac..29f80fd87 100644
--- a/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd
+++ b/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd
@@ -8,6 +8,10 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202108252228
 	com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
 	com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
 	com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
+	com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343]
+	com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343]
+	com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
+	com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
 	javaewah [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
 	javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206]
 	javax.activation [1.1.0.v201211130549,1.1.0.v201211130549]
-- 
2.11.4.GIT