Skip to content

Commit dba89bb

Browse files
plangerplanger
authored
Upgrade to 2024-06 (#56)
This also adds the tm4e for generic syntax highlighting. Fixes #55
1 parent d2176c2 commit dba89bb

File tree

8 files changed

+185
-128
lines changed

8 files changed

+185
-128
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
5656
- Add Git LFS support
5757
- 0.6.0 Update to Eclipse EGit 2023-12
5858
- Package JVM with product (#42)
59+
- 0.7.0 Update to Eclipse EGit 2024-06
60+
- Adds org.eclipse.tm4e for generic syntax highlighting
61+

‎com.eclipsesource.megit.parent/megit.target‎

Lines changed: 138 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,167 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="MeGit Target" sequenceNumber="1706818887">
4+
<target name="MeGit Target" sequenceNumber="1720724565">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.jgit.feature.group" version="6.8.0.202311291450-r"/>
8-
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.8.0.202311291450-r"/>
9-
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.8.0.202311291450-r"/>
10-
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.8.0.202311291450-r"/>
11-
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.8.0.202311291450-r"/>
12-
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.8.0.202311291450-r"/>
13-
<unit id="org.eclipse.egit.feature.group" version="6.8.0.202311291450-r"/>
14-
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.8.0.202311291450-r"/>
15-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/>
7+
<unit id="org.eclipse.equinox.http.service.api" version="1.2.2.v20231218-2126"/>
8+
<unit id="org.eclipse.jgit.feature.group" version="6.10.0.202406032230-r"/>
9+
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.10.0.202406032230-r"/>
10+
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.10.0.202406032230-r"/>
11+
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.10.0.202406032230-r"/>
12+
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.10.0.202406032230-r"/>
13+
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.10.0.202406032230-r"/>
14+
<unit id="org.eclipse.egit.feature.group" version="6.10.0.202406032230-r"/>
15+
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.10.0.202406032230-r"/>
16+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.38.0.v20240314-1003"/>
1617
<unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
1718
<unit id="org.eclipse.emf.validation.feature.group" version="1.13.3.202305230712"/>
18-
<unit id="org.eclipse.platform.ide" version="4.30.0.I20231201-0110"/>
19-
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2200.v20231112-1314"/>
20-
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1000.v20231114-0937"/>
21-
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.200.v20231110-1900"/>
22-
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.200.v20231104-1339"/>
23-
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2300.v20231106-1826"/>
19+
<unit id="org.eclipse.platform.ide" version="4.32.0.I20240601-0610"/>
20+
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2400.v20240515-1919"/>
21+
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1200.v20240524-2033"/>
22+
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.15.100.v20240524-2011"/>
23+
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.400.v20240417-0757"/>
24+
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2500.v20240513-1750"/>
2425
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.2.v20231021-2127"/>
2526
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20230507-1921"/>
2627
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1900.v20230715-1945"/>
2728
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.702.v20231114-1017"/>
2829
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.402.v20231021-2127"/>
29-
<unit id="org.eclipse.jdt.core.compiler.batch" version="3.36.0.v20231114-0937"/>
30-
<unit id="org.eclipse.jdt.core" version="3.36.0.v20231115-1055"/>
30+
<unit id="org.eclipse.jdt.core.compiler.batch" version="3.38.0.v20240524-2033"/>
31+
<unit id="org.eclipse.jdt.core" version="3.38.0.v20240528-0618"/>
3132
<unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
3233
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
3334
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
3435
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
35-
<unit id="org.apache.sshd.sftp" version="2.11.0"/>
36-
<unit id="org.apache.sshd.osgi" version="2.11.0"/>
37-
<unit id="org.apache.lucene.core" version="9.8.0.v20230929-1030"/>
38-
<unit id="org.apache.lucene.analysis-common" version="9.8.0.v20230929-1030"/>
39-
<unit id="org.apache.lucene.analysis-smartcn" version="9.8.0.v20230929-1030"/>
40-
<unit id="slf4j.api" version="2.0.9"/>
36+
<unit id="org.apache.sshd.sftp" version="2.12.1"/>
37+
<unit id="org.apache.sshd.osgi" version="2.12.1"/>
38+
<unit id="org.apache.lucene.core" version="9.10.0.v20240221-0830"/>
39+
<unit id="org.apache.lucene.analysis-common" version="9.10.0.v20240221-0830"/>
40+
<unit id="org.apache.lucene.analysis-smartcn" version="9.10.0.v20240221-0830"/>
4141
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
4242
<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
43-
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
44-
<unit id="com.sun.jna.platform" version="5.13.0"/>
45-
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
43+
<unit id="com.sun.jna" version="5.14.0.v20231211-1200"/>
44+
<unit id="com.sun.jna.platform" version="5.14.0"/>
4645
<unit id="jakarta.annotation-api" version="2.1.1"/>
47-
<unit id="org.eclipse.jetty.http" version="12.0.3"/>
48-
<unit id="org.eclipse.jetty.server" version="12.0.3"/>
49-
<unit id="org.eclipse.jetty.session" version="12.0.3"/>
50-
<unit id="org.eclipse.jetty.ee8.servlet" version="12.0.3"/>
51-
<unit id="org.eclipse.jetty.ee8.security" version="12.0.3"/>
46+
<unit id="org.eclipse.jetty.http" version="12.0.9"/>
47+
<unit id="org.eclipse.jetty.server" version="12.0.9"/>
48+
<unit id="org.eclipse.jetty.session" version="12.0.9"/>
49+
<unit id="org.eclipse.jetty.ee8.servlet" version="12.0.9"/>
50+
<unit id="org.eclipse.jetty.ee8.security" version="12.0.9"/>
5251
<unit id="com.sun.el.javax.el" version="3.0.4"/>
53-
<unit id="org.eclipse.search.core" version="3.16.0.v20230921-0933"/>
54-
<unit id="org.objectweb.asm" version="9.6.0"/>
55-
<unit id="org.objectweb.asm.commons" version="9.6.0"/>
56-
<unit id="org.objectweb.asm.util" version="9.6.0"/>
57-
<unit id="org.objectweb.asm.tree" version="9.6.0"/>
58-
<unit id="org.objectweb.asm.tree.analysis" version="9.6.0"/>
52+
<unit id="org.eclipse.search.core" version="3.16.200.v20240502-1134"/>
53+
<unit id="org.objectweb.asm" version="9.7.0"/>
54+
<unit id="org.objectweb.asm.commons" version="9.7.0"/>
55+
<unit id="org.objectweb.asm.util" version="9.7.0"/>
56+
<unit id="org.objectweb.asm.tree" version="9.7.0"/>
57+
<unit id="org.objectweb.asm.tree.analysis" version="9.7.0"/>
5958
<unit id="org.apache.commons.commons-codec" version="1.16.0"/>
60-
<repository location="https://download.eclipse.org/releases/2023-12/"/>
59+
<unit id="org.apache.commons.commons-compress" version="1.26.2"/>
60+
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.12.0.202405210827"/>
61+
<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.12.0.202405210827"/>
62+
<unit id="org.eclipse.tm4e.languageconfiguration" version="0.12.0.202405210827"/>
63+
<unit id="org.jcodings" version="1.0.58.v20230703-0749"/>
64+
<unit id="org.joni" version="2.2.1.v20230703-0749"/>
65+
<unit id="org.snakeyaml.engine" version="2.7.0"/>
66+
<repository location="https://download.eclipse.org/releases/2024-06/"/>
67+
</location>
68+
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
69+
<unit id="com.google.guava" version="33.2.0.jre"/>
70+
<unit id="com.google.gson" version="2.11.0"/>
71+
<unit id="bcpg" version="1.78.1"/>
72+
<unit id="bcpkix" version="1.78.1"/>
73+
<unit id="bcprov" version="1.78.1"/>
74+
<unit id="bcutil" version="1.78.1"/>
75+
<unit id="com.googlecode.javaewah.JavaEWAH" version="1.2.3"/>
76+
<unit id="org.apache.batik.css" version="1.17.0.v20231215-1130"/>
77+
<unit id="org.apache.batik.util" version="1.17.0.v20231215-1130"/>
78+
<unit id="org.apache.batik.constants" version="1.17.0.v20231215-1130"/>
79+
<unit id="org.apache.batik.i18n" version="1.17.0.v20231215-1130"/>
80+
<unit id="org.apache.commons.logging" version="1.2.0"/>
81+
<unit id="com.ibm.icu" version="75.1.0"/>
82+
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
83+
<unit id="com.google.inject" version="7.0.0"/>
84+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/"/>
6185
</location>
6286
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
63-
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
64-
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
65-
<unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
66-
<unit id="org.bouncycastle.bcpkix" version="1.72.0.v20221013-1810"/>
67-
<unit id="org.bouncycastle.bcprov" version="1.72.0.v20221013-1810"/>
68-
<unit id="org.bouncycastle.bcutil" version="1.72.0.v20221013-1810"/>
69-
<unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
70-
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
71-
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
7287
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
73-
<unit id="org.apache.batik.css" version="1.16.0.v20221027-0840"/>
74-
<unit id="org.apache.batik.util" version="1.16.0.v20221027-0840"/>
75-
<unit id="org.apache.batik.constants" version="1.16.0.v20221027-0840"/>
76-
<unit id="org.apache.batik.i18n" version="1.16.0.v20221027-0840"/>
77-
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
78-
<unit id="com.ibm.icu" version="72.1.0.v20221115-2007"/>
7988
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
8089
</location>
81-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
82-
<dependencies>
83-
<dependency>
84-
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
85-
<artifactId>org.w3c.dom.svg</artifactId>
86-
<version>1.1.0</version>
87-
<type>jar</type>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
91-
<artifactId>org.w3c.css.sac</artifactId>
92-
<version>1.3.0</version>
93-
<type>jar</type>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.eclipse.birt.runtime</groupId>
97-
<artifactId>org.w3c.dom.events</artifactId>
98-
<version>3.0.0.draft20060413_v201105210656</version>
99-
<type>jar</type>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
103-
<artifactId>org.w3c.dom.smil</artifactId>
104-
<version>1.0.0</version>
105-
<type>jar</type>
106-
</dependency>
107-
<dependency>
108-
<groupId>commons-io</groupId>
109-
<artifactId>commons-io</artifactId>
110-
<version>1.4</version>
111-
<type>jar</type>
112-
</dependency>
113-
<dependency>
114-
<groupId>javax.servlet</groupId>
115-
<artifactId>javax.servlet-api</artifactId>
116-
<version>4.0.1</version>
117-
<type>jar</type>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.glassfish.web</groupId>
121-
<artifactId>javax.servlet.jsp</artifactId>
122-
<version>2.3.4</version>
123-
<type>jar</type>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.eclipse.jetty.ee8</groupId>
127-
<artifactId>jetty-ee8-nested</artifactId>
128-
<version>12.0.5</version>
129-
<type>jar</type>
130-
</dependency>
131-
<dependency>
132-
<groupId>org.mortbay.jasper</groupId>
133-
<artifactId>apache-jsp</artifactId>
134-
<version>9.0.83</version>
135-
<type>jar</type>
136-
</dependency>
137-
</dependencies>
90+
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
91+
<dependencies>
92+
<dependency>
93+
<groupId>org.osgi</groupId>
94+
<artifactId>org.osgi.service.http.whiteboard</artifactId>
95+
<version>1.1.0</version>
96+
<type>jar</type>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
100+
<artifactId>org.w3c.dom.svg</artifactId>
101+
<version>1.1.0</version>
102+
<type>jar</type>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
106+
<artifactId>org.w3c.css.sac</artifactId>
107+
<version>1.3.0</version>
108+
<type>jar</type>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.eclipse.birt.runtime</groupId>
112+
<artifactId>org.w3c.dom.events</artifactId>
113+
<version>3.0.0.draft20060413_v201105210656</version>
114+
<type>jar</type>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
118+
<artifactId>org.w3c.dom.smil</artifactId>
119+
<version>1.0.0</version>
120+
<type>jar</type>
121+
</dependency>
122+
<dependency>
123+
<groupId>commons-io</groupId>
124+
<artifactId>commons-io</artifactId>
125+
<version>1.4</version>
126+
<type>jar</type>
127+
</dependency>
128+
<dependency>
129+
<groupId>javax.servlet</groupId>
130+
<artifactId>javax.servlet-api</artifactId>
131+
<version>4.0.1</version>
132+
<type>jar</type>
133+
</dependency>
134+
<dependency>
135+
<groupId>org.glassfish.web</groupId>
136+
<artifactId>javax.servlet.jsp</artifactId>
137+
<version>2.3.4</version>
138+
<type>jar</type>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.eclipse.jetty.ee8</groupId>
142+
<artifactId>jetty-ee8-nested</artifactId>
143+
<version>12.0.5</version>
144+
<type>jar</type>
145+
</dependency>
146+
<dependency>
147+
<groupId>org.mortbay.jasper</groupId>
148+
<artifactId>apache-jsp</artifactId>
149+
<version>9.0.83</version>
150+
<type>jar</type>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.eclipse.jetty.ee8</groupId>
154+
<artifactId>jetty-ee8-nested</artifactId>
155+
<version>12.0.11</version>
156+
<type>jar</type>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.slf4j</groupId>
160+
<artifactId>slf4j-simple</artifactId>
161+
<version>2.1.0-alpha1</version>
162+
<type>jar</type>
163+
</dependency>
164+
</dependencies>
138165
</location>
139166
</locations>
140167
</target>

‎com.eclipsesource.megit.parent/megit.tpd‎

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
target "MeGit Target"
22
with allEnvironments source
3-
location "https://download.eclipse.org/releases/2023-12/" {
3+
location "https://download.eclipse.org/releases/2024-06/" {
4+
org.eclipse.equinox.http.service.api
45
org.eclipse.jgit.feature.group
56
org.eclipse.jgit.gpg.bc.feature.group
67
org.eclipse.jgit.ssh.jsch.feature.group
@@ -34,12 +35,10 @@ location "https://download.eclipse.org/releases/2023-12/" {
3435
org.apache.lucene.core
3536
org.apache.lucene.analysis-common
3637
org.apache.lucene.analysis-smartcn
37-
slf4j.api
3838
org.apache.aries.spifly.dynamic.bundle
3939
org.apache.commons.jxpath
4040
com.sun.jna
4141
com.sun.jna.platform
42-
jakarta.inject.jakarta.inject-api
4342
jakarta.annotation-api
4443
org.eclipse.jetty.http
4544
org.eclipse.jetty.server
@@ -54,27 +53,42 @@ location "https://download.eclipse.org/releases/2023-12/" {
5453
org.objectweb.asm.tree
5554
org.objectweb.asm.tree.analysis
5655
org.apache.commons.commons-codec
56+
org.apache.commons.commons-compress
57+
org.eclipse.tm4e.feature.feature.group
58+
org.eclipse.tm4e.language_pack.feature.feature.group
59+
org.eclipse.tm4e.languageconfiguration
60+
org.jcodings
61+
org.joni
62+
org.snakeyaml.engine
5763
}
58-
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" {
64+
location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06/" {
5965
com.google.guava
6066
com.google.gson
61-
org.bouncycastle.bcpg
62-
org.bouncycastle.bcpkix
63-
org.bouncycastle.bcprov
64-
org.bouncycastle.bcutil
65-
org.objectweb.asm.analysis
66-
javaewah
67-
org.apache.commons.compress
68-
javax.inject
67+
bcpg
68+
bcpkix
69+
bcprov
70+
bcutil
71+
com.googlecode.javaewah.JavaEWAH
6972
org.apache.batik.css
7073
org.apache.batik.util
7174
org.apache.batik.constants
7275
org.apache.batik.i18n
7376
org.apache.commons.logging
7477
com.ibm.icu
78+
jakarta.inject.jakarta.inject-api
79+
com.google.inject
7580
}
7681

77-
maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
82+
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" {
83+
javax.inject
84+
}
85+
86+
maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=generate includeSources {
87+
dependency {
88+
groupId="org.osgi"
89+
artifactId="org.osgi.service.http.whiteboard"
90+
version="1.1.0"
91+
}
7892
dependency {
7993
groupId="org.eclipse.birt.runtime.3_7_1"
8094
artifactId="org.w3c.dom.svg"
@@ -120,4 +134,15 @@ maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManif
120134
artifactId="apache-jsp"
121135
version="9.0.83"
122136
}
137+
dependency {
138+
groupId="org.eclipse.jetty.ee8"
139+
artifactId="jetty-ee8-nested"
140+
version="12.0.11"
141+
}
142+
143+
dependency {
144+
groupId="org.slf4j"
145+
artifactId="slf4j-simple"
146+
version="2.1.0-alpha1"
147+
}
123148
}

‎com.eclipsesource.megit.parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.eclipsesource.megit</groupId>
88
<artifactId>com.eclipsesource.megit.parent</artifactId>
9-
<version>0.6.0-SNAPSHOT</version>
9+
<version>0.7.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<properties>

‎com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Plugin
44
Bundle-SymbolicName: com.eclipsesource.megit.plugin;singleton:=true
5-
Bundle-Version: 0.6.0.qualifier
5+
Bundle-Version: 0.7.0.qualifier
66
Bundle-Activator: com.eclipsesource.megit.plugin.Activator
77
Bundle-Vendor: ECLIPSESOURCE
88
Require-Bundle: org.eclipse.ui,

0 commit comments

Comments
 (0)