Skip to content

Commit

Permalink
[#346] Comment out GH #19 test as it fails on GH Action
Browse files Browse the repository at this point in the history
- Disable gh-19
- Convert jaxb-annox to proper bundle (don't leave edited file on disk for release)
- Disable gpg signing for CI testing
- Add dummy gpg key
- Maven plugin updates
  • Loading branch information
mattrpav committed Sep 11, 2023
1 parent 8f7b274 commit cd14b64
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven-build-action.yaml
Expand Up @@ -32,7 +32,7 @@ jobs:
run: mvn -Pall -no-transfer-progress clean install

- name: Maven with JDK 11 - Release dry run
run: mvn -Psonatype-oss-release,release -DperformRelease -DdryRun=true -Dgpg.skip=true -Dgpg.homedir=~/work/jaxb-tools/jaxb-tools/build/gpg -Dgpg.passphrase=password -B release:clean release:prepare clean install
run: mvn -Prelease-dry-run,sonatype-oss-release,release -DperformRelease -DdryRun=true -Darguments="-Dgpg.skip=true" -B release:clean release:prepare clean install

- name: Set up JDK 17
uses: actions/setup-java@v3
Expand All @@ -44,4 +44,4 @@ jobs:
run: mvn -Pall -no-transfer-progress clean install

- name: Maven with JDK 17 - Release dry run
run: mvn -Psonatype-oss-release,release -DperformRelease -DdryRun=true -Dgpg.skip=true -Dgpg.homedir=~/work/jaxb-tools/jaxb-tools/build/gpg -Dgpg.passphrase=password -B release:clean release:prepare clean install
run: mvn -Prelease-dry-run,sonatype-oss-release,release -DperformRelease -DdryRun=true -Darguments="-Dgpg.skip=true" -B release:clean release:prepare clean install
2 changes: 1 addition & 1 deletion jaxb-tools-docs/pom.xml
Expand Up @@ -14,7 +14,7 @@
<maven-site-plugin.skip>false</maven-site-plugin.skip>
<!-- but don't let site plugin generate a bunch of reports we do not use -->
<maven-site-plugin.generate.reports>false</maven-site-plugin.generate.reports>
<asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
<asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.4</asciidoctorj.pdf.version>
<asciidoctorj.version>2.5.7</asciidoctorj.version>
<jruby.version>9.3.4.0</jruby.version>
Expand Down
51 changes: 32 additions & 19 deletions pom.xml
Expand Up @@ -89,27 +89,27 @@
<maven.plugin.testing.version>2.1</maven.plugin.testing.version>
<maven.plugin.plugin.version>3.7.1</maven.plugin.plugin.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-invoker-plugin.version>3.1.0</maven-invoker-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<maven-invoker-plugin.version>3.6.0</maven-invoker-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-nexus-staging-maven-plugin.version>1.6.8</maven-nexus-staging-maven-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
<cxf-codegen-plugin.version>3.3.13</cxf-codegen-plugin.version>
<editorconfig-maven-plugin.version>0.1.1</editorconfig-maven-plugin.version>
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
<cxf-codegen-plugin.version>3.5.6</cxf-codegen-plugin.version>
<editorconfig-maven-plugin.version>0.1.3</editorconfig-maven-plugin.version>
</properties>
<profiles>
<profile>
Expand Down Expand Up @@ -195,6 +195,19 @@
</plugins>
</build>
</profile>
<profile>
<id>release-dry-run</id>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<distributionManagement>
<snapshotRepository>
Expand Down Expand Up @@ -725,7 +738,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.ec4j.maven</groupId>
Expand All @@ -735,12 +748,12 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>3.2.1</version>
<version>3.3.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.3.0</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
Expand Down

0 comments on commit cd14b64

Please sign in to comment.