You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2023/10/29 13:24:42 UTC
(struts-examples) branch feature/jdk15-21 created (now d7c675e)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch feature/jdk15-21
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
at d7c675e Uses JDK 17 & 21 to build
This branch includes the following new commits:
new d7c675e Uses JDK 17 & 21 to build
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.
(struts-examples) 01/01: Uses JDK 17 & 21 to build
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/jdk15-21
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit d7c675e231285d7ef5bf1243e4c6cf26c96ef48a
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Oct 29 14:24:34 2023 +0100
Uses JDK 17 & 21 to build
---
.github/workflows/maven.yml | 20 ++------------------
pom.xml | 6 +++---
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9646a59..aa6a4a1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ '11', '17' ]
+ java: [ '17', '21' ]
steps:
- name: Checkout code
uses: actions/checkout@v4.1.1
@@ -45,20 +45,4 @@ jobs:
distribution: adopt
java-version: ${{ matrix.java }}
- name: Build with Maven on Java ${{ matrix.java }}
- run: mvn -B -V test --no-transfer-progress
-
- automerge:
- if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
- runs-on: ubuntu-latest
- needs: [ build ]
- steps:
- - name: Apply automerge label
- run: gh pr edit "$PR_URL" --add-label "automerge"
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- PR_URL: ${{ github.event.pull_request.html_url }}
- - name: Automerge
- run: gh pr merge -m "$PR_URL"
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- PR_URL: ${{ github.event.pull_request.html_url }}
+ run: mvn -B -V test --no-transfer-progress
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ebca1f8..e07dc4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<struts2.version>6.2.0</struts2.version>
<log4j2.version>2.21.0</log4j2.version>
- <jetty-plugin.version>11.0.15</jetty-plugin.version>
+ <jetty-plugin.version>9.4.46.v20220331</jetty-plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<jackson.version>2.14.1</jackson.version>
<jackson-data-bind.version>2.14.1</jackson-data-bind.version>