Update to Eclipse and EGit 2022-06

eclipsesource · Aug 10, 2022 · e706488 · e706488
1 parent 530e371
commit e706488
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -49,3 +49,4 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
   * 0.0.3 Update to Eclipse EGit 2021-03
   * 0.0.4 Update to Eclipse EGit 2021-09
   * 0.1.0 Update to Eclipse EGit 2021-12
+  * 0.2.0 Update to Eclipse EGit 2022-06
diff --git a/com.eclipsesource.megit.parent/.project b/com.eclipsesource.megit.parent/.project
@@ -5,7 +5,24 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1660152157423</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.eclipsesource.megit</groupId>
 	<artifactId>com.eclipsesource.megit.parent</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>

diff --git a/com.eclipsesource.megit.plugin/.project b/com.eclipsesource.megit.plugin/.project
@@ -20,9 +20,26 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1660152157426</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF b/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plugin
 Bundle-SymbolicName: com.eclipsesource.megit.plugin;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
 Bundle-Activator: com.eclipsesource.megit.plugin.Activator
 Bundle-Vendor: ECLIPSESOURCE
 Require-Bundle: org.eclipse.ui,

diff --git a/com.eclipsesource.megit.plugin/pom.xml b/com.eclipsesource.megit.plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.plugin</artifactId>

diff --git a/com.eclipsesource.megit.product.feature/.project b/com.eclipsesource.megit.product.feature/.project
@@ -10,8 +10,25 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1660152157434</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.eclipsesource.megit.product.feature/feature.xml b/com.eclipsesource.megit.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.eclipsesource.megit.product.feature"
       label="Minimal EGit Product Feature"
-      version="0.1.0.qualifier"
+      version="0.2.0.qualifier"
       provider-name="ECLIPSESOURCE">
 
    <description url="https://github.com/eclipsesource/megit">

diff --git a/com.eclipsesource.megit.product.feature/pom.xml b/com.eclipsesource.megit.product.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.product.feature</artifactId>

diff --git a/com.eclipsesource.megit.product/.project b/com.eclipsesource.megit.product/.project
@@ -5,7 +5,24 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1660152157430</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.eclipsesource.megit.product/pom.xml b/com.eclipsesource.megit.product/pom.xml
@@ -7,11 +7,10 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.product</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>

diff --git a/com.eclipsesource.megit.target/.project b/com.eclipsesource.megit.target/.project
@@ -10,8 +10,25 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1660152157437</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target b/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target
@@ -1,42 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="MeGit Target" sequenceNumber="1639490293">
+<target name="MeGit Target" sequenceNumber="1660157178">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jgit.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.egit.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.0.0.202111291000-r"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.28.0.v20211110-0654"/>
+      <unit id="org.eclipse.jgit.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.egit.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.2.0.202206071550-r"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
       <unit id="org.eclipse.emf.transaction.feature.group" version="1.12.0.201805140824"/>
       <unit id="org.eclipse.emf.validation.feature.group" version="1.12.2.202008210805"/>
-      <unit id="org.eclipse.platform.ide" version="4.22.0.I20211124-1800"/>
-      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.1400.v20211104-1616"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.200.v20211117-0650"/>
-      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.400.v20211104-1730"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.1000.v20210813-0655"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1400.v20211117-0650"/>
+      <unit id="org.eclipse.platform.ide" version="4.24.0.I20220607-0700"/>
+      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.1600.v20220518-1326"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.400.v20220516-2155"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.600.v20220516-2155"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.1100.v20220210-1157"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1700.v20220509-0833"/>
       <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20211005-1944"/>
       <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20210409-2301"/>
-      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20210618-0642"/>
-      <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.1.0.v20211008-2034"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20220215-0126"/>
+      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.600.v20220215-0126"/>
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20210409-2301"/>
       <unit id="javaewah" version="1.1.13.v20211029-0839"/>
+      <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/>
+      <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/>
+      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
       <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
-      <unit id="org.bouncycastle.bcpg" version="1.69.0.v20210713-1924"/>
-      <unit id="org.bouncycastle.bcprov" version="1.69.0.v20210923-1401"/>
-      <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20210923-1401"/>
-      <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/>
-      <repository location="https://download.eclipse.org/releases/2021-12/"/>
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
+      <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+      <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/>
+      <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
+      <repository location="https://download.eclipse.org/releases/2022-06/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
-      <unit id="com.google.gson" version="2.8.8.v20211029-0838"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
+      <unit id="com.google.gson" version="2.8.9.v20220111-1409"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
     </location>
   </locations>
 </target>
diff --git a/com.eclipsesource.megit.target/com.eclipsesource.megit.target.tpd b/com.eclipsesource.megit.target/com.eclipsesource.megit.target.tpd
@@ -1,6 +1,6 @@
 target "MeGit Target"
 with allEnvironments source
-location "https://download.eclipse.org/releases/2021-12/" {
+location "https://download.eclipse.org/releases/2022-06/" {
 	org.eclipse.jgit.feature.group
 	org.eclipse.jgit.gpg.bc.feature.group
 	org.eclipse.jgit.ssh.jsch.feature.group
@@ -20,16 +20,21 @@ location "https://download.eclipse.org/releases/2021-12/" {
 	org.eclipse.ecf.core.feature.feature.group
 	org.eclipse.ecf.core.ssl.feature.feature.group
 	org.eclipse.ecf.filetransfer.feature.feature.group
-	org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group
+	org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
 	org.eclipse.ecf.filetransfer.ssl.feature.feature.group
 	javaewah
-	org.apache.commons.compress
 	org.bouncycastle.bcpg
 	org.bouncycastle.bcprov
 	net.i2p.crypto.eddsa
+	org.apache.commons.io
+	org.apache.commons.compress
+	org.apache.httpcomponents.httpcore
+	org.apache.httpcomponents.httpclient
+	org.apache.commons.codec
 	org.apache.sshd.sftp
+	javax.servlet.jsp
 }
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" {
 	com.google.guava
 	com.google.gson
 }
diff --git a/com.eclipsesource.megit.target/pom.xml b/com.eclipsesource.megit.target/pom.xml
@@ -7,10 +7,9 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
+		<version>0.2.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.target</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
 	<packaging>eclipse-target-definition</packaging>
 </project>