diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd9ee468e..b28e42313 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,18 +9,20 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: true - - name: Set up JDK 11 - uses: actions/setup-java@v4 + - name: Set up JDKs + uses: actions/setup-java@v5 with: - java-version: 11 distribution: temurin + java-version: | + 11 + 21 - name: Setup Maven run: echo "MAVEN_OPTS='-Xmx2048m'" > ~/.mavenrc - name: Cache maven repo - uses: actions/cache@v4 + uses: actions/cache@v5 env: cache-name: cache-maven-repo with: diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 8808924cd..a69488da0 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -14,8 +14,8 @@ --> - org.eclipse.tycho.extras - tycho-pomless - 1.7.0 + org.eclipse.tycho + tycho-build + 3.0.5 \ No newline at end of file diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/README-MAINTAINER.md b/README-MAINTAINER.md index 4d7e4386a..2692c214a 100644 --- a/README-MAINTAINER.md +++ b/README-MAINTAINER.md @@ -17,8 +17,8 @@ git clone --recurse-submodule https://github.com/eclipse-embed-cdt/eclipse-plugi Production builds are run via [Jenkins](https://ci.eclipse.org/embed-cdt/) -on the Eclipse Foundation infrastructure (CBI); for local builds, use the -[Adopt OpenJDK 11](https://adoptopenjdk.net) and maven 3.6. +on the Eclipse Foundation infrastructure (CBI); for local builds, use +[Java 21](https://adoptium.net) and [Maven 3.9](https://maven.apache.org/). ## Development workflow diff --git a/parent/pom.xml b/parent/pom.xml index bfa5c59a0..3993ce95c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - 3.6.3 + 3.9.11 - 1.7.0 + + 3.0.5 UTF-8 @@ -42,7 +42,7 @@ yyyyMMddHHmm - 1.3.1 + 1.5.2 6.6.1 @@ -104,7 +104,6 @@ target-platform-configuration ${tycho.version} - p2 consider @@ -154,35 +153,17 @@ - attach-source + plugin-source plugin-source - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho.version} - - - false - - false - - - source-feature + feature-source package - source-feature + feature-source - - - - - @@ -263,30 +244,6 @@ - - - feature-no-source - - - feature-no-source.properties - - - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho.version} - - - source-feature - none - - - - - - production @@ -305,6 +262,23 @@ + + org.eclipse.tycho + tycho-gpg-plugin + ${tycho.version} + + + pgpsigner + + sign-p2-artifacts + + + 01727E9DB95289B9 + false + + + + diff --git a/plugins/org.eclipse.embedcdt.core/.classpath b/plugins/org.eclipse.embedcdt.core/.classpath index 7a394f3d2..685a6999c 100644 --- a/plugins/org.eclipse.embedcdt.core/.classpath +++ b/plugins/org.eclipse.embedcdt.core/.classpath @@ -1,13 +1,10 @@ - - - - - - - - + + + + + diff --git a/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF index 1627665bb..fc3b1bb61 100644 --- a/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF @@ -490,111 +490,17 @@ Export-Package: org.eclipse.embedcdt.core, org.eclipse.embedcdt.managedbuild.cross.core, org.eclipse.embedcdt.managedbuild.cross.riscv.core, org.eclipse.embedcdt.packs.core, - org.eclipse.embedcdt.templates.core", - org.json.simple;version="1.1.1"; - x-friends:="org.eclipse.embedcdt.debug.gdbjtag.core, - org.eclipse.embedcdt, - org.eclipse.embedcdt.codered, - org.eclipse.embedcdt.codered.ui, - org.eclipse.embedcdt.core, - org.eclipse.embedcdt.debug.core, - org.eclipse.embedcdt.debug.gdbjtag, - org.eclipse.embedcdt.debug.gdbjtag.jlink, - org.eclipse.embedcdt.debug.gdbjtag.jlink.core, - org.eclipse.embedcdt.debug.gdbjtag.jlink.ui, - org.eclipse.embedcdt.debug.gdbjtag.openocd, - org.eclipse.embedcdt.debug.gdbjtag.openocd.core, - org.eclipse.embedcdt.debug.gdbjtag.openocd.ui, - org.eclipse.embedcdt.debug.gdbjtag.pyocd, - org.eclipse.embedcdt.debug.gdbjtag.pyocd.core, - org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui, - org.eclipse.embedcdt.debug.gdbjtag.qemu, - org.eclipse.embedcdt.debug.gdbjtag.qemu.core, - org.eclipse.embedcdt.debug.gdbjtag.qemu.ui, - org.eclipse.embedcdt.debug.gdbjtag.restart.ui, - org.eclipse.embedcdt.debug.gdbjtag.ui, - org.eclipse.embedcdt.debug.packs, - org.eclipse.embedcdt.doc.user, - org.eclipse.embedcdt.managedbuild.cross, - org.eclipse.embedcdt.managedbuild.cross.arm, - org.eclipse.embedcdt.managedbuild.cross.arm.core, - org.eclipse.embedcdt.managedbuild.cross.arm.ui, - org.eclipse.embedcdt.managedbuild.cross.core, - org.eclipse.embedcdt.managedbuild.cross.riscv, - org.eclipse.embedcdt.managedbuild.cross.riscv.core, - org.eclipse.embedcdt.managedbuild.cross.riscv.ui, - org.eclipse.embedcdt.managedbuild.cross.ui, - org.eclipse.embedcdt.managedbuild.packs.ui, - org.eclipse.embedcdt.packs, - org.eclipse.embedcdt.packs.core, - org.eclipse.embedcdt.packs.ui, - org.eclipse.embedcdt.templates.ad, - org.eclipse.embedcdt.templates.ad.ui, - org.eclipse.embedcdt.templates.core, - org.eclipse.embedcdt.templates.cortexm, - org.eclipse.embedcdt.templates.cortexm.ui, - org.eclipse.embedcdt.templates.xpack, - org.eclipse.embedcdt.templates.xpack.ui, - org.eclipse.embedcdt.templates.freescale, - org.eclipse.embedcdt.templates.freescale.pe.ui, - org.eclipse.embedcdt.templates.freescale.ui, - org.eclipse.embedcdt.templates.sifive, - org.eclipse.embedcdt.templates.sifive.ui, - org.eclipse.embedcdt.templates.stm, - org.eclipse.embedcdt.templates.stm.ui, - org.eclipse.embedcdt.ui", - org.json.simple.parser;version="1.1.1"; - x-friends:="org.eclipse.embedcdt, - org.eclipse.embedcdt.codered, - org.eclipse.embedcdt.codered.ui, - org.eclipse.embedcdt.core, - org.eclipse.embedcdt.debug.core, - org.eclipse.embedcdt.debug.gdbjtag, - org.eclipse.embedcdt.debug.gdbjtag.core, - org.eclipse.embedcdt.debug.gdbjtag.jlink, - org.eclipse.embedcdt.debug.gdbjtag.jlink.core, - org.eclipse.embedcdt.debug.gdbjtag.jlink.ui, - org.eclipse.embedcdt.debug.gdbjtag.openocd, - org.eclipse.embedcdt.debug.gdbjtag.openocd.core, - org.eclipse.embedcdt.debug.gdbjtag.openocd.ui, - org.eclipse.embedcdt.debug.gdbjtag.pyocd, - org.eclipse.embedcdt.debug.gdbjtag.pyocd.core, - org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui, - org.eclipse.embedcdt.debug.gdbjtag.qemu, - org.eclipse.embedcdt.debug.gdbjtag.qemu.core, - org.eclipse.embedcdt.debug.gdbjtag.qemu.ui, - org.eclipse.embedcdt.debug.gdbjtag.restart.ui, - org.eclipse.embedcdt.debug.gdbjtag.ui, - org.eclipse.embedcdt.debug.packs, - org.eclipse.embedcdt.doc.user, - org.eclipse.embedcdt.managedbuild.cross, - org.eclipse.embedcdt.managedbuild.cross.arm, - org.eclipse.embedcdt.managedbuild.cross.arm.core, - org.eclipse.embedcdt.managedbuild.cross.arm.ui, - org.eclipse.embedcdt.managedbuild.cross.core, - org.eclipse.embedcdt.managedbuild.cross.riscv, - org.eclipse.embedcdt.managedbuild.cross.riscv.core, - org.eclipse.embedcdt.managedbuild.cross.riscv.ui, - org.eclipse.embedcdt.managedbuild.cross.ui, - org.eclipse.embedcdt.managedbuild.packs.ui, - org.eclipse.embedcdt.packs, - org.eclipse.embedcdt.packs.core, - org.eclipse.embedcdt.packs.ui, - org.eclipse.embedcdt.templates.ad, - org.eclipse.embedcdt.templates.ad.ui, - org.eclipse.embedcdt.templates.core, - org.eclipse.embedcdt.templates.cortexm, - org.eclipse.embedcdt.templates.cortexm.ui, - org.eclipse.embedcdt.templates.xpack, - org.eclipse.embedcdt.templates.xpack.ui, - org.eclipse.embedcdt.templates.freescale, - org.eclipse.embedcdt.templates.freescale.pe.ui, - org.eclipse.embedcdt.templates.freescale.ui, - org.eclipse.embedcdt.templates.sifive, - org.eclipse.embedcdt.templates.sifive.ui, - org.eclipse.embedcdt.templates.stm, - org.eclipse.embedcdt.templates.stm.ui, - org.eclipse.embedcdt.ui" + org.eclipse.embedcdt.templates.core" +Import-Package: com.fasterxml.jackson.core;version="[2.21.0,3.0.0)", + com.fasterxml.jackson.databind;version="[2.21.0,3.0.0)", + org.antlr.runtime;version="[3.5.0,4.0.0)", + org.antlr.runtime.debug;version="[3.5.0,4.0.0)", + org.antlr.runtime.misc;version="[3.5.0,4.0.0)", + org.antlr.runtime.tree;version="[3.5.0,4.0.0)", + org.json.simple;version="1.1.1", + org.json.simple.parser;version="1.1.1", + org.jsoup;version="[1.22.0,2.0.0)", + org.jsoup.nodes;version="[1.22.0,2.0.0)" Require-Bundle: org.eclipse.cdt.core;bundle-version="7.0.0", org.eclipse.cdt.debug.core;bundle-version="8.5.0", org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0", @@ -602,12 +508,5 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="7.0.0", org.eclipse.core.variables;bundle-version="3.4.800", org.eclipse.debug.core;bundle-version="3.16.0", org.eclipse.core.expressions;bundle-version="3.7.0" -Bundle-ClassPath: lib/antlr-runtime-3.5.2.jar, - lib/jackson-annotations-2.9.9.jar, - lib/jackson-core-2.9.9.jar, - lib/jackson-databind-2.9.9.3.jar, - lib/ST4-4.0.8.jar, - lib/json-simple-1.1.1.jar, - lib/org.jsoup_1.7.2.v201411291515.jar, - . +Bundle-ClassPath: . Automatic-Module-Name: org.eclipse.embedcdt.core diff --git a/plugins/org.eclipse.embedcdt.core/build.properties b/plugins/org.eclipse.embedcdt.core/build.properties index de9329869..427ed2612 100644 --- a/plugins/org.eclipse.embedcdt.core/build.properties +++ b/plugins/org.eclipse.embedcdt.core/build.properties @@ -19,13 +19,7 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ plugin.properties,\ - lib/antlr-runtime-3.5.2.jar,\ - lib/jackson-annotations-2.9.9.jar,\ - lib/jackson-core-2.9.9.jar,\ - lib/jackson-databind-2.9.9.3.jar,\ - lib/ST4-4.0.8.jar,\ - lib/json-simple-1.1.1.jar,\ - lib/org.jsoup_1.7.2.v201411291515.jar,\ + about.html,\ .options src.includes = about.html diff --git a/plugins/org.eclipse.embedcdt.core/lib/README.md b/plugins/org.eclipse.embedcdt.core/lib/README.md deleted file mode 100644 index 4969ed239..000000000 --- a/plugins/org.eclipse.embedcdt.core/lib/README.md +++ /dev/null @@ -1,106 +0,0 @@ -# Dependencies - -## org.jsoup - -The `org.jsoup_1.7.2.v201411291515.jar` archive is downloaded from -[Orbit R20201130205003](https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/). - -## JSON - -The JSON.simple library `json-simple-1.1.1.json` is downloaded from: - -https://code.google.com/archive/p/json-simple/downloads - -* copy `json-simple-1.1.1.json` to `lib` -* in plugin.xml editor -> **Runtime** - * **Classpath** - * **Add...** `lib/json-simple-1.1.1.json` - * **Exported Packages** - * **Add...** `org.json.simple` - -## Eclipse Orbit - -[Downloads](https://download.eclipse.org/tools/orbit/downloads/) - -From [Bugzilla](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21415#c27) - -Already approved - -```console -> ./plugins/org.eclipse.embedcdt.core/lib/json-simple-1.1.1.jar -Already approved. CQ#9858 -``` - -Submitted as separate CQ - -```console -> ./plugins/org.eclipse.embedcdt.core/lib/org.eclipse.embedcdt.core.liqp-0.6.8.jar - -Good contender for first submission. It appears to be MIT license and I don't -think there is a CQ about it already. -https://github.com/bkiers/Liqp/releases/tag/org.eclipse.embedcdt.core.liqp-0.6.8 -``` - -To be upgraded: - -```console -> ./plugins/org.eclipse.embedcdt.core/lib/ST4-4.0.7.jar -Similar versions already approved - so if you can use one of them it will be a -little easier. CQ#14504 is for 4.0.8 - -> ./plugins/org.eclipse.embedcdt.core/lib/antlr-runtime-3.5.1.jar -Similar versions already approved - so if you can use one of them it will be a -little easier. CQ#9433 is for 3.5.2 (https://dev.eclipse.org/ipzilla/show_bug.cgi?id=9433) - -Jackson has already been approved - however not the exact versions you are -using today. -https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/ has -2.9.9 version and 2.2.2 was previously approved. So if it needs to be 2.2.3 it -should be easy. Even easier is to use the version in Orbit as nothing else -needs to be done. - -> ./plugins/org.eclipse.embedcdt.core/lib/jackson-databind-2.2.3.jar -Jackson comment as per above. - -> ./plugins/org.eclipse.embedcdt.core/lib/jackson-core-2.2.3.jar -Jackson comment as per above. - -> ./plugins/org.eclipse.embedcdt.core/lib/jackson-annotations-2.2.3.jar -Jackson comment as per above. - -``` - -### antlr ST4-*.jar - -Was ST4-4.0.7.jar. - -[CQ#14504](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14504) for 4.0.8 - -org.antlr.ST4 Version:4.0.8, StringTemplate is a java template engine ... - -https://mvnrepository.com/artifact/org.antlr/ST4/4.0.8 -https://repo1.maven.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar - -### antlr-runtime-*.jar - -Was antlr-runtime-3.5.1.jar. - -[CQ#9433](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=9433) for 3.5.2 - -https://mvnrepository.com/artifact/org.antlr/antlr-runtime/3.5.2 -https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar - -### jackson - -https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/ - -https://mvnrepository.com/artifact/com.fasterxml.jackson.core - -https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.9.9 -https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar - -https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.9.9.3 -https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.9.9.3/jackson-databind-2.9.9.3.jar - -https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.9.9 -https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.9.9/jackson-annotations-2.9.9.jar diff --git a/plugins/org.eclipse.embedcdt.core/lib/ST4-4.0.8.jar b/plugins/org.eclipse.embedcdt.core/lib/ST4-4.0.8.jar deleted file mode 100644 index 144828ba8..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/ST4-4.0.8.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.core/lib/antlr-runtime-3.5.2.jar b/plugins/org.eclipse.embedcdt.core/lib/antlr-runtime-3.5.2.jar deleted file mode 100644 index d48e3e867..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/antlr-runtime-3.5.2.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.core/lib/jackson-annotations-2.9.9.jar b/plugins/org.eclipse.embedcdt.core/lib/jackson-annotations-2.9.9.jar deleted file mode 100644 index 8e059d971..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/jackson-annotations-2.9.9.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.core/lib/jackson-core-2.9.9.jar b/plugins/org.eclipse.embedcdt.core/lib/jackson-core-2.9.9.jar deleted file mode 100644 index 02bd446dd..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/jackson-core-2.9.9.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.core/lib/jackson-databind-2.9.9.3.jar b/plugins/org.eclipse.embedcdt.core/lib/jackson-databind-2.9.9.3.jar deleted file mode 100644 index 5bf4ba88d..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/jackson-databind-2.9.9.3.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.core/lib/json-simple-1.1.1.jar b/plugins/org.eclipse.embedcdt.core/lib/json-simple-1.1.1.jar deleted file mode 100644 index 66347a6c8..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/json-simple-1.1.1.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.core/lib/org.jsoup_1.7.2.v201411291515.jar b/plugins/org.eclipse.embedcdt.core/lib/org.jsoup_1.7.2.v201411291515.jar deleted file mode 100644 index 6d78e4987..000000000 Binary files a/plugins/org.eclipse.embedcdt.core/lib/org.jsoup_1.7.2.v201411291515.jar and /dev/null differ diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/META-INF/MANIFEST.MF index c61b6ca43..24e74468f 100644 --- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.core/META-INF/MANIFEST.MF @@ -32,4 +32,6 @@ Export-Package: org.eclipse.embedcdt.debug.gdbjtag.core, org.eclipse.embedcdt.debug.gdbjtag.core.services, org.eclipse.embedcdt.debug.gdbjtag.core.viewmodel.peripheral, org.eclipse.embedcdt.internal.debug.gdbjtag.core;x-friends:="org.eclipse.embedcdt.debug.gdbjtag.ui" +Import-Package: org.json.simple;version="1.1.1", + org.json.simple.parser;version="1.1.1" Automatic-Module-Name: org.eclipse.embedcdt.debug.gdbjtag.core diff --git a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.core/META-INF/MANIFEST.MF index 150169d3d..26a28b660 100644 --- a/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.debug.gdbjtag.pyocd.core/META-INF/MANIFEST.MF @@ -22,4 +22,6 @@ Export-Package: org.eclipse.embedcdt.debug.gdbjtag.pyocd.core, org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.dsf, org.eclipse.embedcdt.debug.gdbjtag.pyocd.core.preferences, org.eclipse.embedcdt.internal.debug.gdbjtag.pyocd.core;x-friends:="org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui" +Import-Package: org.json.simple;version="1.1.1", + org.json.simple.parser;version="1.1.1" Automatic-Module-Name: org.eclipse.embedcdt.debug.gdbjtag.pyocd.core diff --git a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF index 887656d29..0f69cbeae 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.managedbuild.packs.ui/META-INF/MANIFEST.MF @@ -30,4 +30,6 @@ Bundle-Localization: plugin Export-Package: org.eclipse.embedcdt.internal.managedbuild.packs.ui;x-internal:=true, org.eclipse.embedcdt.internal.managedbuild.packs.ui.views;x-internal:=true, org.eclipse.embedcdt.managedbuild.packs.ui +Import-Package: org.json.simple;version="1.1.1", + org.json.simple.parser;version="1.1.1" Automatic-Module-Name: org.eclipse.embedcdt.managedbuild.packs.ui diff --git a/plugins/org.eclipse.embedcdt.packs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.packs.core/META-INF/MANIFEST.MF index 98ecba9db..fc10c5f1c 100644 --- a/plugins/org.eclipse.embedcdt.packs.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.packs.core/META-INF/MANIFEST.MF @@ -17,6 +17,8 @@ Export-Package: org.eclipse.embedcdt.internal.packs.core;x-friends:="org.eclipse org.eclipse.embedcdt.packs.core.jstree, org.eclipse.embedcdt.packs.core.tree, org.eclipse.embedcdt.packs.core.xml +Import-Package: org.json.simple;version="1.1.1", + org.json.simple.parser;version="1.1.1" Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.6.1", org.eclipse.core.jobs;bundle-version="3.10.800", org.eclipse.core.resources;bundle-version="3.13.800", diff --git a/repositories/org.eclipse.embedcdt-repository/category.xml b/repositories/org.eclipse.embedcdt-repository/category.xml index 46e203331..f033b8093 100644 --- a/repositories/org.eclipse.embedcdt-repository/category.xml +++ b/repositories/org.eclipse.embedcdt-repository/category.xml @@ -12,9 +12,7 @@ Liviu Ionescu Alexander Fedorov --> - - @@ -66,7 +64,6 @@ - @@ -115,4 +112,12 @@ + + + + + + + + diff --git a/scripts/jenkins/builds.Jenkinsfile b/scripts/jenkins/builds.Jenkinsfile index 6285c656f..5269b990c 100644 --- a/scripts/jenkins/builds.Jenkinsfile +++ b/scripts/jenkins/builds.Jenkinsfile @@ -5,21 +5,37 @@ pipeline { } } tools { + // https://github.com/eclipse-cbi/jiro/wiki/Tools-(JDK,-Maven,-Ant)#apache-maven + // https://eclipse.dev/cbi/jiro/Tools/#apache-maven maven 'apache-maven-latest' - jdk 'adoptopenjdk-hotspot-jdk11-latest' + + // https://github.com/eclipse-cbi/jiro/wiki/Tools-(JDK,-Maven,-Ant)#eclipse-temurin + // https://eclipse.dev/cbi/jiro/Tools/#eclipse-temurin + jdk 'temurin-jdk21-latest' } + stages { + stage('initialize PGP') { + steps { + withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { + sh 'gpg --batch --import "${KEYRING}"' + sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done' + } + } + } stage('Build') { steps { - - sh "mvn \ - --batch-mode \ - --show-version \ - clean verify \ - -P production \ - -Dmaven.repo.local=/home/jenkins/.m2/repository \ - --settings /home/jenkins/.m2/settings.xml \ - " + withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) { + sh "mvn \ + --batch-mode \ + --show-version \ + clean verify \ + -Dgpg.passphrase="${KEYRING_PASSPHRASE}" \ + -P production \ + -Dmaven.repo.local=/home/jenkins/.m2/repository \ + --settings /home/jenkins/.m2/settings.xml \ + " + } } } stage('Upload') { diff --git a/target-platform/org.eclipse.embedcdt.baseline.target b/target-platform/org.eclipse.embedcdt.baseline.target index bb3f6f2df..24ba92871 100644 --- a/target-platform/org.eclipse.embedcdt.baseline.target +++ b/target-platform/org.eclipse.embedcdt.baseline.target @@ -12,40 +12,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target-platform/org.eclipse.embedcdt.target-platform.target b/target-platform/org.eclipse.embedcdt.target-platform.target index df7d969a0..05faf64b0 100644 --- a/target-platform/org.eclipse.embedcdt.target-platform.target +++ b/target-platform/org.eclipse.embedcdt.target-platform.target @@ -4,12 +4,54 @@ + + + + + + + com.googlecode.json-simple + json-simple + 1.1.1 + jar + + + com.fasterxml.jackson.core + jackson-annotations + 2.21 + jar + + + com.fasterxml.jackson.core + jackson-core + 2.21.0 + jar + + + com.fasterxml.jackson.core + jackson-databind + 2.21.0 + jar + + + org.jsoup + jsoup + 1.22.1 + jar + + + + + + + - \ No newline at end of file + + diff --git a/target-platform/pom.xml b/target-platform/pom.xml index a67a6e19f..bf239418a 100644 --- a/target-platform/pom.xml +++ b/target-platform/pom.xml @@ -19,9 +19,7 @@ ../parent/pom.xml - org.eclipse.embedcdt org.eclipse.embedcdt.target-platform - 6.6.1-SNAPSHOT eclipse-target-definition