This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 3adf4b9e86 CAUSEWAY-2445: Shiro 2.0.0 has no jakarta namespaces,
exclude from build
3adf4b9e86 is described below
commit 3adf4b9e86efb51895fdacacf3a4dd177e70eeb6
Author: Andi Huber <[email protected]>
AuthorDate: Wed Mar 20 16:06:45 2024 +0100
CAUSEWAY-2445: Shiro 2.0.0 has no jakarta namespaces, exclude from build
---
core/pom.xml | 2 +-
extensions/security/secman/pom.xml | 2 +-
regressiontests/base/pom.xml | 11 +++--
.../conf/Configuration_usingJdoAndShiro.java | 54 ----------------------
4 files changed, 8 insertions(+), 61 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index be61c4545f..2cc66fb16f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -300,7 +300,7 @@
<module>security</module>
<module>../security/bypass</module>
<module>../security/keycloak</module>
- <module>../security/shiro</module>
+<!-- <module>../security/shiro</module> Shiro 2.0.0 has no jakarta
namespaces, exclude from build -->
<module>../security/spring</module>
<module>../viewers/commons</module>
diff --git a/extensions/security/secman/pom.xml
b/extensions/security/secman/pom.xml
index bb00a02a2f..74ef741735 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -120,7 +120,7 @@
<module>encryption-spring</module>
<module>persistence-jdo</module>
<module>persistence-jpa</module>
- <module>delegated-shiro</module>
+<!-- <module>delegated-shiro</module> Shiro 2.0.0 has no jakarta
namespaces, exclude from build -->
<module>delegated-springoauth2</module>
</modules>
</project>
diff --git a/regressiontests/base/pom.xml b/regressiontests/base/pom.xml
index b88a5513ee..287e970f6c 100644
--- a/regressiontests/base/pom.xml
+++ b/regressiontests/base/pom.xml
@@ -90,11 +90,12 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.causeway.security</groupId>
- <artifactId>causeway-security-shiro</artifactId>
- <optional>true</optional>
- </dependency>
+<!--Shiro 2.0.0 has no jakarta namespaces, exclude from build-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.causeway.security</groupId>-->
+<!-- <artifactId>causeway-security-shiro</artifactId>-->
+<!-- <optional>true</optional>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
diff --git
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java
deleted file mode 100644
index 43c5c6def7..0000000000
---
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package org.apache.causeway.testdomain.conf;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.security.shiro.CausewayModuleSecurityShiro;
-import org.apache.causeway.testdomain.jdo.JdoTestDomainModule;
-import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-
-@Configuration
-@Import({
- CausewayModuleCoreRuntimeServices.class,
- CausewayModuleSecurityShiro.class,
- CausewayModulePersistenceJdoDatanucleus.class,
- CausewayModuleTestingFixturesApplib.class,
- KVStoreForTesting.class, // Helper for JUnit Tests
-})
-@ComponentScan(
- basePackageClasses= {
- JdoTestDomainModule.class
- })
-@PropertySources({
- @PropertySource(CausewayPresets.NoTranslations),
- @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
- @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
-})
-public class Configuration_usingJdoAndShiro {
-
-}
