From e621cf09e8c198c04e2f9a608d676e92472576f8 Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 26 Dec 2023 13:13:21 -0600 Subject: [PATCH 1/4] removed repo --- pom.xml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pom.xml b/pom.xml index 14e8a594ef..45eff24d0b 100644 --- a/pom.xml +++ b/pom.xml @@ -1816,30 +1816,4 @@ - - - - apache.snapshots - https://repository.apache.org/snapshots - - false - - - false - - - - - - apache.snapshots - https://repository.apache.org/snapshots - - false - - - false - - - From 402fe45a083fdff8ce0328bfaa9694cd064c3a93 Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 26 Dec 2023 13:25:37 -0600 Subject: [PATCH 2/4] removed -ntp for testing --- .github/workflows/maven.yml | 6 +++--- .jenkins.groovy | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c8af8c7881..6082581b0c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -46,7 +46,7 @@ jobs: - name: Build with Maven run: >- - mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs + mvn verify --show-version --errors --batch-mode -Pdocs -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }} build-all: @@ -88,13 +88,13 @@ jobs: - name: Build with Maven (Linux) if: matrix.os == 'ubuntu-latest' && matrix.jdk <= 17 run: >- - mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs + mvn verify --show-version --errors --batch-mode -Pdocs -Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }} - name: Build with Maven (non-Linux or JDK > 17) if: matrix.os != 'ubuntu-latest' || matrix.jdk > 17 run: >- - mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs + mvn verify --show-version --errors --batch-mode -Pdocs -Pskip_jakarta_ee_tests - name: Archive test run logs diff --git a/.jenkins.groovy b/.jenkins.groovy index ff84288606..83cf614496 100644 --- a/.jenkins.groovy +++ b/.jenkins.groovy @@ -93,7 +93,7 @@ pipeline { stage('Build') { steps { echo 'Building' - sh 'mvn clean verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs \ + sh 'mvn clean verify --show-version --errors --batch-mode -Pdocs \ -Dmaven.test.failure.ignore=true -Pskip_jakarta_ee_tests' } post { From 8416e8a004ac13f6e167c7608dea074e8577e8a8 Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 26 Dec 2023 13:48:40 -0600 Subject: [PATCH 3/4] test failure --- .../main/java/org/apache/shiro/ee/listeners/IniEnvironment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/IniEnvironment.java b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/IniEnvironment.java index 433cd8abec..fc0781addf 100644 --- a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/IniEnvironment.java +++ b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/listeners/IniEnvironment.java @@ -50,7 +50,7 @@ private static final class SecurityManagerFactory extends WebIniSecurityManagerF @Override protected Map createDefaults(Ini ini, Ini.Section mainSection) { @SuppressWarnings("unchecked") - Map defaults = (Map) super.createDefaults(ini, mainSection); + Map defaults = null; try { // SSL filter must be first because it will trigger an exception if OmniFaces is not available var sslFilter = new SslFilter(); From bb7fbfffdca55743ce7e65accd4d534517f8f8dd Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 26 Dec 2023 22:54:35 -0600 Subject: [PATCH 4/4] Revert "removed repo" This reverts commit e621cf09e8c198c04e2f9a608d676e92472576f8. --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index 45eff24d0b..14e8a594ef 100644 --- a/pom.xml +++ b/pom.xml @@ -1816,4 +1816,30 @@ + + + + apache.snapshots + https://repository.apache.org/snapshots + + false + + + false + + + + + + apache.snapshots + https://repository.apache.org/snapshots + + false + + + false + + +