Skip to content

Commit 0419ecd

Browse files
Merge pull request #327 from ricardozanini/align-4.0.5
Fix pom plugins and release GHA to match with 4.0.x branch
2 parents d6f1b7e + ec5eaae commit 0419ecd

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.github/workflows/release.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ jobs:
4646
4747
- name: Maven release ${{steps.metadata.outputs.current-version}}
4848
run: |
49+
git checkout -b release
4950
mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
51+
cat release.properties
52+
git checkout ${{github.base_ref}}
53+
git rebase release
5054
mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
5155
env:
5256
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
53-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
57+
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
5458

55-
- name: Push changes to ${{github.base_ref}} branch
56-
run: |
57-
git push
58-
git push origin ${{steps.metadata.outputs.current-version}}
59+
- name: Push tags
60+
run: git push && git push --tags

pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
<version.jar.plugin>3.2.0</version.jar.plugin>
6666
<version.jdk>${java.version}</version.jdk>
6767
<version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
68+
<version.javadoc.plugin>3.6.0</version.javadoc.plugin>
69+
<version.release.plugin>3.0.1</version.release.plugin>
6870
<version.source.plugin>3.3.0</version.source.plugin>
6971
<version.surefire.plugin>3.2.5</version.surefire.plugin>
7072

@@ -80,8 +82,6 @@
8082
<version.jsonassert>1.5.0</version.jsonassert>
8183
<version.org.assertj>3.25.3</version.org.assertj>
8284
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
83-
<version.org.junit.minor>6.0</version.org.junit.minor>
84-
<version.org.junit>5.${version.org.junit.minor}</version.org.junit>
8585
<version.org.mockito>5.10.0</version.org.mockito>
8686
<version.org.slf4j>2.0.11</version.org.slf4j>
8787
<version.plantuml>8059</version.plantuml>
@@ -420,14 +420,17 @@
420420
<groupId>org.apache.maven.plugins</groupId>
421421
<artifactId>maven-javadoc-plugin</artifactId>
422422
<version>${version.javadoc.plugin}</version>
423+
<configuration>
424+
<failOnError>false</failOnError>
425+
</configuration>
423426
</plugin>
424427
</plugins>
425428
</pluginManagement>
426429
</build>
427430

428431
<distributionManagement>
429432
<snapshotRepository>
430-
<id>ossrh</id>
433+
<id>ossrh-snapshots</id>
431434
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
432435
</snapshotRepository>
433436
<repository>

0 commit comments

Comments
 (0)