From 754738a2ee48ee4fe2d3111def1a7ced3ede26e0 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 17 Feb 2022 10:43:36 -0500 Subject: [PATCH 1/5] [mvn] Update maven wrapper --- .mvn/settings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 10f67b4..f8d2e5e 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -1,7 +1,7 @@ - + ossrh From 8d85ee25e9cf85f6d710867ef0b887641ced0df8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 2 Apr 2022 17:34:16 -0400 Subject: [PATCH 2/5] [dependabot] Add github actions and add ignore on transaction api for jakarta --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index eb25e2f..4fcfd8c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,8 +16,16 @@ version: 2 updates: +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily - package-ecosystem: maven directory: "/" schedule: interval: daily open-pull-requests-limit: 10 + ignore: + - dependency-name: jakarta.transaction:jakarta.transaction-api + versions: + - ">= 2.0.0" From 68a2a46bb21c9889dada0fdac25ff08fc8f57d94 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 2 Apr 2022 17:36:02 -0400 Subject: [PATCH 3/5] [actions] Use jdk 18 ga --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a0d4e79..e98d4e6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [8, 11, 17, 18-ea, 19-ea] + java: [8, 11, 17, 18, 19-ea] distribution: ['zulu'] fail-fast: false max-parallel: 4 From 69720d9b3e6b7dee3fd5487887a23cb48c1bb641 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 2 Apr 2022 17:36:12 -0400 Subject: [PATCH 4/5] [actions] Move sonar and sonatype to use jdk 17 --- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 2aa8138..cff0aa8 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [11] + java: [17] distribution: ['zulu'] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 330ef94..54ae077 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [11] + java: [17] distribution: ['zulu'] steps: - uses: actions/checkout@v2 From cd1c25b53c3ee22dfb9c325fc9ab24b5861a8d64 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 2 Apr 2022 17:36:30 -0400 Subject: [PATCH 5/5] [mvn] Update maven wrapper --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 8c79a83..db95c13 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -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 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar