diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c91a229..0db46c0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -32,7 +32,10 @@ jobs: with: maven-version: 3.9.9 - name: Build with Maven - run: mvn -B verify --file pom.xml + run: | + set -xeu + mvn -N -B generate-resources + mvn -B verify --file pom.xml # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive # - name: Update dependency graph diff --git a/Jenkinsfile b/Jenkinsfile index 11af384..46631bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,6 +26,7 @@ pipeline { ; then withOfficialSuffix='-DunofficialSuffix=' fi + mvn -N -B generate-resources mvn -B clean verify ${withOfficialSuffix} ! test -r ./p2 mv sites/org.eclipse.tea.repository/target/repository p2 diff --git a/bundles/org.eclipse.tea.core.ui.live/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.core.ui.live/META-INF/MANIFEST.MF index 0d36d6d..0e8a7e8 100644 --- a/bundles/org.eclipse.tea.core.ui.live/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.core.ui.live/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.tea.core.ui.live Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tea.core.ui.live;singleton:=true -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.100", diff --git a/bundles/org.eclipse.tea.core.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.core.ui/META-INF/MANIFEST.MF index b120bb5..921a242 100644 --- a/bundles/org.eclipse.tea.core.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.core.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tea.core.ui;singleton:=true -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-Activator: org.eclipse.tea.core.ui.Activator Export-Package: org.eclipse.tea.core.ui; uses:="org.eclipse.tea.core, diff --git a/bundles/org.eclipse.tea.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.core/META-INF/MANIFEST.MF index ef8b8bd..c732c35 100644 --- a/bundles/org.eclipse.tea.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.core/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tea.core;singleton:=true -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-Activator: org.eclipse.tea.core.internal.TaskingEngineActivator Require-Bundle: org.osgi.service.event;bundle-version="1.4.1";resolution:=optional, org.eclipse.core.runtime;bundle-version="3.31.100", diff --git a/bundles/org.eclipse.tea.ease/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.ease/META-INF/MANIFEST.MF index 2d27e36..8f62577 100644 --- a/bundles/org.eclipse.tea.ease/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.ease/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tea.ease;singleton:=true -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.tea.core, org.eclipse.e4.core.di;bundle-version="1.9.500", diff --git a/bundles/org.eclipse.tea.library.build.lcdsl/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.library.build.lcdsl/META-INF/MANIFEST.MF index 8c30541..c1212a2 100644 --- a/bundles/org.eclipse.tea.library.build.lcdsl/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.library.build.lcdsl/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tea.library.build.lcdsl;singleton:=true -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.resources;bundle-version="3.21.0", org.eclipse.core.runtime;bundle-version="3.31.100", diff --git a/bundles/org.eclipse.tea.library.build/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.library.build/META-INF/MANIFEST.MF index fdbb33f..1ea77af 100644 --- a/bundles/org.eclipse.tea.library.build/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.library.build/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tea.library.build;singleton:=true -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.resources;bundle-version="3.21.0", org.osgi.service.event;bundle-version="1.4.1";resolution:=optional, diff --git a/bundles/org.eclipse.tea.samples/META-INF/MANIFEST.MF b/bundles/org.eclipse.tea.samples/META-INF/MANIFEST.MF index 3a2a739..e6df568 100644 --- a/bundles/org.eclipse.tea.samples/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.tea.samples/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tea.samples -Bundle-Version: 4.2.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-Activator: org.eclipse.tea.samples.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.100", org.eclipse.tea.core, diff --git a/features/org.eclipse.tea.core_feature/feature.xml b/features/org.eclipse.tea.core_feature/feature.xml index 4605668..967f2db 100644 --- a/features/org.eclipse.tea.core_feature/feature.xml +++ b/features/org.eclipse.tea.core_feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.tea.lcdsl.library_feature/feature.xml b/features/org.eclipse.tea.lcdsl.library_feature/feature.xml index 85915b0..11ce764 100644 --- a/features/org.eclipse.tea.lcdsl.library_feature/feature.xml +++ b/features/org.eclipse.tea.lcdsl.library_feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.tea.library_feature/feature.xml b/features/org.eclipse.tea.library_feature/feature.xml index 3648f0f..b10054d 100644 --- a/features/org.eclipse.tea.library_feature/feature.xml +++ b/features/org.eclipse.tea.library_feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.tea.scripting_feature/feature.xml b/features/org.eclipse.tea.scripting_feature/feature.xml index 8242e53..84aa7ee 100644 --- a/features/org.eclipse.tea.scripting_feature/feature.xml +++ b/features/org.eclipse.tea.scripting_feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.tea.ui_feature/feature.xml b/features/org.eclipse.tea.ui_feature/feature.xml index 069a871..9a523d6 100644 --- a/features/org.eclipse.tea.ui_feature/feature.xml +++ b/features/org.eclipse.tea.ui_feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/oomph/EclipseTEA.setup b/oomph/EclipseTEA.setup index cd7dd5e..d042d0b 100644 --- a/oomph/EclipseTEA.setup +++ b/oomph/EclipseTEA.setup @@ -49,7 +49,7 @@ diff --git a/pom.xml b/pom.xml index 321cdcb..41dd25d 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 4.0.0 org.eclipse parent - 4.2.1-SNAPSHOT + 5.0.0-SNAPSHOT pom @@ -115,7 +115,7 @@ ${tycho-version} - ../../sites/org.eclipse.tea.repository/eclipse-2024-09.target + ../../sites/org.eclipse.tea.repository/eclipse-2026-06.target @@ -150,6 +150,7 @@ false + bootstrap-target-from-tpd eclipse-run @@ -183,7 +184,7 @@ -application org.eclipse.cbi.targetplatform.tpd.converter - sites/org.eclipse.tea.repository/eclipse-2024-09.tpd + sites/org.eclipse.tea.repository/eclipse-2026-06.tpd diff --git a/sites/org.eclipse.tea.repository/.gitignore b/sites/org.eclipse.tea.repository/.gitignore new file mode 100644 index 0000000..4e13abb --- /dev/null +++ b/sites/org.eclipse.tea.repository/.gitignore @@ -0,0 +1 @@ +/*.target diff --git a/sites/org.eclipse.tea.repository/eclipse-2024-09.target b/sites/org.eclipse.tea.repository/eclipse-2024-09.target deleted file mode 100644 index 442b6cc..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2024-09.target +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sites/org.eclipse.tea.repository/eclipse-2024-09.tpd b/sites/org.eclipse.tea.repository/eclipse-2024-09.tpd deleted file mode 100644 index 5a37b48..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2024-09.tpd +++ /dev/null @@ -1,67 +0,0 @@ -target "Eclipse 2024-09" - -with source requirements -environment JavaSE-21 - -location "https://download.eclipse.org/releases/2024-09/202409111000/" { - com.google.gson - com.google.guava [33,34) - com.google.inject - - io.github.classgraph.classgraph - com.googlecode.javaewah.JavaEWAH - net.i2p.crypto.eddsa - - org.aopalliance - - org.apache.commons.codec - org.apache.commons.io - org.apache.commons.logging - org.apache.httpcomponents.httpclient - org.apache.httpcomponents.httpcore - org.apache.log4j - org.apache.sshd.osgi - org.apache.sshd.sftp - - org.eclipse.draw2d.feature.group - org.eclipse.e4.ui.progress - org.eclipse.e4.tools.emf.ui - org.eclipse.e4.tools.services - org.eclipse.ecf - org.eclipse.ecf.identity - org.eclipse.ecf.filetransfer - org.eclipse.egit.feature.group - org.eclipse.emf.feature.group - org.eclipse.jgit.feature.group - org.eclipse.jgit.gpg.bc.feature.group - org.eclipse.jgit.http.apache.feature.group - org.eclipse.jgit.lfs.feature.group - org.eclipse.jgit.ssh.apache.feature.group - org.eclipse.m2e.feature.feature.group - org.eclipse.sdk.feature.group - org.eclipse.xtext.sdk.feature.group - - org.objectweb.asm - org.objectweb.asm.tree - - org.sat4j.core - org.sat4j.pb - - slf4j.api - slf4j.nop -} - -location "https://download.eclipse.org/ease/release/0.8.0/" { - org.eclipse.ease.feature.feature.group - org.eclipse.ease.lang.python.feature.feature.group - org.eclipse.ease.ui.feature.feature.group - org.eclipse.ease.python.jython.feature.feature.group -} - -location "https://download.eclipse.org/tracecompass.incubator/2021-06/master/rcp-repository" { - org.jython -} - -location "https://github.com/ssi-schaefer/lcdsl/releases/download/1.0.0/" { - com.wamas.ide.launching.feature.feature.group -} diff --git a/sites/org.eclipse.tea.repository/eclipse-2025-09.target b/sites/org.eclipse.tea.repository/eclipse-2025-09.target deleted file mode 100644 index 5393717..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2025-09.target +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sites/org.eclipse.tea.repository/eclipse-2025-09.tpd b/sites/org.eclipse.tea.repository/eclipse-2025-09.tpd deleted file mode 100644 index d70e94a..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2025-09.tpd +++ /dev/null @@ -1,65 +0,0 @@ -target "Eclipse 2025-09" - -with source requirements -environment JavaSE-21 - -location "https://download.eclipse.org/releases/2025-09/202509101001/" { - com.google.gson - com.google.guava [33,34) - com.google.inject - - io.github.classgraph.classgraph - com.googlecode.javaewah.JavaEWAH - - org.aopalliance - - org.apache.commons.codec - org.apache.commons.io - org.apache.commons.logging - org.apache.httpcomponents.httpclient - org.apache.httpcomponents.httpcore - org.apache.log4j - org.apache.sshd.osgi - org.apache.sshd.sftp - - org.eclipse.draw2d.feature.group - org.eclipse.e4.ui.progress - org.eclipse.e4.tools.emf.ui - org.eclipse.e4.tools.services - org.eclipse.ecf - org.eclipse.ecf.identity - org.eclipse.ecf.filetransfer - org.eclipse.egit.feature.group - org.eclipse.emf.feature.group - org.eclipse.jgit.feature.group - org.eclipse.jgit.gpg.bc.feature.group - org.eclipse.jgit.http.apache.feature.group - org.eclipse.jgit.lfs.feature.group - org.eclipse.jgit.ssh.apache.feature.group - org.eclipse.m2e.feature.feature.group - org.eclipse.sdk.feature.group - org.eclipse.xtext.sdk.feature.group - - org.objectweb.asm - org.objectweb.asm.tree - - org.sat4j.core - org.sat4j.pb - - slf4j.api -} - -location "https://download.eclipse.org/ease/integration/nightly/" { - org.eclipse.ease.feature.feature.group - org.eclipse.ease.lang.python.feature.feature.group - org.eclipse.ease.ui.feature.feature.group - org.eclipse.ease.python.jython.feature.feature.group -} - -location "https://download.eclipse.org/tracecompass.incubator/2024-12/master/rcp-repository" { - org.jython -} - -location "https://github.com/ssi-schaefer/lcdsl/releases/download/1.0.0/" { - com.wamas.ide.launching.feature.feature.group -} diff --git a/sites/org.eclipse.tea.repository/eclipse-2025-12.target b/sites/org.eclipse.tea.repository/eclipse-2025-12.target deleted file mode 100644 index fa45beb..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2025-12.target +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd b/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd deleted file mode 100644 index 42e3396..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2025-12.tpd +++ /dev/null @@ -1,65 +0,0 @@ -target "Eclipse 2025-12" - -with source requirements -environment JavaSE-21 - -location "https://download.eclipse.org/releases/2025-12/202512101000/" { - com.google.gson - com.google.guava [33,34) - com.google.inject - - io.github.classgraph.classgraph - com.googlecode.javaewah.JavaEWAH - - org.aopalliance - - org.apache.commons.codec - org.apache.commons.commons-io - org.apache.commons.logging - org.apache.httpcomponents.httpclient - org.apache.httpcomponents.httpcore - org.apache.log4j - org.apache.sshd.osgi - org.apache.sshd.sftp - - org.eclipse.draw2d.feature.group - org.eclipse.e4.ui.progress - org.eclipse.e4.tools.emf.ui - org.eclipse.e4.tools.services - org.eclipse.ecf - org.eclipse.ecf.identity - org.eclipse.ecf.filetransfer - org.eclipse.egit.feature.group - org.eclipse.emf.feature.group - org.eclipse.jgit.feature.group - org.eclipse.jgit.gpg.bc.feature.group - org.eclipse.jgit.http.apache.feature.group - org.eclipse.jgit.lfs.feature.group - org.eclipse.jgit.ssh.apache.feature.group - org.eclipse.m2e.feature.feature.group - org.eclipse.sdk.feature.group - org.eclipse.xtext.sdk.feature.group - - org.objectweb.asm - org.objectweb.asm.tree - - org.sat4j.core - org.sat4j.pb - - slf4j.api -} - -location "https://download.eclipse.org/ease/integration/nightly/" { - org.eclipse.ease.feature.feature.group - org.eclipse.ease.lang.python.feature.feature.group - org.eclipse.ease.ui.feature.feature.group - org.eclipse.ease.python.jython.feature.feature.group -} - -location "https://download.eclipse.org/tracecompass.incubator/2024-12/master/rcp-repository" { - org.jython -} - -location "https://github.com/ssi-schaefer/lcdsl/releases/download/2.0.0/" { - com.wamas.ide.launching.feature.feature.group -} diff --git a/sites/org.eclipse.tea.repository/eclipse-2026-03.target b/sites/org.eclipse.tea.repository/eclipse-2026-03.target deleted file mode 100644 index e8f8cb6..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2026-03.target +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sites/org.eclipse.tea.repository/eclipse-2026-03.tpd b/sites/org.eclipse.tea.repository/eclipse-2026-03.tpd deleted file mode 100644 index ad301a6..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2026-03.tpd +++ /dev/null @@ -1,64 +0,0 @@ -target "Eclipse 2026-03" - -with source requirements -environment JavaSE-21 - -location "https://download.eclipse.org/releases/2026-03/202603111000/" { - com.google.gson - com.google.guava [33,34) - com.google.inject - - io.github.classgraph.classgraph - com.googlecode.javaewah.JavaEWAH - - org.aopalliance - - org.apache.commons.codec - org.apache.commons.commons-io - org.apache.httpcomponents.httpclient - org.apache.httpcomponents.httpcore - org.apache.log4j - org.apache.sshd.osgi - org.apache.sshd.sftp - - org.eclipse.draw2d.feature.group - org.eclipse.e4.ui.progress - org.eclipse.e4.tools.emf.ui - org.eclipse.e4.tools.services - org.eclipse.ecf - org.eclipse.ecf.identity - org.eclipse.ecf.filetransfer - org.eclipse.egit.feature.group - org.eclipse.emf.feature.group - org.eclipse.jgit.feature.group - org.eclipse.jgit.gpg.bc.feature.group - org.eclipse.jgit.http.apache.feature.group - org.eclipse.jgit.lfs.feature.group - org.eclipse.jgit.ssh.apache.feature.group - org.eclipse.m2e.feature.feature.group - org.eclipse.sdk.feature.group - org.eclipse.xtext.sdk.feature.group - - org.objectweb.asm - org.objectweb.asm.tree - - org.sat4j.core - org.sat4j.pb - - slf4j.api -} - -location "https://download.eclipse.org/ease/integration/nightly/" { - org.eclipse.ease.feature.feature.group - org.eclipse.ease.lang.python.feature.feature.group - org.eclipse.ease.ui.feature.feature.group - org.eclipse.ease.python.jython.feature.feature.group -} - -location "https://download.eclipse.org/tracecompass.incubator/2024-12/master/rcp-repository" { - org.jython -} - -location "https://github.com/ssi-schaefer/lcdsl/releases/download/2.0.0/" { - com.wamas.ide.launching.feature.feature.group -} diff --git a/sites/org.eclipse.tea.repository/eclipse-2026-06.target b/sites/org.eclipse.tea.repository/eclipse-2026-06.target deleted file mode 100644 index ffa20af..0000000 --- a/sites/org.eclipse.tea.repository/eclipse-2026-06.target +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -