You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2022/10/25 14:08:35 UTC
[shiro] branch update_for_java17+ created (now e51c0e74)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a change to branch update_for_java17+
in repository https://gitbox.apache.org/repos/asf/shiro.git
at e51c0e74 [DEPS] update guice and easymock for java17 support.
This branch includes the following new commits:
new e51c0e74 [DEPS] update guice and easymock for java17 support.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[shiro] 01/01: [DEPS] update guice and easymock for java17 support.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch update_for_java17+
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit e51c0e74ce9841d09f06a01451bd72190fd6a87b
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Tue Oct 25 16:09:36 2022 +0200
[DEPS] update guice and easymock for java17 support.
---
.github/workflows/maven.yml | 19 ++++---------------
pom.xml | 4 ++--
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f794cb8b..da93de65 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -66,11 +66,11 @@ jobs:
- version: 11
dist: zulu
# 14
- - version: 14
+ - version: 17
dist: adopt-hotspot
- - version: 14
+ - version: 17
dist: adopt-openj9
- - version: 14
+ - version: 17
dist: zulu
exclude:
# was already built
@@ -82,7 +82,7 @@ jobs:
# excludes java 16 on macOS.
- os: macOS-latest
java:
- version: 16
+ version: 11
# exclude adopt-hotspot on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
- os: macOS-latest
java:
@@ -95,17 +95,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v3.1.0
- - name: Set up cache for ~./m2/repository
- uses: actions/cache@v3.0.10
- with:
- path: |
- ~/.m2/repository
- !~/.m2/repository/org/apache/shiro
- key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- maven-${{ matrix.os }}-java${{ matrix.java }}-
- maven-${{ matrix.os }}-
-
- name: Set up JDK
uses: actions/setup-java@v3
with:
diff --git a/pom.xml b/pom.xml
index 46cf099a..1161b326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,12 +106,12 @@
<log4j.version>2.19.0</log4j.version>
<spring.version>5.3.23</spring.version>
<spring-boot.version>2.7.4</spring-boot.version>
- <guice.version>4.2.3</guice.version>
+ <guice.version>5.1.0</guice.version>
<jaxrs.api.version>2.1.1</jaxrs.api.version>
<htmlunit.version>2.65.1</htmlunit.version>
<!-- Test 3rd-party dependencies: -->
- <easymock.version>4.3</easymock.version>
+ <easymock.version>5.0.1</easymock.version>
<gmaven.version>1.13.1</gmaven.version>
<groovy.version>2.5.18</groovy.version>
<junit.version>4.13.2</junit.version>