Update to Eclipse and EGit 2022-12

eclipsesource · Jan 10, 2023 · a0cd7c1 · a0cd7c1
1 parent 57dbfa8
commit a0cd7c1
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -50,3 +50,4 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
   * 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
+  * 0.3.0 Update to Eclipse EGit 2022-12
diff --git a/com.eclipsesource.megit.parent/.project b/com.eclipsesource.megit.parent/.project
@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1660152157423</id>
+			<id>1673359652144</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.eclipsesource.megit</groupId>
 	<artifactId>com.eclipsesource.megit.parent</artifactId>
-	<version>0.2.0-SNAPSHOT</version>
+	<version>0.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho-version>2.2.0</tycho-version>
-		<tycho-extras-version>2.2.0</tycho-extras-version>
+		<tycho-version>2.7.5</tycho-version>
+		<tycho-extras-version>2.7.5</tycho-extras-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>

diff --git a/com.eclipsesource.megit.plugin/.project b/com.eclipsesource.megit.plugin/.project
@@ -33,12 +33,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1660152157426</id>
+			<id>1673359652153</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

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.2.0.qualifier
+Bundle-Version: 0.3.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.2.0-SNAPSHOT</version>
+		<version>0.3.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
@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1660152157434</id>
+			<id>1673359652170</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

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.2.0.qualifier"
+      version="0.3.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.2.0-SNAPSHOT</version>
+		<version>0.3.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
@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1660152157430</id>
+			<id>1673359652159</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

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

diff --git a/com.eclipsesource.megit.target/.project b/com.eclipsesource.megit.target/.project
@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1660152157437</id>
+			<id>1673359652178</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

diff --git a/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target b/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="MeGit Target" sequenceNumber="1660157178">
+<target name="MeGit Target" sequenceNumber="1673360380">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <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.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.jgit.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.egit.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.4.0.202211300538-r"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.32.0.v20221121-1400"/>
+      <unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
+      <unit id="org.eclipse.emf.validation.feature.group" version="1.13.2.202208271102"/>
+      <unit id="org.eclipse.platform.ide" version="4.26.0.I20221123-1800"/>
+      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.1800.v20221117-1044"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.600.v20221116-1440"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.900.v20221116-1440"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.1200.v20221111-1340"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1900.v20221108-1024"/>
       <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.v20220215-0126"/>
-      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.600.v20220215-0126"/>
+      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20221112-0806"/>
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20210409-2301"/>
+      <unit id="org.eclipse.jdt.core" version="3.32.0.v20221108-1853"/>
       <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.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/"/>
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20221112-0806"/>
+      <unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
+      <unit id="org.apache.sshd.sftp" version="2.9.2.v20221117-1942"/>
+      <unit id="org.apache.sshd.osgi" version="2.9.2.v20221117-1942"/>
+      <unit id="slf4j.api" version="1.7.36"/>
+      <unit id="slf4j.nop" version="1.7.36"/>
+      <repository location="https://download.eclipse.org/releases/2022-12/"/>
     </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.9.v20220111-1409"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
+      <unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
+      <unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/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/2022-06/" {
+location "https://download.eclipse.org/releases/2022-12/" {
 	org.eclipse.jgit.feature.group
 	org.eclipse.jgit.gpg.bc.feature.group
 	org.eclipse.jgit.ssh.jsch.feature.group
@@ -22,19 +22,20 @@ location "https://download.eclipse.org/releases/2022-06/" {
 	org.eclipse.ecf.filetransfer.feature.feature.group
 	org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
 	org.eclipse.ecf.filetransfer.ssl.feature.feature.group
+	org.eclipse.jdt.core
 	javaewah
-	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
+	org.apache.sshd.osgi
+	slf4j.api
+	slf4j.nop
 }
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository" {
 	com.google.guava
 	com.google.gson
 }
diff --git a/com.eclipsesource.megit.target/pom.xml b/com.eclipsesource.megit.target/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.eclipsesource.megit</groupId>
 		<artifactId>com.eclipsesource.megit.parent</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
+		<version>0.3.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.target</artifactId>