Skip to content

Commit

Permalink
Merge pull request #1604 from cherylking/bumpCommon1823Ant1911
Browse files Browse the repository at this point in the history
Bump ant and common dep and liberty version for tests
  • Loading branch information
cherylking authored Oct 20, 2022
2 parents 61608f2 + 6f2daf8 commit 18d343e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
RUNTIME: [ol, wlp]
RUNTIME_VERSION: [22.0.0.6, 22.0.0.3]
RUNTIME_VERSION: [22.0.0.6, 22.0.0.9]
java: [17, 11, 8]
exclude:
- java: 8
RUNTIME_VERSION: 22.0.0.3
RUNTIME_VERSION: 22.0.0.6
- java: 17
RUNTIME_VERSION: 22.0.0.3
RUNTIME_VERSION: 22.0.0.6
name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
steps:
# Checkout repos
- name: Checkout ci.maven
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
cache: 'maven'
- name: Checkout ci.common
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: OpenLiberty/ci.common
path: ci.common
- name: Checkout ci.ant
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: OpenLiberty/ci.ant
path: ci.ant
Expand All @@ -55,7 +55,7 @@ jobs:
with:
maven-version: 3.8.1
- name: Cache maven packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -80,20 +80,20 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
RUNTIME: [ol, wlp]
RUNTIME_VERSION: [22.0.0.6, 22.0.0.3]
RUNTIME_VERSION: [22.0.0.6, 22.0.0.9]
java: [17, 11, 8]
exclude:
- java: 8
RUNTIME_VERSION: 22.0.0.3
RUNTIME_VERSION: 22.0.0.6
- java: 17
RUNTIME_VERSION: 22.0.0.3
RUNTIME_VERSION: 22.0.0.6
name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
steps:
# Checkout repos
- name: Checkout ci.maven
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -109,7 +109,7 @@ jobs:
with:
maven-version: 3.8.1
- name: Cache maven packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
4 changes: 2 additions & 2 deletions liberty-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-ant-tasks</artifactId>
<version>1.9.10</version>
<version>1.9.11</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>ci.common</artifactId>
<version>1.8.23-SNAPSHOT</version>
<version>1.8.23</version>
</dependency>
<dependency>
<groupId>org.twdata.maven</groupId>
Expand Down

0 comments on commit 18d343e

Please sign in to comment.