diff --git a/README.md b/README.md index 3aaf323..11fdaba 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/com.eclipsesource.megit.parent/megit.target b/com.eclipsesource.megit.parent/megit.target index 1df2f0a..bc2e878 100644 --- a/com.eclipsesource.megit.parent/megit.target +++ b/com.eclipsesource.megit.parent/megit.target @@ -1,85 +1,140 @@ - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + - - - - - - - - - - - - - commons-codec - commons-codec - 1.15 - 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 + + + - \ No newline at end of file + diff --git a/com.eclipsesource.megit.parent/megit.tpd b/com.eclipsesource.megit.parent/megit.tpd new file mode 100644 index 0000000..3204ce8 --- /dev/null +++ b/com.eclipsesource.megit.parent/megit.tpd @@ -0,0 +1,123 @@ +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 + org.apache.commons.commons-codec +} +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="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="org.eclipse.birt.runtime.3_7_1" + artifactId="org.w3c.dom.smil" + version="1.0.0" + } + dependency { + groupId="commons-io" + artifactId="commons-io" + version="1.4" + } + 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" + } +} diff --git a/com.eclipsesource.megit.parent/pom.xml b/com.eclipsesource.megit.parent/pom.xml index 49d0c30..1c92cee 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.5.0-SNAPSHOT + 0.6.0-SNAPSHOT pom diff --git a/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF b/com.eclipsesource.megit.plugin/META-INF/MANIFEST.MF index f2a0ab1..85c4eb4 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.5.0.qualifier +Bundle-Version: 0.6.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 230066c..f397d20 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.5.0-SNAPSHOT + 0.6.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 528eb8d..50f1cdc 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.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../com.eclipsesource.megit.parent com.eclipsesource.megit.product