Merge branch 'develop' into feature/java21

wcm-io-caravan · Jun 1, 2024 · 1ed8133 · 1ed8133
2 parents b6142bb + 81dff00
commit 1ed8133
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -25,7 +25,7 @@ jobs:
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17

diff --git a/tooling/parent/changes.xml b/tooling/parent/changes.xml
@@ -22,6 +22,13 @@
 <document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
+
+    <release version="1.2.0" date="not released">
+      <action type="update" dev="sseifert">
+        Switch to Java 11 as minimum version.
+      </action>
+    </release>
+
     <release version="1.1.0" date="2022-01-12">
       <action type="add" dev="ssauder">
         Removed jackson-datatype-guava dependency

diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.caravan</groupId>
     <artifactId>io.wcm.caravan.parent_toplevel</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
     <relativePath />
   </parent>
 
@@ -49,6 +49,11 @@
     <url>https://github.com/wcm-io-caravan/caravan-rhyme/actions</url>
   </ciManagement>
 
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/wcm-io-caravan/caravan-rhyme/issues/</url>
+  </issueManagement>
+
   <properties>
     <site.url.module.prefix>rhyme</site.url.module.prefix>
     <sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/tooling/coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>