From dba89bbe46d8a065521fe22fea7bb3fcd912714b Mon Sep 17 00:00:00 2001 From: Philip Langer Date: Thu, 11 Jul 2024 21:28:34 +0200 Subject: [PATCH] Upgrade to 2024-06 (#56) This also adds the tm4e for generic syntax highlighting. Fixes https://github.com/eclipsesource/megit/issues/55 --- README.md | 3 + com.eclipsesource.megit.parent/megit.target | 249 ++++++++++-------- com.eclipsesource.megit.parent/megit.tpd | 51 +++- com.eclipsesource.megit.parent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.eclipsesource.megit.plugin/pom.xml | 2 +- com.eclipsesource.megit.product/megit.product | 2 + com.eclipsesource.megit.product/pom.xml | 2 +- 8 files changed, 185 insertions(+), 128 deletions(-) diff --git a/README.md b/README.md index 5bd87b0..018a067 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,6 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe - Add Git LFS support - 0.6.0 Update to Eclipse EGit 2023-12 - Package JVM with product (#42) +- 0.7.0 Update to Eclipse EGit 2024-06 + - Adds org.eclipse.tm4e for generic syntax highlighting + diff --git a/com.eclipsesource.megit.parent/megit.target b/com.eclipsesource.megit.parent/megit.target index bc2e878..7a9180d 100644 --- a/com.eclipsesource.megit.parent/megit.target +++ b/com.eclipsesource.megit.parent/megit.target @@ -1,140 +1,167 @@ - + - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + - - - + + - - - - - + + + + + - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - org.eclipse.birt.runtime.3_7_1 - org.w3c.dom.svg - 1.1.0 - jar - - - org.eclipse.birt.runtime.3_7_1 - org.w3c.css.sac - 1.3.0 - jar - - - org.eclipse.birt.runtime - org.w3c.dom.events - 3.0.0.draft20060413_v201105210656 - jar - - - org.eclipse.birt.runtime.3_7_1 - org.w3c.dom.smil - 1.0.0 - jar - - - commons-io - commons-io - 1.4 - jar - - - javax.servlet - javax.servlet-api - 4.0.1 - jar - - - org.glassfish.web - javax.servlet.jsp - 2.3.4 - jar - - - org.eclipse.jetty.ee8 - jetty-ee8-nested - 12.0.5 - jar - - - org.mortbay.jasper - apache-jsp - 9.0.83 - jar - - + + + + org.osgi + org.osgi.service.http.whiteboard + 1.1.0 + jar + + + org.eclipse.birt.runtime.3_7_1 + org.w3c.dom.svg + 1.1.0 + jar + + + org.eclipse.birt.runtime.3_7_1 + org.w3c.css.sac + 1.3.0 + jar + + + org.eclipse.birt.runtime + org.w3c.dom.events + 3.0.0.draft20060413_v201105210656 + jar + + + org.eclipse.birt.runtime.3_7_1 + org.w3c.dom.smil + 1.0.0 + jar + + + commons-io + commons-io + 1.4 + jar + + + javax.servlet + javax.servlet-api + 4.0.1 + jar + + + org.glassfish.web + javax.servlet.jsp + 2.3.4 + jar + + + org.eclipse.jetty.ee8 + jetty-ee8-nested + 12.0.5 + jar + + + org.mortbay.jasper + apache-jsp + 9.0.83 + jar + + + org.eclipse.jetty.ee8 + jetty-ee8-nested + 12.0.11 + jar + + + org.slf4j + slf4j-simple + 2.1.0-alpha1 + jar + + diff --git a/com.eclipsesource.megit.parent/megit.tpd b/com.eclipsesource.megit.parent/megit.tpd index 3204ce8..856f05a 100644 --- a/com.eclipsesource.megit.parent/megit.tpd +++ b/com.eclipsesource.megit.parent/megit.tpd @@ -1,6 +1,7 @@ target "MeGit Target" with allEnvironments source -location "https://download.eclipse.org/releases/2023-12/" { +location "https://download.eclipse.org/releases/2024-06/" { + org.eclipse.equinox.http.service.api org.eclipse.jgit.feature.group org.eclipse.jgit.gpg.bc.feature.group org.eclipse.jgit.ssh.jsch.feature.group @@ -34,12 +35,10 @@ location "https://download.eclipse.org/releases/2023-12/" { org.apache.lucene.core org.apache.lucene.analysis-common org.apache.lucene.analysis-smartcn - slf4j.api org.apache.aries.spifly.dynamic.bundle org.apache.commons.jxpath com.sun.jna com.sun.jna.platform - jakarta.inject.jakarta.inject-api jakarta.annotation-api org.eclipse.jetty.http org.eclipse.jetty.server @@ -54,27 +53,42 @@ location "https://download.eclipse.org/releases/2023-12/" { org.objectweb.asm.tree org.objectweb.asm.tree.analysis org.apache.commons.commons-codec + org.apache.commons.commons-compress + org.eclipse.tm4e.feature.feature.group + org.eclipse.tm4e.language_pack.feature.feature.group + org.eclipse.tm4e.languageconfiguration + org.jcodings + org.joni + org.snakeyaml.engine } -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" { +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/" { com.google.guava com.google.gson - org.bouncycastle.bcpg - org.bouncycastle.bcpkix - org.bouncycastle.bcprov - org.bouncycastle.bcutil - org.objectweb.asm.analysis - javaewah - org.apache.commons.compress - javax.inject + bcpg + bcpkix + bcprov + bcutil + com.googlecode.javaewah.JavaEWAH org.apache.batik.css org.apache.batik.util org.apache.batik.constants org.apache.batik.i18n org.apache.commons.logging com.ibm.icu + jakarta.inject.jakarta.inject-api + com.google.inject } -maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources { +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" { + javax.inject +} + +maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=generate includeSources { + dependency { + groupId="org.osgi" + artifactId="org.osgi.service.http.whiteboard" + version="1.1.0" + } dependency { groupId="org.eclipse.birt.runtime.3_7_1" artifactId="org.w3c.dom.svg" @@ -120,4 +134,15 @@ maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManif artifactId="apache-jsp" version="9.0.83" } + dependency { + groupId="org.eclipse.jetty.ee8" + artifactId="jetty-ee8-nested" + version="12.0.11" + } + + dependency { + groupId="org.slf4j" + artifactId="slf4j-simple" + version="2.1.0-alpha1" + } } diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml index 1c92cee..23e496b 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.6.0-SNAPSHOT + 0.7.0-SNAPSHOT pom diff --git a/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF b/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF index 85c4eb4..485a98a 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.6.0.qualifier +Bundle-Version: 0.7.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 f397d20..b3cc87b 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.6.0-SNAPSHOT + 0.7.0-SNAPSHOT ../com.eclipsesource.megit.parent com.eclipsesource.megit.plugin diff --git a/com.eclipsesource.megit.product/megit.product b/com.eclipsesource.megit.product/megit.product index addd02b..9c7bd8f 100644 --- a/com.eclipsesource.megit.product/megit.product +++ b/com.eclipsesource.megit.product/megit.product @@ -319,6 +319,8 @@ version(s), and exceptions or additional permissions here}." + + diff --git a/com.eclipsesource.megit.product/pom.xml b/com.eclipsesource.megit.product/pom.xml index 50f1cdc..e96787e 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.6.0-SNAPSHOT + 0.7.0-SNAPSHOT ../com.eclipsesource.megit.parent com.eclipsesource.megit.product