Skip to content

Commit bc59c3d

Browse files
plangerplanger
committed
Update to 2023-12
1 parent 59605f7 commit bc59c3d

File tree

7 files changed

+247
-67
lines changed

7 files changed

+247
-67
lines changed

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,5 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
5454
- 0.4.0 Update to Eclipse EGit 2023-06
5555
- 0.5.0 Update to Eclipse EGit 2023-09
5656
- Add Git LFS support
57+
- 0.6.0 Update to Eclipse EGit 2023-12
58+
- Package JVM with product (#42)

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

+118-63
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,140 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
3-
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="MeGit Target" sequenceNumber="1698865063">
3+
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4+
<target name="MeGit Target" sequenceNumber="1706818887">
45
<locations>
5-
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
6-
<unit id="org.eclipse.jgit.feature.group" version="6.7.0.202309050840-r"/>
7-
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.7.0.202309050840-r"/>
8-
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.7.0.202309050840-r"/>
9-
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.7.0.202309050840-r"/>
10-
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.7.0.202309050840-r"/>
11-
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.7.0.202309050840-r"/>
12-
<unit id="org.eclipse.egit.feature.group" version="6.7.0.202309050840-r"/>
13-
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.7.0.202309050840-r"/>
14-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.35.0.v20230829-0934"/>
6+
<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"/>
1516
<unit id="org.eclipse.emf.transaction.feature.group" version="1.13.0.202208110935"/>
1617
<unit id="org.eclipse.emf.validation.feature.group" version="1.13.3.202305230712"/>
17-
<unit id="org.eclipse.platform.ide" version="4.29.0.I20230903-1000"/>
18-
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2100.v20230814-2013"/>
19-
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.900.v20230808-1403"/>
20-
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.100.v20230801-1826"/>
21-
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.100.v20230728-2010"/>
22-
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2200.v20230717-2134"/>
23-
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20230507-1923"/>
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"/>
24+
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.2.v20231021-2127"/>
2425
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20230507-1921"/>
25-
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20230422-0242"/>
26-
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20230423-0417"/>
27-
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20230422-0242"/>
28-
<unit id="org.eclipse.jdt.core.compiler.batch" version="3.35.0.v20230814-2020"/>
29-
<unit id="org.eclipse.jdt.core" version="3.35.0.v20230814-1356"/>
30-
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
26+
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1900.v20230715-1945"/>
27+
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.702.v20231114-1017"/>
28+
<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"/>
31+
<unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
3132
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
32-
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
3333
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
34-
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20230516-1249"/>
35-
<unit id="org.apache.sshd.sftp" version="2.10.0"/>
36-
<unit id="org.apache.sshd.osgi" version="2.10.0"/>
37-
<unit id="org.apache.lucene.core" version="9.7.0.v20230703-0758"/>
38-
<unit id="org.apache.lucene.analysis-common" version="9.7.0.v20230703-0758"/>
39-
<unit id="org.apache.lucene.analysis-smartcn" version="9.7.0.v20230703-0758"/>
40-
<unit id="slf4j.api" version="2.0.7"/>
41-
<unit id="slf4j.nop" version="2.0.7"/>
42-
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.6"/>
43-
<unit id="javax.annotation" version="1.3.5.v20200909-1856"/>
44-
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
34+
<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"/>
41+
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
4542
<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
4643
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
4744
<unit id="com.sun.jna.platform" version="5.13.0"/>
48-
<repository location="https://download.eclipse.org/releases/2023-09/"/>
45+
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
46+
<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"/>
52+
<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"/>
59+
<unit id="org.apache.commons.commons-codec" version="1.16.0"/>
60+
<repository location="https://download.eclipse.org/releases/2023-12/"/>
4961
</location>
50-
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
62+
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
5163
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
5264
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
5365
<unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
5466
<unit id="org.bouncycastle.bcpkix" version="1.72.0.v20221013-1810"/>
5567
<unit id="org.bouncycastle.bcprov" version="1.72.0.v20221013-1810"/>
5668
<unit id="org.bouncycastle.bcutil" version="1.72.0.v20221013-1810"/>
57-
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
58-
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
59-
<unit id="org.objectweb.asm.commons" version="9.4.0.v20221107-1714"/>
60-
<unit id="org.objectweb.asm.util" version="9.4.0.v20221107-1714"/>
61-
<unit id="org.objectweb.asm.tree" version="9.4.0.v20221107-1714"/>
6269
<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"/>
72+
<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"/>
6379
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
6480
</location>
65-
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
66-
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
67-
<unit id="org.eclipse.justj.openjdk.hotspot.jre.base.feature.group" version="17.0.9.v20231028-0858"/>
68-
<unit id="org.eclipse.justj.openjdk.hotspot.jre.base.stripped.feature.group" version="17.0.9.v20231028-0858"/>
69-
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="17.0.9.v20231028-0858"/>
70-
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.feature.group" version="17.0.9.v20231028-0858"/>
71-
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.feature.group" version="17.0.9.v20231028-0858"/>
72-
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="17.0.9.v20231028-0858"/>
73-
</location>
74-
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" label="MavenDependencies" missingManifest="generate" type="Maven">
75-
<dependencies>
76-
<dependency>
77-
<groupId>commons-codec</groupId>
78-
<artifactId>commons-codec</artifactId>
79-
<version>1.15</version>
80-
<type>jar</type>
81-
</dependency>
82-
</dependencies>
83-
</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>
138+
</location>
84139
</locations>
85-
</target>
140+
</target>

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

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
target "MeGit Target"
2+
with allEnvironments source
3+
location "https://download.eclipse.org/releases/2023-12/" {
4+
org.eclipse.jgit.feature.group
5+
org.eclipse.jgit.gpg.bc.feature.group
6+
org.eclipse.jgit.ssh.jsch.feature.group
7+
org.eclipse.jgit.http.apache.feature.group
8+
org.eclipse.jgit.ssh.apache.feature.group
9+
org.eclipse.jgit.lfs.feature.group
10+
org.eclipse.egit.feature.group
11+
org.eclipse.egit.gitflow.feature.feature.group
12+
org.eclipse.emf.sdk.feature.group
13+
org.eclipse.emf.transaction.feature.group
14+
org.eclipse.emf.validation.feature.group
15+
org.eclipse.platform.ide
16+
org.eclipse.equinox.p2.rcp.feature.feature.group
17+
org.eclipse.equinox.sdk.feature.group
18+
org.eclipse.equinox.core.feature.feature.group
19+
org.eclipse.equinox.p2.discovery.feature.feature.group
20+
org.eclipse.equinox.executable.feature.group
21+
org.eclipse.ecf.core.feature.feature.group
22+
org.eclipse.ecf.core.ssl.feature.feature.group
23+
org.eclipse.ecf.filetransfer.feature.feature.group
24+
org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group
25+
org.eclipse.ecf.filetransfer.ssl.feature.feature.group
26+
org.eclipse.jdt.core.compiler.batch
27+
org.eclipse.jdt.core
28+
net.i2p.crypto.eddsa
29+
org.apache.commons.io
30+
org.apache.httpcomponents.httpcore
31+
org.apache.httpcomponents.httpclient
32+
org.apache.sshd.sftp
33+
org.apache.sshd.osgi
34+
org.apache.lucene.core
35+
org.apache.lucene.analysis-common
36+
org.apache.lucene.analysis-smartcn
37+
slf4j.api
38+
org.apache.aries.spifly.dynamic.bundle
39+
org.apache.commons.jxpath
40+
com.sun.jna
41+
com.sun.jna.platform
42+
jakarta.inject.jakarta.inject-api
43+
jakarta.annotation-api
44+
org.eclipse.jetty.http
45+
org.eclipse.jetty.server
46+
org.eclipse.jetty.session
47+
org.eclipse.jetty.ee8.servlet
48+
org.eclipse.jetty.ee8.security
49+
com.sun.el.javax.el
50+
org.eclipse.search.core
51+
org.objectweb.asm
52+
org.objectweb.asm.commons
53+
org.objectweb.asm.util
54+
org.objectweb.asm.tree
55+
org.objectweb.asm.tree.analysis
56+
org.apache.commons.commons-codec
57+
}
58+
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" {
59+
com.google.guava
60+
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
69+
org.apache.batik.css
70+
org.apache.batik.util
71+
org.apache.batik.constants
72+
org.apache.batik.i18n
73+
org.apache.commons.logging
74+
com.ibm.icu
75+
}
76+
77+
maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
78+
dependency {
79+
groupId="org.eclipse.birt.runtime.3_7_1"
80+
artifactId="org.w3c.dom.svg"
81+
version="1.1.0"
82+
}
83+
dependency {
84+
groupId="org.eclipse.birt.runtime.3_7_1"
85+
artifactId="org.w3c.css.sac"
86+
version="1.3.0"
87+
}
88+
dependency {
89+
groupId="org.eclipse.birt.runtime"
90+
artifactId="org.w3c.dom.events"
91+
version="3.0.0.draft20060413_v201105210656"
92+
}
93+
dependency {
94+
groupId="org.eclipse.birt.runtime.3_7_1"
95+
artifactId="org.w3c.dom.smil"
96+
version="1.0.0"
97+
}
98+
dependency {
99+
groupId="commons-io"
100+
artifactId="commons-io"
101+
version="1.4"
102+
}
103+
dependency {
104+
groupId="javax.servlet"
105+
artifactId="javax.servlet-api"
106+
version="4.0.1"
107+
}
108+
dependency {
109+
groupId="org.glassfish.web"
110+
artifactId="javax.servlet.jsp"
111+
version="2.3.4"
112+
}
113+
dependency {
114+
groupId="org.eclipse.jetty.ee8"
115+
artifactId="jetty-ee8-nested"
116+
version="12.0.5"
117+
}
118+
dependency {
119+
groupId="org.mortbay.jasper"
120+
artifactId="apache-jsp"
121+
version="9.0.83"
122+
}
123+
}

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

+1-1
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.5.0-SNAPSHOT</version>
9+
<version>0.6.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<properties>

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

+1-1
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.5.0.qualifier
5+
Bundle-Version: 0.6.0.qualifier
66
Bundle-Activator: com.eclipsesource.megit.plugin.Activator
77
Bundle-Vendor: ECLIPSESOURCE
88
Require-Bundle: org.eclipse.ui,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.5.0-SNAPSHOT</version>
10+
<version>0.6.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.plugin</artifactId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.eclipsesource.megit</groupId>
99
<artifactId>com.eclipsesource.megit.parent</artifactId>
10-
<version>0.5.0-SNAPSHOT</version>
10+
<version>0.6.0-SNAPSHOT</version>
1111
<relativePath>../com.eclipsesource.megit.parent</relativePath>
1212
</parent>
1313
<artifactId>com.eclipsesource.megit.product</artifactId>

0 commit comments

Comments
 (0)