This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new 3ef7de8 [SHIRO-663] Clean up pom parent relative path
new ce874b1 Merge pull request #114 from fpapon/SHIRO-663
3ef7de8 is described below
commit 3ef7de87b654bef7283f6faff08007f508847560
Author: Francois Papon <[email protected]>
AuthorDate: Sat Feb 2 14:32:16 2019 +0400
[SHIRO-663] Clean up pom parent relative path
---
config/core/pom.xml | 4 ++--
config/ogdl/pom.xml | 4 ++--
crypto/cipher/pom.xml | 4 ++--
crypto/core/pom.xml | 4 ++--
crypto/hash/pom.xml | 4 ++--
integration-tests/guice3/pom.xml | 1 +
integration-tests/pom.xml | 1 +
integration-tests/support/pom.xml | 1 +
samples/jaxrs/pom.xml | 1 +
samples/servlet-plugin/pom.xml | 1 +
samples/spring-boot-web/pom.xml | 1 +
samples/spring-boot/pom.xml | 1 +
support/aspectj/pom.xml | 4 ++--
support/cas/pom.xml | 4 ++--
support/ehcache/pom.xml | 4 ++--
support/features/pom.xml | 4 ++--
support/guice/pom.xml | 4 ++--
support/hazelcast/pom.xml | 4 ++--
support/quartz/pom.xml | 4 ++--
support/servlet-plugin/pom.xml | 1 +
support/spring-boot/pom.xml | 4 ++--
support/spring-boot/spring-boot-starter/pom.xml | 1 +
support/spring-boot/spring-boot-web-starter/pom.xml | 1 +
support/spring/pom.xml | 4 ++--
24 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/config/core/pom.xml b/config/core/pom.xml
index 643a45f..0eb1f59 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-config</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
index 9dc8885..8b46cf5 100644
--- a/config/ogdl/pom.xml
+++ b/config/ogdl/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-config</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
index e64d751..07207d3 100644
--- a/crypto/cipher/pom.xml
+++ b/crypto/cipher/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-crypto</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
index 5592f46..d9ef676 100644
--- a/crypto/core/pom.xml
+++ b/crypto/core/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-crypto</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
index 4944d20..faf1730 100644
--- a/crypto/hash/pom.xml
+++ b/crypto/hash/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-crypto</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index 9317298..8dff40a 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shiro-its-guice3</artifactId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 91509fd..d6c6ed3 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-root</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.shiro.integrationtests</groupId>
diff --git a/integration-tests/support/pom.xml
b/integration-tests/support/pom.xml
index 789d72a..028ccf7 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-integration-tests</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shiro-its-support</artifactId>
diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml
index d692fc9..f44c9dc 100644
--- a/samples/jaxrs/pom.xml
+++ b/samples/jaxrs/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index e99e3a0..6d7107c 100644
--- a/samples/servlet-plugin/pom.xml
+++ b/samples/servlet-plugin/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
index 90b1d00..7832f68 100644
--- a/samples/spring-boot-web/pom.xml
+++ b/samples/spring-boot-web/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>samples-spring-boot-web</artifactId>
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index 830b40b..4002308 100644
--- a/samples/spring-boot/pom.xml
+++ b/samples/spring-boot/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.shiro.samples</groupId>
<artifactId>shiro-samples</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>samples-spring-boot</artifactId>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index d4bbd93..25fe670 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/cas/pom.xml b/support/cas/pom.xml
index 512d78e..c2167e5 100644
--- a/support/cas/pom.xml
+++ b/support/cas/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
index 32c6f28..a903f30 100644
--- a/support/ehcache/pom.xml
+++ b/support/ehcache/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/features/pom.xml b/support/features/pom.xml
index 81cfa28..bd509d7 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 58f069b..6f173cf 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 84d1eb2..0124ab2 100644
--- a/support/hazelcast/pom.xml
+++ b/support/hazelcast/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index 7a8e07e..a28c737 100644
--- a/support/quartz/pom.xml
+++ b/support/quartz/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/servlet-plugin/pom.xml b/support/servlet-plugin/pom.xml
index 9c6b176..0a63641 100644
--- a/support/servlet-plugin/pom.xml
+++ b/support/servlet-plugin/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shiro-servlet-plugin</artifactId>
diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
index 784086d..aaf2810 100644
--- a/support/spring-boot/pom.xml
+++ b/support/spring-boot/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/support/spring-boot/spring-boot-starter/pom.xml
b/support/spring-boot/spring-boot-starter/pom.xml
index 992f6e2..b1134e9 100644
--- a/support/spring-boot/spring-boot-starter/pom.xml
+++ b/support/spring-boot/spring-boot-starter/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shiro-spring-boot-starter</artifactId>
diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml
b/support/spring-boot/spring-boot-web-starter/pom.xml
index 6fecc88..b863ec2 100644
--- a/support/spring-boot/spring-boot-web-starter/pom.xml
+++ b/support/spring-boot/spring-boot-web-starter/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot</artifactId>
<version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shiro-spring-boot-web-starter</artifactId>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 9956d0f..d9cc1ea 100644
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
+ <artifactId>shiro-support</artifactId>
<version>1.4.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
