prepare for 6.2 track

.github/workflows/release-and-deploy-release.yml

@@ -1,9 +1,9 @@
-name: release and deploy
+name: 6.2 release and deploy
 
 on:
   push:
     branches:
-      - main
+      - 6.2
 
 jobs:
   release:
@@ -17,10 +17,10 @@ jobs:
         with:
           fetch-depth: '0'
       # Setup Java environment
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 11
       - name: Maven setup
         uses: ./.github/actions/mvn-setup
         with:
@@ -50,12 +50,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: 'main'
+          ref: '6.2'
       # Setup Java environment
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 11
       - name: Maven setup
         uses: ./.github/actions/mvn-setup
         with:
@@ -71,4 +71,4 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.OSSRH_USER }}
-          nexus_password: ${{ secrets.OSSRH_PASSWORD }}
+          nexus_password: ${{ secrets.OSSRH_PASSWORD }}

ci/mvn-release.sh

@@ -2,16 +2,16 @@
 
 CURRENT_VERSION=`xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml`
 
-if [[ $CURRENT_VERSION == *-SNAPSHOT ]]; then
-	NEW_VERSION=${CURRENT_VERSION%'-SNAPSHOT'}
+if [[ $CURRENT_VERSION == *-6.2 ]]; then
+	NEW_VERSION=${CURRENT_VERSION%'-6.2'}
 	NEXT_VERSION=`bash ci/semver.sh -p $NEW_VERSION`
-	NEXT_SNAPSHOT="$NEXT_VERSION-SNAPSHOT"
+	NEXT_SNAPSHOT="$NEXT_VERSION-6.2"
 	echo "perform release of $NEW_VERSION from $CURRENT_VERSION and set next develop version $NEXT_SNAPSHOT"
 
 	mvn versions:set -DnewVersion=$NEW_VERSION versions:commit --no-transfer-progress
 
  	echo "commit new release version"
-	git commit -a -m "Release $NEW_VERSION: set main to new release version"
+	git commit -a -m "Release $NEW_VERSION: set 6.2 to new release version"
 
 	echo "Update version in README.md"
 	sed -i -e "s|<version>[0-9A-Za-z._-]\{1,\}</version>|<version>$NEW_VERSION</version>|g" README.md && rm -f README.md-e
@@ -20,16 +20,8 @@ if [[ $CURRENT_VERSION == *-SNAPSHOT ]]; then
 	echo "create tag for new release"
 	git tag -a $NEW_VERSION -m "Release $NEW_VERSION: tag release"
 
-	echo "merge main back to develop"
-	git fetch --all
-	git checkout develop
-	git merge main
-
 	mvn versions:set -DnewVersion=$NEXT_SNAPSHOT versions:commit --no-transfer-progress
 
-	echo "commit new snapshot version"
-	git commit -a -m "Release $NEW_VERSION: set develop to next development version $NEXT_SNAPSHOT"
-
 	git push --all
 	git push --tags
 fi

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.namics.oss.magnolia</groupId>
 	<artifactId>magnolia-flexible-image-generator</artifactId>
-	<version>0.1.1-SNAPSHOT</version>
+	<version>0.0.11-6.2</version>
 	<packaging>jar</packaging>
 
 	<name>${project.artifactId}</name>
@@ -29,26 +29,24 @@
 	</developers>
 
 	<properties>
-		<!-- check for new versions:  mvn versions:display-property-updates -->
-		<magnolia.version>6.3.0</magnolia.version>
+		<magnolia.version>6.2.40</magnolia.version>
 
 		<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
 		<gson.version>2.10.1</gson.version>
-		<jsr305.nullable.version>3.0.2</jsr305.nullable.version>
 
 		<!--Test dependency versions-->
-		<junit.version>5.11.0</junit.version>
-		<mockito.version>5.13.0</mockito.version>
+		<junit.version>5.10.1</junit.version>
+		<mockito.version>5.7.0</mockito.version>
 
 		<!-- Maven Plugins -->
 		<mvn.compiler.plugin.version>3.11.0</mvn.compiler.plugin.version>
-		<mvn.surefire.plugin.version>3.5.0</mvn.surefire.plugin.version>
+		<mvn.surefire.plugin.version>3.2.2</mvn.surefire.plugin.version>
 		<mvn.source.plugin.version>3.3.0</mvn.source.plugin.version>
 		<mvn.javadoc.version>3.6.0</mvn.javadoc.version>
 		<mvn.gpg.plugin.version>3.1.0</mvn.gpg.plugin.version>
 		<mvn.nexus-staging.plugin.version>1.6.13</mvn.nexus-staging.plugin.version>
 
-		<javaVersion>17</javaVersion>
+		<javaVersion>11</javaVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -96,11 +94,6 @@
 			<artifactId>gson</artifactId>
 			<version>${gson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-			<version>${jsr305.nullable.version}</version>
-		</dependency>
 
 
 		<!-- TESTING DEPENDENCIES -->