BAEL-4019: Renamed module to avoid name conflict

2020-06-20 11:05:14 +05:30 · 2020-06-20 11:05:14 +05:30 · 296abb0d87
parent 9b4ee4aae3
commit 296abb0d87
12 changed files with 3 additions and 3 deletions
--- a/java-security/apache-shiro-security/.gitignore
+++ b/java-security/apache-shiro-security/.gitignore
--- a/java-security/apache-shiro-security/pom.xml
+++ b/java-security/apache-shiro-security/pom.xml
@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <artifactId>apache-shiro</artifactId>
-    <name>apache-shiro</name>
+    <artifactId>apache-shiro-security</artifactId>
+    <name>apache-shiro-security</name>

    <parent>
        <groupId>com.baeldung</groupId>
--- a/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/CustomRealm.java
+++ b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/CustomRealm.java
--- a/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/ShiroApplication.java
+++ b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/ShiroApplication.java
--- a/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/controllers/ShiroController.java
+++ b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/controllers/ShiroController.java
--- a/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/models/UserCredentials.java
+++ b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/models/UserCredentials.java
--- a/java-security/apache-shiro-security/src/main/resources/application.yml
+++ b/java-security/apache-shiro-security/src/main/resources/application.yml
--- a/java-security/apache-shiro-security/src/main/resources/templates/home.ftl
+++ b/java-security/apache-shiro-security/src/main/resources/templates/home.ftl
--- a/java-security/apache-shiro-security/src/main/resources/templates/index.ftl
+++ b/java-security/apache-shiro-security/src/main/resources/templates/index.ftl
--- a/java-security/apache-shiro-security/src/main/resources/templates/login.ftl
+++ b/java-security/apache-shiro-security/src/main/resources/templates/login.ftl
--- a/java-security/apache-shiro-security/src/test/java/com/baeldung/shiro/SpringContextTest.java
+++ b/java-security/apache-shiro-security/src/test/java/com/baeldung/shiro/SpringContextTest.java
--- a/java-security/pom.xml
+++ b/java-security/pom.xml
@ -15,7 +15,7 @@
    </parent>

    <modules>
-        <module>apache-shiro</module>
+        <module>apache-shiro-security</module>
        <module>spring-security</module>
    </modules>