Update JustJ EPP to Java 21 as needed by the packages for 2024-06

eclipse-packaging/packages#130
eclipse-justj · Apr 4, 2024 · f3d6c1e · f3d6c1e
1 parent 6a9340f
commit f3d6c1e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/epp/features/org.eclipse.justj.epp-feature/feature.xml b/epp/features/org.eclipse.justj.epp-feature/feature.xml
@@ -12,7 +12,7 @@ SPDX-License-Identifier: EPL-2.0
 <feature
       id="org.eclipse.justj.epp"
       label="%featureName"
-      version="17.0.0.qualifier"
+      version="21.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/epp/features/org.eclipse.justj.epp-feature/pom.xml b/epp/features/org.eclipse.justj.epp-feature/pom.xml
@@ -24,6 +24,6 @@ SPDX-License-Identifier: EPL-2.0
 
   <groupId>org.eclipse.justj.epp.features</groupId>
   <artifactId>org.eclipse.justj.epp</artifactId>
-  <version>17.0.0-SNAPSHOT</version>
+  <version>21.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/epp/plugins/org.eclipse.justj.epp/META-INF/MANIFEST.MF b/epp/plugins/org.eclipse.justj.epp/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.justj.epp;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 21.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.justj.epp
-Require-Bundle: org.eclipse.justj.openjdk.hotspot.jre.full;bundle-version="[17.0.10.v20240120-1143,18.0.0)"
+Require-Bundle: org.eclipse.justj.openjdk.hotspot.jre.full;bundle-version="[21.0.2.v20240123-0840,22.0.0)"
diff --git a/epp/plugins/org.eclipse.justj.epp/pom.xml b/epp/plugins/org.eclipse.justj.epp/pom.xml
@@ -24,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
 
   <groupId>org.eclipse.justj</groupId>
   <artifactId>org.eclipse.justj.epp</artifactId>
-  <version>17.0.0-SNAPSHOT</version>
+  <version>21.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

diff --git a/epp/releng/org.eclipse.justj.epp.parent/Jenkinsfile b/epp/releng/org.eclipse.justj.epp.parent/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
 
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk17-latest'
+    jdk 'temurin-jdk21-latest'
   }
 
   environment {

diff --git a/epp/releng/org.eclipse.justj.epp.parent/pom.xml b/epp/releng/org.eclipse.justj.epp.parent/pom.xml
@@ -47,7 +47,7 @@ SPDX-License-Identifier: EPL-2.0
     </repository>
     <repository>
       <id>justj-jres</id>
-      <url>https://download.eclipse.org/justj/jres/17/updates/release/latest</url>
+      <url>https://download.eclipse.org/justj/jres/21/updates/release/latest</url>
       <layout>p2</layout>
     </repository>
   </repositories>
@@ -120,7 +120,7 @@ SPDX-License-Identifier: EPL-2.0
             <configuration>
               <target>
               </target>
-              <executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
+              <executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-21</executionEnvironment>
               <environments>
                 <environment>
                   <os>win32</os>

diff --git a/epp/releng/org.eclipse.justj.epp.parent/promotion/pom.xml b/epp/releng/org.eclipse.justj.epp.parent/promotion/pom.xml
@@ -46,7 +46,7 @@ SPDX-License-Identifier: EPL-2.0
         <artifactId>tycho-eclipserun-plugin</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <dependencies>
             <dependency>
               <artifactId>org.eclipse.justj.p2</artifactId>

diff --git a/epp/releng/org.eclipse.justj.epp.site/category.xml b/epp/releng/org.eclipse.justj.epp.site/category.xml
@@ -18,5 +18,5 @@ SPDX-License-Identifier: EPL-2.0
          %categoryDescription
       </description>
    </category-def>
-   <repository-reference location="https://download.eclipse.org/justj/jres/17/updates/release/latest" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/justj/jres/21/updates/release/latest" enabled="true" />
 </site>