Skip to content

Commit

Permalink
Update to 2023-12
Browse files Browse the repository at this point in the history
  • Loading branch information
@planger
planger committed Jan 21, 2024
1 parent 59605f7 commit 682c85c
Show file tree
Hide file tree
Showing 7 changed files with 256 additions and 67 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@ The runnable product will be available in `com.eclipsesource.megit.product/targe
- 0.4.0 Update to Eclipse EGit 2023-06
- 0.5.0 Update to Eclipse EGit 2023-09
- Add Git LFS support
- 0.6.0 Update to Eclipse EGit 2023-12
- Package JVM with product (#42)
186 changes: 123 additions & 63 deletions com.eclipsesource.megit.parent/megit.target
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,145 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="MeGit Target" sequenceNumber="1698865063">
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="MeGit Target" sequenceNumber="1705869523">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<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"/>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.jgit.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.jgit.gpg.bc.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.jgit.ssh.jsch.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.jgit.ssh.apache.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.jgit.lfs.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.egit.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="6.8.0.202311291450-r"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/>
<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.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.platform.ide" version="4.30.0.I20231201-0110"/>
<unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2200.v20231112-1314"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1000.v20231114-0937"/>
<unit id="org.eclipse.equinox.core.feature.feature.group" version="1.14.200.v20231110-1900"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.200.v20231104-1339"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2300.v20231106-1826"/>
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.2.v20231021-2127"/>
<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.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.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1900.v20230715-1945"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.702.v20231114-1017"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.402.v20231021-2127"/>
<unit id="org.eclipse.jdt.core.compiler.batch" version="3.36.0.v20231114-0937"/>
<unit id="org.eclipse.jdt.core" version="3.36.0.v20231115-1055"/>
<unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
<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.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.v20200909-1856"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.sshd.sftp" version="2.11.0"/>
<unit id="org.apache.sshd.osgi" version="2.11.0"/>
<unit id="org.apache.lucene.core" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.analysis-common" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.analysis-smartcn" version="9.8.0.v20230929-1030"/>
<unit id="slf4j.api" version="2.0.9"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
<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-09/"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="jakarta.annotation-api" version="2.1.1"/>
<unit id="org.eclipse.jetty.http" version="12.0.3"/>
<unit id="org.eclipse.jetty.server" version="12.0.3"/>
<unit id="org.eclipse.jetty.session" version="12.0.3"/>
<unit id="org.eclipse.jetty.ee8.servlet" version="12.0.3"/>
<unit id="org.eclipse.jetty.ee8.security" version="12.0.3"/>
<unit id="com.sun.el.javax.el" version="3.0.4"/>
<unit id="org.eclipse.search.core" version="3.16.0.v20230921-0933"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm.commons" version="9.6.0"/>
<unit id="org.objectweb.asm.util" version="9.6.0"/>
<unit id="org.objectweb.asm.tree" version="9.6.0"/>
<unit id="org.objectweb.asm.tree.analysis" version="9.6.0"/>
<repository location="https://download.eclipse.org/releases/2023-12/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
<unit id="org.bouncycastle.bcpkix" version="1.72.0.v20221013-1810"/>
<unit id="org.bouncycastle.bcprov" version="1.72.0.v20221013-1810"/>
<unit id="org.bouncycastle.bcutil" version="1.72.0.v20221013-1810"/>
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
<unit id="org.objectweb.asm.commons" version="9.4.0.v20221107-1714"/>
<unit id="org.objectweb.asm.util" version="9.4.0.v20221107-1714"/>
<unit id="org.objectweb.asm.tree" version="9.4.0.v20221107-1714"/>
<unit id="org.objectweb.asm.analysis" version="9.4.0.v20221107-1714"/>
<unit id="javaewah" version="1.1.13.v20211029-0839"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.apache.batik.css" version="1.16.0.v20221027-0840"/>
<unit id="org.apache.batik.util" version="1.16.0.v20221027-0840"/>
<unit id="org.apache.batik.constants" version="1.16.0.v20221027-0840"/>
<unit id="org.apache.batik.i18n" version="1.16.0.v20221027-0840"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="com.ibm.icu" version="72.1.0.v20221115-2007"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.base.feature.group" version="17.0.9.v20231028-0858"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.base.stripped.feature.group" version="17.0.9.v20231028-0858"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="17.0.9.v20231028-0858"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.feature.group" version="17.0.9.v20231028-0858"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.feature.group" version="17.0.9.v20231028-0858"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="17.0.9.v20231028-0858"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" label="MavenDependencies" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
<type>jar</type>
</dependency>
</dependencies>
</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>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>org.w3c.dom.svg</artifactId>
<version>1.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>org.w3c.css.sac</artifactId>
<version>1.3.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.w3c.dom.events</artifactId>
<version>3.0.0.draft20060413_v201105210656</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.innoventsolutions.birt.runtime</groupId>
<artifactId>org.w3c.dom.smil_1.0.1.v200903091627</artifactId>
<version>4.8.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
<version>1.4_3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.servlet.jsp</artifactId>
<version>2.3.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-nested</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<version>9.0.83</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>
</target>
127 changes: 127 additions & 0 deletions com.eclipsesource.megit.parent/megit.tpd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
target "MeGit Target"
with allEnvironments source
location "https://download.eclipse.org/releases/2023-12/" {
org.eclipse.jgit.feature.group
org.eclipse.jgit.gpg.bc.feature.group
org.eclipse.jgit.ssh.jsch.feature.group
org.eclipse.jgit.http.apache.feature.group
org.eclipse.jgit.ssh.apache.feature.group
org.eclipse.jgit.lfs.feature.group
org.eclipse.egit.feature.group
org.eclipse.egit.gitflow.feature.feature.group
org.eclipse.emf.sdk.feature.group
org.eclipse.emf.transaction.feature.group
org.eclipse.emf.validation.feature.group
org.eclipse.platform.ide
org.eclipse.equinox.p2.rcp.feature.feature.group
org.eclipse.equinox.sdk.feature.group
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.feature.feature.group
org.eclipse.ecf.core.ssl.feature.feature.group
org.eclipse.ecf.filetransfer.feature.feature.group
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
net.i2p.crypto.eddsa
org.apache.commons.io
org.apache.httpcomponents.httpcore
org.apache.httpcomponents.httpclient
org.apache.sshd.sftp
org.apache.sshd.osgi
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
org.eclipse.jetty.session
org.eclipse.jetty.ee8.servlet
org.eclipse.jetty.ee8.security
com.sun.el.javax.el
org.eclipse.search.core
org.objectweb.asm
org.objectweb.asm.commons
org.objectweb.asm.util
org.objectweb.asm.tree
org.objectweb.asm.tree.analysis
}
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" {
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
org.apache.batik.css
org.apache.batik.util
org.apache.batik.constants
org.apache.batik.i18n
org.apache.commons.logging
com.ibm.icu
}

maven MavenDependencies scope=compile,test dependencyDepth=infinite missingManifest=generate includeSources {
dependency {
groupId="commons-codec"
artifactId="commons-codec"
version="1.15"
}
dependency {
groupId="org.eclipse.birt.runtime.3_7_1"
artifactId="org.w3c.dom.svg"
version="1.1.0"
}
dependency {
groupId="org.eclipse.birt.runtime.3_7_1"
artifactId="org.w3c.css.sac"
version="1.3.0"
}
dependency {
groupId="org.eclipse.birt.runtime"
artifactId="org.w3c.dom.events"
version="3.0.0.draft20060413_v201105210656"
}
dependency {
groupId="com.innoventsolutions.birt.runtime"
artifactId="org.w3c.dom.smil_1.0.1.v200903091627"
version="4.8.0"
}
dependency {
groupId="org.apache.servicemix.bundles"
artifactId="org.apache.servicemix.bundles.commons-io"
version="1.4_3"
}
dependency {
groupId="javax.servlet"
artifactId="javax.servlet-api"
version="4.0.1"
}
dependency {
groupId="org.glassfish.web"
artifactId="javax.servlet.jsp"
version="2.3.4"
}
dependency {
groupId="org.eclipse.jetty.ee8"
artifactId="jetty-ee8-nested"
version="12.0.5"
}
dependency {
groupId="org.mortbay.jasper"
artifactId="apache-jsp"
version="9.0.83"
}
}
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.eclipsesource.megit</groupId>
<artifactId>com.eclipsesource.megit.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0.qualifier
Bundle-Version: 0.6.0.qualifier
Bundle-Activator: com.eclipsesource.megit.plugin.Activator
Bundle-Vendor: ECLIPSESOURCE
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.eclipsesource.megit</groupId>
<artifactId>com.eclipsesource.megit.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
<relativePath>../com.eclipsesource.megit.parent</relativePath>
</parent>
<artifactId>com.eclipsesource.megit.plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.eclipsesource.megit.product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.eclipsesource.megit</groupId>
<artifactId>com.eclipsesource.megit.parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
<relativePath>../com.eclipsesource.megit.parent</relativePath>
</parent>
<artifactId>com.eclipsesource.megit.product</artifactId>
Expand Down

0 comments on commit 682c85c

Please sign in to comment.