[struts-site] branch master updated: Defines proper user home for Bundler
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/master by this push: new b46432465 Defines proper user home for Bundler b46432465 is described below commit b46432465d2cf886aabb3b24310dacf5bcaeb7a1 Author: Lukasz Lenart AuthorDate: Wed Oct 12 09:00:24 2022 +0200 Defines proper user home for Bundler --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e04dda177..d8d7ecb53 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,9 +20,9 @@ pipeline { steps { sh ''' export - export RUBY_PATH="$WORKSPACE/.rvm" - export GEM_HOME="$RUBY_PATH/gems" + export GEM_HOME="$$WORKSPACE/.gems" export PATH="$GEM_HOME/bin:$PATH" + export BUNDLE_USER_HOME="$WORKSPACE/.bundle" bundle config set --local path $GEM_HOME bundle install
[struts-site] branch master updated: Removes duplicated dollar sign
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/master by this push: new 4391452b8 Removes duplicated dollar sign 4391452b8 is described below commit 4391452b8360adeda8e135731bc389856321bf3f Author: Lukasz Lenart AuthorDate: Wed Oct 12 09:04:07 2022 +0200 Removes duplicated dollar sign --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d8d7ecb53..11a1c37a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { steps { sh ''' export - export GEM_HOME="$$WORKSPACE/.gems" + export GEM_HOME="$WORKSPACE/.gems" export PATH="$GEM_HOME/bin:$PATH" export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
[struts-site] branch master updated: Drops unneeded export command
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/master by this push: new e49a2b429 Drops unneeded export command e49a2b429 is described below commit e49a2b42992a71e5d268a8922f4d98184538d81b Author: Lukasz Lenart AuthorDate: Wed Oct 12 09:06:16 2022 +0200 Drops unneeded export command --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 11a1c37a3..ef5004548 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ pipeline { } steps { sh ''' - export export GEM_HOME="$WORKSPACE/.gems" export PATH="$GEM_HOME/bin:$PATH" export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new e1d6bf828 Updates stage by Jenkins e1d6bf828 is described below commit e1d6bf828f2f2e610fb73a2ff35eeaf8401ecc1b Author: jenkins AuthorDate: Wed Oct 12 07:11:40 2022 + Updates stage by Jenkins
[struts-examples] branch dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 created (now 47eff72)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 47eff72 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic No new revisions were added by this update.
[struts-examples] 03/04: Drops support for Java 8
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit e267eabb1383426e7866e4720db4bebc83605fed Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:24:36 2022 +0200 Drops support for Java 8 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a05d2ba..ef75e8b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: -java: [ '8', '11', '17' ] +java: [ '11', '17' ] steps: - name: Checkout code uses: actions/checkout@v3.0.2
[struts-examples] 04/04: Uses Maven wrapper instead of raw Mavenn
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 8e0bb2b846eeca413a77a25f59d4e5224f782245 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:25:13 2022 +0200 Uses Maven wrapper instead of raw Mavenn --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ef75e8b..2730808 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -43,7 +43,7 @@ jobs: distribution: adopt java-version: ${{ matrix.java }} - name: Build with Maven on Java ${{ matrix.java }} -run: mvn -B -V test --no-transfer-progress +run: ./mvnw -B -V test --no-transfer-progress - name: Apply automerge label if: matrix.java == '17' && github.actor == 'dependabot[bot]' run: gh pr edit "$PR_URL" --add-label "automerge"
[struts-examples] 02/04: Drops travis related config
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 1ffa30d204325754ac33d8fb85eb6fe5cf856cc8 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:24:27 2022 +0200 Drops travis related config --- .travis.yml | 8 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 337d71d..000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: java - -jdk: - - openjdk11 - -cache: - directories: -- $HOME/.m2
[struts-examples] branch github-actions created (now 8e0bb2b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 8e0bb2b Uses Maven wrapper instead of raw Mavenn This branch includes the following new commits: new 47ae6d4 Introduces GH Actions CI new 1ffa30d Drops travis related config new e267eab Drops support for Java 8 new 8e0bb2b Uses Maven wrapper instead of raw Mavenn The 4 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/04: Introduces GH Actions CI
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 47ae6d42dc5cae7edc2ae3a07c3ad72511054fe9 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:23:31 2022 +0200 Introduces GH Actions CI --- .github/dependabot.yml | 22 + .github/workflows/maven.yml | 57 + 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a3b16b8..7ad736a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,25 @@ -# Basic dependabot.yml file with -# minimum configuration for maven package manager +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. version: 2 updates: - # Enable version updates for Maven + - package-ecosystem: "github-actions" +directory: "/" +schedule: + interval: "weekly" - package-ecosystem: "maven" directory: "/" -# Check for updates once a week schedule: interval: "weekly" diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000..a05d2ba --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,57 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Java CI + +on: + pull_request: + push: +branches: + - master + +jobs: + build: +runs-on: ubuntu-latest +strategy: + matrix: +java: [ '8', '11', '17' ] +steps: + - name: Checkout code +uses: actions/checkout@v3.0.2 + - name: Set up cache +uses: actions/cache@v3.0.10 +with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | +${{ runner.os }}-maven- + - name: Set up JDK ${{ matrix.java }} +uses: actions/setup-java@v3 +with: + distribution: adopt + java-version: ${{ matrix.java }} + - name: Build with Maven on Java ${{ matrix.java }} +run: mvn -B -V test --no-transfer-progress + - name: Apply automerge label +if: matrix.java == '17' && github.actor == 'dependabot[bot]' +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 +if: matrix.java == '17' && github.actor == 'dependabot[bot]' +uses: pascalgn/automerge-action@v0.15.3 +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
[struts-examples] branch github-actions updated: Uses gh command line tool instead of forbidden automerge action
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/github-actions by this push: new ddf7bbf Uses gh command line tool instead of forbidden automerge action ddf7bbf is described below commit ddf7bbf68b27f3b266e8e5bbc3b44b70fae283b4 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:29:02 2022 +0200 Uses gh command line tool instead of forbidden automerge action --- .github/workflows/maven.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2730808..6cacd70 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -52,6 +52,7 @@ jobs: PR_URL: ${{ github.event.pull_request.html_url }} - name: Automerge if: matrix.java == '17' && github.actor == 'dependabot[bot]' -uses: pascalgn/automerge-action@v0.15.3 +run: gh pr merge -m "$PR_URL" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_URL: ${{ github.event.pull_request.html_url }}
[struts-examples] branch github-actions updated: Reverts to pure mvn command to support all options
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/github-actions by this push: new 69517ec Reverts to pure mvn command to support all options 69517ec is described below commit 69517ecbe2c955cd51a4bcddfda90c485637eec5 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:33:55 2022 +0200 Reverts to pure mvn command to support all options --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6cacd70..9b6ffad 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -43,7 +43,7 @@ jobs: distribution: adopt java-version: ${{ matrix.java }} - name: Build with Maven on Java ${{ matrix.java }} -run: ./mvnw -B -V test --no-transfer-progress +run: mvn -B -V test --no-transfer-progress - name: Apply automerge label if: matrix.java == '17' && github.actor == 'dependabot[bot]' run: gh pr edit "$PR_URL" --add-label "automerge"
[struts-examples] branch master updated (b1dce79 -> 4dfd9c5)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from b1dce79 Merge pull request #186 from apache/dependabot/maven/quarkus-plugin.version-2.13.1.Final add 47ae6d4 Introduces GH Actions CI add 1ffa30d Drops travis related config add e267eab Drops support for Java 8 add 8e0bb2b Uses Maven wrapper instead of raw Mavenn add ddf7bbf Uses gh command line tool instead of forbidden automerge action add 69517ec Reverts to pure mvn command to support all options new 4dfd9c5 Merge pull request #188 from apache/github-actions 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. Summary of changes: .github/dependabot.yml | 22 + .github/workflows/maven.yml | 58 + .travis.yml | 8 --- 3 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/maven.yml delete mode 100644 .travis.yml
[struts-examples] 01/01: Merge pull request #188 from apache/github-actions
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 4dfd9c5e351edf555c8e584295a5fa24e0143ac3 Merge: b1dce79 69517ec Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:43:19 2022 +0200 Merge pull request #188 from apache/github-actions GitHub actions .github/dependabot.yml | 22 + .github/workflows/maven.yml | 58 + .travis.yml | 8 --- 3 files changed, 76 insertions(+), 12 deletions(-)
[struts-examples] branch dependabot/github_actions/actions/checkout-3.1.0 created (now 35a288b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/checkout-3.1.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 35a288b Bump actions/checkout from 3.0.2 to 3.1.0 No new revisions were added by this update.
[struts-examples] branch dependabot/maven/shiro.version-1.10.0 created (now 6a714d2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/shiro.version-1.10.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 6a714d2 Bump shiro.version from 1.9.1 to 1.10.0 No new revisions were added by this update.
[struts-examples] branch master updated: Uses GH Actions badge instead of Travis one
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/master by this push: new b67a525 Uses GH Actions badge instead of Travis one b67a525 is described below commit b67a525ef9160be174f51d9b0c7ead2c96d58730 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:45:59 2022 +0200 Uses GH Actions badge instead of Travis one --- README.md | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 51b4617..4a4103c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,9 @@ -Struts Examples +# Struts Examples [](https://ci-builds.apache.org/job/Struts/job/Struts-examples-master/) -[](https://app.travis-ci.com/apache/struts-examples) +[](https://github.com/apache/struts-examples/actions/workflows/maven.yml) [](http://www.apache.org/licenses/LICENSE-2.0.html) - This Maven multi-module project contains all the Struts 2 example applications that are part of the Getting Started Struts 2 tutorials at http://struts.apache.org. To build all the example applications run the Maven command:
[struts-examples] branch dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 updated (47eff72 -> f32add2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git omit 47eff72 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic add 47ae6d4 Introduces GH Actions CI add 1ffa30d Drops travis related config add e267eab Drops support for Java 8 add 8e0bb2b Uses Maven wrapper instead of raw Mavenn add ddf7bbf Uses gh command line tool instead of forbidden automerge action add 69517ec Reverts to pure mvn command to support all options add 4dfd9c5 Merge pull request #188 from apache/github-actions add b67a525 Uses GH Actions badge instead of Travis one add f32add2 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (47eff72) \ N -- N -- N refs/heads/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 (f32add2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/dependabot.yml | 22 + .github/workflows/maven.yml | 58 + .travis.yml | 8 --- README.md | 6 ++--- 4 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/maven.yml delete mode 100644 .travis.yml
[struts-examples] branch master updated: Grants write permission to GH Actions
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git The following commit(s) were added to refs/heads/master by this push: new 378969e Grants write permission to GH Actions 378969e is described below commit 378969e5765b74d4302e536b47a5529585155ee5 Author: Lukasz Lenart AuthorDate: Thu Oct 13 07:52:44 2022 +0200 Grants write permission to GH Actions --- .github/workflows/maven.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9b6ffad..8f559dc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,6 +21,8 @@ on: branches: - master +permissions: write-all + jobs: build: runs-on: ubuntu-latest
[struts-examples] branch dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 updated (f32add2 -> bea65f0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git discard f32add2 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic add 378969e Grants write permission to GH Actions add bea65f0 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f32add2) \ N -- N -- N refs/heads/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 (bea65f0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 2 ++ 1 file changed, 2 insertions(+)
[struts-examples] branch master updated (378969e -> c44e2ac)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 378969e Grants write permission to GH Actions add bea65f0 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic new c44e2ac Merge pull request #187 from apache/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 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. Summary of changes: shiro-basic/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] 01/01: Merge pull request #187 from apache/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit c44e2acd76ca107ad3f825c9383245569e009eb6 Merge: 378969e bea65f0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 13 05:56:26 2022 + Merge pull request #187 from apache/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic shiro-basic/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] branch dependabot/github_actions/actions/checkout-3.1.0 updated (35a288b -> 38d684d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/checkout-3.1.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git discard 35a288b Bump actions/checkout from 3.0.2 to 3.1.0 add b67a525 Uses GH Actions badge instead of Travis one add 378969e Grants write permission to GH Actions add bea65f0 Bump shiro-core from 1.9.1 to 1.10.0 in /shiro-basic add c44e2ac Merge pull request #187 from apache/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 add 38d684d Bump actions/checkout from 3.0.2 to 3.1.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (35a288b) \ N -- N -- N refs/heads/dependabot/github_actions/actions/checkout-3.1.0 (38d684d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 2 ++ README.md | 6 ++ shiro-basic/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
[struts-examples] branch master updated (c44e2ac -> 47c2d8d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from c44e2ac Merge pull request #187 from apache/dependabot/maven/shiro-basic/org.apache.shiro-shiro-core-1.10.0 add 38d684d Bump actions/checkout from 3.0.2 to 3.1.0 new 47c2d8d Merge pull request #189 from apache/dependabot/github_actions/actions/checkout-3.1.0 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. Summary of changes: .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] 01/01: Merge pull request #189 from apache/dependabot/github_actions/actions/checkout-3.1.0
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 47c2d8d92f597f69e379c37e5fe9c07901ba5839 Merge: c44e2ac 38d684d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 13 05:58:16 2022 + Merge pull request #189 from apache/dependabot/github_actions/actions/checkout-3.1.0 Bump actions/checkout from 3.0.2 to 3.1.0 .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts] 01/01: Merge pull request #609 from apache/WW-3691-executor
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 4c8cc361d5fc37d9962f66d7d3302e2ae6b2e847 Merge: a21bd994e 8f0db1d22 Author: Lukasz Lenart AuthorDate: Thu Oct 13 08:07:50 2022 +0200 Merge pull request #609 from apache/WW-3691-executor WW-3691 Converts BackgroundProcess into interface and uses Executor to execute BackgroundProcess .../showcase/wait/ThreadPoolExecutorProvider.java | 56 +++ apps/showcase/src/main/resources/struts-wait.xml | 3 + .../interceptor/ExecuteAndWaitInterceptor.java | 66 +--- .../interceptor/exec/BackgroundProcess.java| 41 + .../struts2/interceptor/exec/ExecutorProvider.java | 38 + .../StrutsBackgroundProcess.java} | 80 ++--- .../interceptor/exec/StrutsExecutorProvider.java | 53 ++ .../struts2/interceptor/BackgroundProcessTest.java | 104 .../interceptor/ExecuteAndWaitInterceptorTest.java | 46 +- .../exec/StrutsBackgroundProcessTest.java | 179 + 10 files changed, 513 insertions(+), 153 deletions(-)
[struts] branch master updated (a21bd994e -> 4c8cc361d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from a21bd994e WW-5238 Uses proper order of mapping functions to support action: prefix add 8f0db1d22 WW-3691 Converts BackgroundProcess into interface and uses Executor to execute BackgroundProcess new 4c8cc361d Merge pull request #609 from apache/WW-3691-executor 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. Summary of changes: .../showcase/wait/ThreadPoolExecutorProvider.java | 56 +++ apps/showcase/src/main/resources/struts-wait.xml | 3 + .../interceptor/ExecuteAndWaitInterceptor.java | 66 +--- .../exec/BackgroundProcess.java} | 23 ++- .../interceptor/exec/ExecutorProvider.java}| 26 ++- .../StrutsBackgroundProcess.java} | 80 ++--- .../interceptor/exec/StrutsExecutorProvider.java | 41 +++-- .../struts2/interceptor/BackgroundProcessTest.java | 104 .../interceptor/ExecuteAndWaitInterceptorTest.java | 46 +- .../exec/StrutsBackgroundProcessTest.java | 179 + 10 files changed, 433 insertions(+), 191 deletions(-) create mode 100644 apps/showcase/src/main/java/org/apache/struts2/showcase/wait/ThreadPoolExecutorProvider.java copy core/src/main/java/org/apache/struts2/{config/NullResult.java => interceptor/exec/BackgroundProcess.java} (65%) copy core/src/{test/java/com/opensymphony/xwork2/SimpleFooAction.java => main/java/org/apache/struts2/interceptor/exec/ExecutorProvider.java} (67%) rename core/src/main/java/org/apache/struts2/interceptor/{BackgroundProcess.java => exec/StrutsBackgroundProcess.java} (63%) copy plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java => core/src/main/java/org/apache/struts2/interceptor/exec/StrutsExecutorProvider.java (57%) delete mode 100644 core/src/test/java/org/apache/struts2/interceptor/BackgroundProcessTest.java create mode 100644 core/src/test/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcessTest.java