This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push: new 13412728b Update Ehcache to 3.10.0 (#50) 13412728b is described below commit 13412728ba805ac0773707c895f4bd4f344ab1b1 Author: Andriy Redko <drr...@gmail.com> AuthorDate: Mon Apr 25 03:50:49 2022 -0400 Update Ehcache to 3.10.0 (#50) * Update Ehcache to 3.10.0 * Added 'jakarta' classifier to ehcache3 ertifacts --- .github/workflows/codeql-analysis.yml | 5 ----- parent/pom.xml | 13 ++++++++++++- ws-security-common/pom.xml | 1 + ws-security-dom/pom.xml | 1 + ws-security-stax/pom.xml | 1 + 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 908a15641..3d84e3418 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,11 +36,6 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - name: Cache local Maven repository uses: actions/cache@v2.1.1 with: diff --git a/parent/pom.xml b/parent/pom.xml index c7293400b..ac66a41db 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -35,7 +35,7 @@ <bcprov.version>1.70</bcprov.version> <commons.compress.version>1.21</commons.compress.version> <cryptacular.version>1.2.4</cryptacular.version> - <ehcache.version>3.9.6</ehcache.version> + <ehcache.version>3.10.0</ehcache.version> <hamcrest.version>2.2</hamcrest.version> <jasypt.version>1.9.3</jasypt.version> <junit.version>5.8.1</junit.version> @@ -123,6 +123,17 @@ <groupId>org.ehcache</groupId> <artifactId>ehcache</artifactId> <version>${ehcache.version}</version> + <classifier>jakarta</classifier> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jasypt</groupId> diff --git a/ws-security-common/pom.xml b/ws-security-common/pom.xml index 1717f9d27..ab7fd220f 100644 --- a/ws-security-common/pom.xml +++ b/ws-security-common/pom.xml @@ -211,6 +211,7 @@ <artifactId>ehcache</artifactId> <scope>compile</scope> <optional>true</optional> + <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.bouncycastle</groupId> diff --git a/ws-security-dom/pom.xml b/ws-security-dom/pom.xml index 38815f497..d95b8a056 100644 --- a/ws-security-dom/pom.xml +++ b/ws-security-dom/pom.xml @@ -98,6 +98,7 @@ <groupId>org.ehcache</groupId> <artifactId>ehcache</artifactId> <scope>runtime</scope> + <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.apache.wss4j</groupId> diff --git a/ws-security-stax/pom.xml b/ws-security-stax/pom.xml index dd7d480dd..08eb19cd5 100644 --- a/ws-security-stax/pom.xml +++ b/ws-security-stax/pom.xml @@ -52,6 +52,7 @@ <groupId>org.ehcache</groupId> <artifactId>ehcache</artifactId> <scope>runtime</scope> + <classifier>jakarta</classifier> </dependency> <dependency> <groupId>org.apache.wss4j</groupId>