From 44b128885c8281763e5733215570a6f13ae28e0b Mon Sep 17 00:00:00 2001 From: Philip Langer Date: Mon, 7 Jul 2025 19:46:15 +0200 Subject: [PATCH] Upgrade to 2025-06 --- README.md | 1 + com.eclipsesource.megit.parent/megit.target | 238 +++++++++--------- com.eclipsesource.megit.parent/megit.tpd | 195 +++++++------- com.eclipsesource.megit.parent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.eclipsesource.megit.plugin/pom.xml | 2 +- com.eclipsesource.megit.product/pom.xml | 2 +- 7 files changed, 230 insertions(+), 212 deletions(-) diff --git a/README.md b/README.md index e1de075..7db4bb3 100644 --- a/README.md +++ b/README.md @@ -60,3 +60,4 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe - Adds org.eclipse.tm4e for generic syntax highlighting - 0.8.0 Update to Eclipse EGit 2024-12 - Switches to Java 21 +- 0.9.0 Update to Eclipse EGit 2025-06 diff --git a/com.eclipsesource.megit.parent/megit.target b/com.eclipsesource.megit.parent/megit.target index 817b797..cb92dc3 100644 --- a/com.eclipsesource.megit.parent/megit.target +++ b/com.eclipsesource.megit.parent/megit.target @@ -1,135 +1,155 @@ - + - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - + + - - - - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + + + + + + + + + + + - - - - + + + + + - + - + + + + - + - - - + - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + - + + + - + - + + + + + + - - - - - - - - + + + + - - - - - + @@ -190,13 +210,13 @@ org.apache.sshd sshd-osgi - 2.14.0 + 2.15.0 jar org.apache.sshd sshd-sftp - 2.14.0 + 2.15.0 jar @@ -206,7 +226,7 @@ org.mockito mockito-core - 5.14.2 + 5.18.0 jar @@ -216,13 +236,13 @@ net.java.dev.jna jna - 5.15.0 + 5.17.0 jar net.java.dev.jna jna-platform - 5.15.0 + 5.17.0 jar @@ -232,49 +252,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-http - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-io - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-security - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-server - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-session - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-util - 12.0.16 + 12.0.21 jar org.eclipse.jetty jetty-util-ajax - 12.0.16 + 12.0.21 jar @@ -283,12 +303,6 @@ 6.1.0 jar - - org.eclipse.jetty.ee8 - jetty-ee8-nested - 12.0.16 - jar - @@ -306,7 +320,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.1 jar @@ -316,13 +330,13 @@ net.bytebuddy byte-buddy - 1.15.10 + 1.17.5 jar net.bytebuddy byte-buddy-agent - 1.15.10 + 1.17.5 jar @@ -332,25 +346,25 @@ org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcprov-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcpkix-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 jar @@ -360,7 +374,7 @@ org.assertj assertj-core - 3.26.3 + 3.27.3 jar @@ -380,7 +394,7 @@ commons-codec commons-codec - 1.17.1 + 1.18.0 jar @@ -398,25 +412,13 @@ commons-io commons-io - 2.17.0 + 2.19.0 jar commons-logging commons-logging - 1.3.4 - jar - - - commons-beanutils - commons-beanutils - 1.9.4 - jar - - - org.mortbay.jasper - apache-el - 9.0.96 + 1.3.5 jar diff --git a/com.eclipsesource.megit.parent/megit.tpd b/com.eclipsesource.megit.parent/megit.tpd index b1140b4..8724fe9 100644 --- a/com.eclipsesource.megit.parent/megit.tpd +++ b/com.eclipsesource.megit.parent/megit.tpd @@ -1,7 +1,6 @@ target "MeGit Target" with allEnvironments source -location "https://download.eclipse.org/releases/2024-12/" { - org.eclipse.equinox.http.service.api +location "https://download.eclipse.org/releases/2025-06/" { org.eclipse.jgit.feature.group org.eclipse.jgit.gpg.bc.feature.group org.eclipse.jgit.ssh.jsch.feature.group @@ -17,26 +16,19 @@ location "https://download.eclipse.org/releases/2024-12/" { org.eclipse.equinox.core.feature.feature.group org.eclipse.equinox.p2.discovery.feature.feature.group org.eclipse.equinox.executable.feature.group - org.eclipse.ecf.core.ssl.feature.feature.group + org.osgi.service.http.whiteboard org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group - org.eclipse.ecf.filetransfer.ssl.feature.feature.group org.eclipse.jdt.core.compiler.batch org.eclipse.jdt.core org.apache.commons.io org.apache.sshd.sftp org.apache.sshd.osgi - org.apache.lucene.core - org.apache.lucene.analysis-common - org.apache.lucene.analysis-smartcn org.apache.aries.spifly.dynamic.bundle com.sun.jna com.sun.jna.platform org.eclipse.jetty.http org.eclipse.jetty.server org.eclipse.jetty.session - org.eclipse.jetty.ee8.servlet - org.eclipse.jetty.ee8.security - com.sun.el.javax.el org.objectweb.asm.commons org.apache.commons.commons-codec @@ -48,22 +40,34 @@ location "https://download.eclipse.org/releases/2024-12/" { org.joni org.snakeyaml.engine - // https://gerrithub.io/plugins/gitiles/eclipse-egit/egit/+/refs/tags/v7.1.0.202411261347-r/org.eclipse.egit.target/releasetrain/4.34-2024-12.tpd + // https://github.com/eclipse-egit/egit/blob/v7.3.0.202506031305-r/org.eclipse.egit.target/releasetrain/4.36-2025-06.tpd + // Eclipse platform // Eclipse platform biz.aQute.bnd.util lazy biz.aQute.bndlib lazy - org.apache.commons.jxpath lazy - org.eclipse.sdk.ide lazy + biz.aQute.repository + biz.aQute.resolve lazy + com.sun.el.javax.el lazy + javax.activation lazy + org.commonmark lazy + org.commonmark-gfm-tables lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy org.eclipse.ecf.core.feature.feature.group lazy org.eclipse.ecf.filetransfer.feature.feature.group lazy org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.http.service.api lazy + org.eclipse.equinox.http.servlet lazy org.eclipse.equinox.p2.director lazy org.eclipse.equinox.sdk.feature.group lazy - org.eclipse.e4.tools.emf.ui lazy - org.eclipse.e4.tools.services lazy - org.eclipse.e4.ui.progress lazy - org.eclipse.e4.ui.workbench lazy + org.eclipse.jetty.ee8.security lazy + org.eclipse.jetty.ee8.server lazy + org.eclipse.jetty.ee8.servlet lazy + org.eclipse.sdk.ide lazy org.eclipse.search.core lazy + org.eclipse.swt.tools.base lazy org.osgi.service.repository lazy org.sat4j.core lazy org.sat4j.pb lazy @@ -76,67 +80,83 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202305310105 javax.inject } -// https://gerrithub.io/plugins/gitiles/eclipse-egit/egit/+/refs/tags/v7.1.0.202411261347-r/org.eclipse.egit.target/orbit/orbit-4.34.tpd -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12" { - com.ibm.icu [76.1.0,76.1.0] +// https://github.com/eclipse-egit/egit/blob/v7.3.0.202506031305-r/org.eclipse.egit.target/orbit/orbit-4.36.tpd +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06" { + aQute.libg [7.1.0.202411251545,7.1.0.202411251545] + bndtools.api [7.1.0.202411251545,7.1.0.202411251545] + com.ibm.icu [77.1.0,77.1.0] com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.github.weisj.jsvg [1.7.2,1.7.2] jakarta.activation-api [2.1.3,2.1.3] - jakarta.activation-api.source [2.1.3,2.1.3] + jakarta.annotation-api [1.3.5,1.3.5] jakarta.annotation-api [2.1.1,2.1.1] - jakarta.annotation-api.source [2.1.1,2.1.1] - jakarta.xml.bind-api [2.3.3,2.3.3] - jakarta.xml.bind-api.source [2.3.3,2.3.3] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] jakarta.inject.jakarta.inject-api [2.0.1,2.0.1] - jakarta.inject.jakarta.inject-api.source [2.0.1,2.0.1] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api [4.0.2,4.0.2] + junit-jupiter-api [5.12.2,5.12.2] + junit-jupiter-engine [5.12.2,5.12.2] + junit-jupiter-migrationsupport [5.12.2,5.12.2] + junit-jupiter-params [5.12.2,5.12.2] + junit-platform-commons [1.12.2,1.12.2] + junit-platform-engine [1.12.2,1.12.2] + junit-platform-launcher [1.12.2,1.12.2] + junit-platform-runner [1.12.2,1.12.2] + junit-platform-suite-api [1.12.2,1.12.2] + junit-platform-suite-commons [1.12.2,1.12.2] + junit-platform-suite-engine [1.12.2,1.12.2] + junit-vintage-engine [5.12.2,5.12.2] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.batik.constants [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.css [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.i18n [1.18.0.v20241009-1200,1.18.0.v20241009-1200] - org.apache.batik.util [1.18.0.v20241009-1200,1.18.0.v20241009-1200] + org.apache.batik.constants [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.css [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.i18n [1.19.0.v20250506-1400,1.19.0.v20250506-1400] + org.apache.batik.util [1.19.0.v20250506-1400,1.19.0.v20250506-1400] org.apache.commons.logging [1.2.0,1.2.0] org.apache.commons.logging.source [1.2.0,1.2.0] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] org.apache.httpcomponents.httpcore [4.4.16,4.4.16] org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apiguardian.api [1.1.2,1.1.2] + org.bndtools.headless.build.manager [7.1.0.202411251545,7.1.0.202411251545] + org.bndtools.templating [7.1.0.202411251545,7.1.0.202411251545] + org.bndtools.versioncontrol.ignores.manager [7.1.0.202411251545,7.1.0.202411251545] + org.mortbay.jasper.apache-el [9.0.102,9.0.102] + org.apache.xmlgraphics [2.11.0.v20250506-1400,2.11.0.v20250506-1400] org.eclipse.jetty.servlet-api [4.0.6,4.0.6] - org.eclipse.orbit.maven.lucene.feature.group [4.34.0.v20240929-0900,4.34.0.v20240929-0900] + org.apache.lucene.analysis-common [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.analysis-smartcn [10.2.1.v20250501-1000,10.2.1.v20250501-1000] + org.apache.lucene.core [10.2.1.v20250501-1000,10.2.1.v20250501-1000] org.eclipse.orbit.xml-apis-ext [1.0.0.v20240917-0534,1.0.0.v20240917-0534] org.hamcrest [2.2.0,2.2.0] - org.hamcrest.source [2.2.0,2.2.0] org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.source [2.2.0,2.2.0] org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] - org.mortbay.jasper.apache-jsp [9.0.96,9.0.96] + org.mortbay.jasper.apache-jsp [9.0.102,9.0.192] + org.objectweb.asm [9.8.0, 9.8.0] + org.objectweb.asm.source [9.8.0, 9.8.0] + org.objectweb.asm.tree [9.8.0, 9.8.0] + org.objectweb.asm.tree.analysis [9.8.0, 9.8.0] + org.objectweb.asm.util [9.8.0, 9.8.0] org.objenesis [3.4,3.4] org.objenesis.source [3.4,3.4] - org.objectweb.asm [9.7.1, 9.7.1] - org.objectweb.asm.source [9.7.1, 9.7.1] - org.objectweb.asm.tree [9.7.1,9.7.1] - org.objectweb.asm.tree.source [9.7.1,9.7.1] - org.objectweb.asm.tree.analysis [9.7.1,9.7.1] - org.objectweb.asm.tree.analysis.source [9.7.1,9.7.1] - org.objectweb.asm.util [9.7.1,9.7.1] - org.objectweb.asm.util.source [9.7.1,9.7.1] + org.opentest4j [1.3.0,1.3.0] + org.osgi.namespace.contract [1.0.0.201505202024,1.0.0.201505202024] + org.osgi.namespace.extender [1.0.1.201505202024,1.0.1.201505202024] + org.osgi.namespace.service [1.0.0.201505202024,1.0.0.201505202024] org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] - // additional dependencies I had to add - org.apache.commons.collections - org.jdom - org.osgi.service.http.whiteboard - org.apache.xmlgraphics } -// https://gerrithub.io/plugins/gitiles/eclipse-egit/egit/+/refs/tags/v7.1.0.202411261347-r/org.eclipse.egit.target/maven/dependencies.tpd +// https://github.com/eclipse-egit/egit/blob/v7.3.0.202506031305-r/org.eclipse.egit.target/maven/dependencies.tpd maven apache scope = compile dependencyDepth = none @@ -146,7 +166,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.17.1" + version = "1.18.0" } dependency { groupId = "org.apache.commons" @@ -161,26 +181,15 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.17.0" + version = "2.19.0" } dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.3.4" - } - // additional dependencies I had to add - dependency { - groupId = "commons-beanutils" - artifactId = "commons-beanutils" - version = "1.9.4" + version = "1.3.5" } - dependency { - groupId = "org.mortbay.jasper" - artifactId = "apache-el" - version = "9.0.96" - } - } + maven args4j scope = compile dependencyDepth = none @@ -193,6 +202,7 @@ maven args4j version = "2.37" } } + maven assertj scope = compile dependencyDepth = none @@ -202,9 +212,10 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.26.3" + version = "3.27.3" } } + maven bouncycastle scope = compile dependencyDepth = none @@ -214,24 +225,25 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.79" + version = "1.80" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.79" + version = "1.80" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.79" + version = "1.80" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.79" + version = "1.80" } } + maven bytebuddy scope = compile dependencyDepth = none @@ -241,14 +253,15 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.10" + version = "1.17.5" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.10" + version = "1.17.5" } } + maven gson scope = compile dependencyDepth = none @@ -258,9 +271,10 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.11.0" + version = "2.13.1" } } + maven javaewah scope = compile dependencyDepth = none @@ -273,6 +287,7 @@ maven javaewah version = "1.2.3" } } + maven jetty scope = compile dependencyDepth = none @@ -282,55 +297,50 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.16" + version = "12.0.21" } dependency { groupId = "jakarta.servlet" artifactId = "jakarta.servlet-api" version = "6.1.0" } - // additional dependencies - dependency { - groupId = "org.eclipse.jetty.ee8" - artifactId = "jetty-ee8-nested" - version = "12.0.16" - } } + maven jna scope = compile dependencyDepth = none @@ -340,14 +350,15 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.15.0" + version = "5.17.0" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.15.0" + version = "5.17.0" } } + maven mockito scope = compile dependencyDepth = none @@ -357,9 +368,10 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.14.2" + version = "5.18.0" } } + maven sshd scope = compile dependencyDepth = none @@ -369,14 +381,15 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.14.0" + version = "2.15.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.14.0" + version = "2.15.0" } } + maven slf4j scope = compile dependencyDepth = none @@ -394,6 +407,7 @@ maven slf4j version = "1.7.36" } } + maven xz scope = compile dependencyDepth = none @@ -406,6 +420,7 @@ maven xz version = "1.10" } } + // Needed by PDE, which we include when running the UI tests maven osgi scope = compile diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml index eaae7c4..2e059de 100644 --- a/com.eclipsesource.megit.parent/pom.xml +++ b/com.eclipsesource.megit.parent/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.eclipsesource.megit com.eclipsesource.megit.parent - 0.8.0-SNAPSHOT + 0.9.0-SNAPSHOT pom diff --git a/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF b/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF index 76b7cce..442c238 100644 --- 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.8.0.qualifier +Bundle-Version: 0.9.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 index 030c62d..88a2fff 100644 --- a/com.eclipsesource.megit.plugin/pom.xml +++ b/com.eclipsesource.megit.plugin/pom.xml @@ -7,7 +7,7 @@ com.eclipsesource.megit com.eclipsesource.megit.parent - 0.8.0-SNAPSHOT + 0.9.0-SNAPSHOT ../com.eclipsesource.megit.parent com.eclipsesource.megit.plugin diff --git a/com.eclipsesource.megit.product/pom.xml b/com.eclipsesource.megit.product/pom.xml index dde8b70..3508b52 100644 --- a/com.eclipsesource.megit.product/pom.xml +++ b/com.eclipsesource.megit.product/pom.xml @@ -7,7 +7,7 @@ com.eclipsesource.megit com.eclipsesource.megit.parent - 0.8.0-SNAPSHOT + 0.9.0-SNAPSHOT ../com.eclipsesource.megit.parent com.eclipsesource.megit.product