Merge remote-tracking branch 'origin/master'

nroduit · Aug 18, 2023 · 56f983b · 56f983b
2 parents bdadeec + 1564412
commit 56f983b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -57,8 +57,8 @@ parts:
   remote-openjdk:
     plugin: dump
     source:
-      - on amd64: https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz
-      - on arm64: https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz
+      - on amd64: https://github.com/adoptium/temurin21-binaries/releases/download/jdk21-2023-08-09-06-56-beta/OpenJDK21U-jdk_x64_linux_hotspot_2023-08-09-06-56.tar.gz
+      - on arm64: https://github.com/adoptium/temurin21-binaries/releases/download/jdk21-2023-08-09-06-56-beta/OpenJDK21U-jdk_aarch64_linux_hotspot_2023-08-09-06-56.tar.gz
     organize:
       '*': java-runtime/
     override-stage: 'true'
@@ -74,7 +74,7 @@ parts:
       - libstdc++6
       - libgcc1
     #source: weasis-distributions/target/native-dist/weasis-native.zip
-    source: https://github.com/nroduit/Weasis/releases/download/v4.1.2/weasis-native.zip
+    source: https://github.com/nroduit/Weasis/releases/download/v4.2.0/weasis-native.zip
     organize:
       '*': weasis-native/
     override-stage: 'true'

diff --git a/weasis-distributions/etc/config/version-compatibility.json b/weasis-distributions/etc/config/version-compatibility.json
@@ -74,6 +74,11 @@
     "minimal-version": "4.1.0",
     "i18n-version": "4.0.0-SNAPSHOT"
   },
+  {
+    "release-version": "4.2.0",
+    "minimal-version": "4.2.0",
+    "i18n-version": "4.0.0-SNAPSHOT"
+  },
   {
     "release-version": "${app.version}",
     "minimal-version": "${base.minimal.version}",

diff --git a/weasis-parent/pom.xml b/weasis-parent/pom.xml
@@ -14,8 +14,8 @@
   <properties>
     <!-- force command line arguments settings to set version -->
     <!-- $ mvn clean install -Drevision=4.0.3 -Dchangelist=-SNAPSHOT -->
-    <revision>4.2.0</revision>
-    <changelist></changelist>  <!-- Remove "-SNAPSHOT" for release -->
+    <revision>4.2.1</revision>
+    <changelist>-SNAPSHOT</changelist>  <!-- Remove "-SNAPSHOT" for release -->
 
     <java-version>21</java-version>
     <jdk-version>21</jdk-version>