Skip to content

Commit

Permalink
Merge branch 'mojohaus:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
prodj17 committed Jul 20, 2022
2 parents 705f79b + a5d2ca8 commit c77e16c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 24 deletions.
25 changes: 5 additions & 20 deletions .github/workflows/maven.yml
Expand Up @@ -21,23 +21,8 @@ on: [push, pull_request]

jobs:
build:

strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
java: [8, 11, 17]
jdk: ['temurin']
fail-fast: false

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: ${{ matrix.jdk }}
java-version: ${{ matrix.java }}
cache: 'maven'

- name: Build with Maven
run: mvn verify -e -B -V -P run-its javadoc:javadoc site site:stage
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
ff-maven: "3.8.6" # Maven version for fail-fast-build
maven-matrix: '[ "3.2.5", "3.8.6" ]' # Maven versions matrix for verify builds
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -229,7 +229,7 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.2.8</version>
<version>6.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -358,7 +358,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>mrm-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.4.1</version>
<executions>
<execution>
<goals>
Expand Down

0 comments on commit c77e16c

Please sign in to comment.