Merge pull request #327 from ricardozanini/align-4.0.5

ricardozanini · web-flow · commit 0419ecdd7fed · 2024-02-15T18:00:44.000-03:00
Fix pom plugins and release GHA to match with 4.0.x branch
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,13 +46,15 @@ jobs:
 
       - name: Maven release ${{steps.metadata.outputs.current-version}}
         run: |
+          git checkout -b release
           mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          cat release.properties
+          git checkout ${{github.base_ref}}
+          git rebase release
           mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
 
-      - name: Push changes to ${{github.base_ref}} branch
-        run: |
-          git push
-          git push origin ${{steps.metadata.outputs.current-version}}
+      - name: Push tags
+        run: git push && git push --tags
diff --git a/pom.xml b/pom.xml
@@ -65,6 +65,8 @@
     <version.jar.plugin>3.2.0</version.jar.plugin>
     <version.jdk>${java.version}</version.jdk>
     <version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
+    <version.javadoc.plugin>3.6.0</version.javadoc.plugin>
+    <version.release.plugin>3.0.1</version.release.plugin>
     <version.source.plugin>3.3.0</version.source.plugin>
     <version.surefire.plugin>3.2.5</version.surefire.plugin>
 
@@ -80,8 +82,6 @@
     <version.jsonassert>1.5.0</version.jsonassert>
     <version.org.assertj>3.25.3</version.org.assertj>
     <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
-    <version.org.junit.minor>6.0</version.org.junit.minor>
-    <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
     <version.org.mockito>5.10.0</version.org.mockito>
     <version.org.slf4j>2.0.11</version.org.slf4j>
     <version.plantuml>8059</version.plantuml>
@@ -420,14 +420,17 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${version.javadoc.plugin}</version>
+          <configuration>
+            <failOnError>false</failOnError>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
 
   <distributionManagement>
     <snapshotRepository>
-      <id>ossrh</id>
+      <id>ossrh-snapshots</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <repository>
