Update to Eclipse and EGit 2023-09

eclipsesource · Nov 1, 2023 · 39e6f4a · 39e6f4a
1 parent 53c911b
commit 39e6f4a
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -52,5 +52,5 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
 - 0.2.0 Update to Eclipse EGit 2022-06
 - 0.3.0 Update to Eclipse EGit 2022-12
 - 0.4.0 Update to Eclipse EGit 2023-06
-- 0.5.0 Update to Eclipse EGit 2023-06
+- 0.5.0 Update to Eclipse EGit 2023-09
   - Add Git LFS support
diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.eclipsesource.megit</groupId>
 	<artifactId>com.eclipsesource.megit.parent</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<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.release>17</maven.compiler.release>
-		
+
 		<mav-checkstyle-version>3.0.0</mav-checkstyle-version>
 		<checkstyle-version>8.8</checkstyle-version>
 	</properties>
@@ -26,9 +27,9 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
-			<pluginRepository>
+		<pluginRepository>
 			<id>apache-maven-releases</id>
-			<url>http://repo.maven.apache.org/maven2</url>
+			<url>https://repo.maven.apache.org/maven2</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -46,10 +47,10 @@
 		<sourceDirectory>src</sourceDirectory>
 		<outputDirectory>bin</outputDirectory>
 		<plugins>
-			<plugin>  
-				<groupId>org.eclipse.tycho</groupId>  
-				<artifactId>tycho-versions-plugin</artifactId>  
-				<version>${tycho-version}</version>  
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
 			</plugin>
 
 			<plugin>
@@ -121,15 +122,17 @@
 					</dependency>
 				</dependencies>
 				<configuration>
-					<!-- <timestampProvider>jgit</timestampProvider> -->
-					<!-- generate new qualifier even if it is only the pom.xml that changed 
-						<jgit.ignore> pom.xml </jgit.ignore> -->
 					<format>yyyyMMdd-HHmm</format>
 					<!-- 
 					<sourceReferences>
 						<generate>true</generate>
 					</sourceReferences>
 					 -->
+					<timestampProvider>jgit</timestampProvider>
+					<jgit.ignore>
+						pom.xml
+					</jgit.ignore>
+					<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
 				</configuration>
 			</plugin>
 

diff --git a/com.eclipsesource.megit.plugin/.classpath b/com.eclipsesource.megit.plugin/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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.4.0.qualifier
+Bundle-Version: 0.5.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.4.0-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.plugin</artifactId>

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.4.0.qualifier"
+      version="0.5.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.4.0-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.product.feature</artifactId>

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.4.0-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.product</artifactId>

diff --git a/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target b/com.eclipsesource.megit.target/com.eclipsesource.megit.target.target
@@ -1,50 +1,52 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="MeGit Target" sequenceNumber="1698856336">
+<target name="MeGit Target" sequenceNumber="1698865063">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jgit.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.jgit.lfs.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.egit.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.6.0.202305301015-r"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.34.0.v20230406-1334"/>
+      <unit id="org.eclipse.jgit.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.jgit.http.apache.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.jgit.lfs.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.egit.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.7.0.202309050840-r"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.35.0.v20230829-0934"/>
       <unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
       <unit id="org.eclipse.emf.validation.feature.group" version="1.13.3.202305230712"/>
-      <unit id="org.eclipse.platform.ide" version="4.28.0.I20230605-0440"/>
-      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2000.v20230510-1208"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
-      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.0.v20230523-2142"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.0.v20230322-1009"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2100.v20230415-0944"/>
+      <unit id="org.eclipse.platform.ide" version="4.29.0.I20230903-1000"/>
+      <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2100.v20230814-2013"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.900.v20230808-1403"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.100.v20230801-1826"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.100.v20230728-2010"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2200.v20230717-2134"/>
       <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20230507-1923"/>
       <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20230507-1921"/>
       <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20230422-0242"/>
       <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20230423-0417"/>
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20230422-0242"/>
-      <unit id="org.eclipse.jdt.core.compiler.batch" version="3.34.0.v20230523-1233"/>
-      <unit id="org.eclipse.jdt.core" version="3.34.0.v20230512-1803"/>
+      <unit id="org.eclipse.jdt.core.compiler.batch" version="3.35.0.v20230814-2020"/>
+      <unit id="org.eclipse.jdt.core" version="3.35.0.v20230814-1356"/>
       <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.22.0.v20221207-1049"/>
       <unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
-      <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.httpcomponents.httpclient" version="4.5.14.v20230516-1249"/>
       <unit id="org.apache.sshd.sftp" version="2.10.0"/>
       <unit id="org.apache.sshd.osgi" version="2.10.0"/>
+      <unit id="org.apache.lucene.core" version="9.7.0.v20230703-0758"/>
+      <unit id="org.apache.lucene.analysis-common" version="9.7.0.v20230703-0758"/>
+      <unit id="org.apache.lucene.analysis-smartcn" version="9.7.0.v20230703-0758"/>
       <unit id="slf4j.api" version="2.0.7"/>
       <unit id="slf4j.nop" version="2.0.7"/>
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.6"/>
-      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
+      <unit id="javax.annotation" version="1.3.5.v20200909-1856"/>
       <unit id="javax.inject" version="1.0.0.v20220405-0441"/>
       <unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
-      <unit id="com.sun.jna" version="5.13.0"/>
+      <unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
       <unit id="com.sun.jna.platform" version="5.13.0"/>
-      <repository location="https://download.eclipse.org/releases/2023-06/"/>
+      <repository location="https://download.eclipse.org/releases/2023-09/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
@@ -61,5 +63,15 @@
       <unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
     </location>
+    <location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
+    <dependencies>
+    	<dependency>
+    		<groupId>commons-codec</groupId>
+    		<artifactId>commons-codec</artifactId>
+    		<version>1.15</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </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/2023-06/" {
+location "https://download.eclipse.org/releases/2023-09/" {
 	org.eclipse.jgit.feature.group
 	org.eclipse.jgit.gpg.bc.feature.group
 	org.eclipse.jgit.ssh.jsch.feature.group
@@ -30,9 +30,11 @@ location "https://download.eclipse.org/releases/2023-06/" {
 	org.apache.commons.compress
 	org.apache.httpcomponents.httpcore
 	org.apache.httpcomponents.httpclient
-	org.apache.commons.codec
 	org.apache.sshd.sftp
 	org.apache.sshd.osgi
+	org.apache.lucene.core
+	org.apache.lucene.analysis-common
+	org.apache.lucene.analysis-smartcn
 	slf4j.api
 	slf4j.nop
 	org.apache.aries.spifly.dynamic.bundle
@@ -56,3 +58,11 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202305310105
 	org.objectweb.asm.tree
 	org.objectweb.asm.analysis
 }
+
+maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
+	dependency {
+		groupId="commons-codec"
+		artifactId="commons-codec"
+		version="1.15"
+	}
+}
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.4.0-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.megit.parent</relativePath>
 	</parent>
 	<artifactId>com.eclipsesource.megit.target</artifactId>