You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/02/20 14:04:28 UTC

[2/2] aries-rsa git commit: Try to fix project setup

Try to fix project setup


Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/cea1da8b
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/cea1da8b
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/cea1da8b

Branch: refs/heads/master
Commit: cea1da8b7d75961f196b1d1859b3326395058c80
Parents: e7c868f
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Feb 20 15:04:22 2017 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Feb 20 15:04:22 2017 +0100

----------------------------------------------------------------------
 parent/pom.xml | 13 ++++---------
 pom.xml        | 12 +++++-------
 2 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/cea1da8b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b689c15..c751153 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -13,15 +13,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache</groupId>
-        <artifactId>apache</artifactId>
-        <version>17</version>
-        <relativePath />
+        <groupId>org.apache.aries.rsa</groupId>
+        <artifactId>org.apache.aries.rsa.main</artifactId>
+        <version>1.11.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.aries.rsa</groupId>
     <artifactId>org.apache.aries.rsa.parent</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Aries Remote Service Admin Parent</name>
 
@@ -311,7 +309,4 @@
         </profile>
     </profiles>
 
-  <scm>
-    <tag>org.apache.aries.rsa-1.10.0</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/cea1da8b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ddb65d1..7cc6fa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,14 +19,13 @@
 -->
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
-        <groupId>org.apache.aries.rsa</groupId>
-        <artifactId>org.apache.aries.rsa.parent</artifactId>
-        <version>1.11.0-SNAPSHOT</version>
-        <relativePath>parent/pom.xml</relativePath>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>17</version>
     </parent>
-    
+	
     <artifactId>org.apache.aries.rsa.main</artifactId>
     <packaging>pom</packaging>
     <name>Aries Remote Service Admin Main</name>
@@ -75,7 +74,6 @@
     </organization>
 
     <modules>
-        <module>parent</module>
         <module>spi</module>
         <module>rsa</module>
         <module>eapub</module>