airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [2/2] airavata git commit: Fixed sharing registry build issue with pom versions
Date Wed, 09 Nov 2016 20:21:17 GMT
Fixed sharing registry build issue with pom versions


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

Branch: refs/heads/develop
Commit: c0665f1aaa804736a6a839ba5438387557a873e9
Parents: b2bded2
Author: Shameera Rathnayaka <shameerainfo@gmail.com>
Authored: Wed Nov 9 15:20:53 2016 -0500
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
Committed: Wed Nov 9 15:20:53 2016 -0500

----------------------------------------------------------------------
 modules/sharing-registry/pom.xml                      | 12 +++---------
 .../sharing-registry/sharing-data-migrator/pom.xml    |  7 ++++---
 .../sharing-registry-distribution/pom.xml             | 14 ++++++--------
 .../sharing-registry/sharing-registry-server/pom.xml  | 11 +++++++----
 .../sharing-registry/sharing-registry-stubs/pom.xml   |  5 ++++-
 5 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c0665f1a/modules/sharing-registry/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/pom.xml b/modules/sharing-registry/pom.xml
index 781a11d..55ae5a5 100644
--- a/modules/sharing-registry/pom.xml
+++ b/modules/sharing-registry/pom.xml
@@ -2,7 +2,6 @@
 <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>
 
     <parent>
         <artifactId>airavata</artifactId>
@@ -11,16 +10,11 @@
         <version>0.17-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <global.version>0.17-SNAPSHOT</global.version>
-    </properties>
-
-    <groupId>org.apache.airavata</groupId>
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>airavata-sharing-registry</artifactId>
     <packaging>pom</packaging>
-    <version>${global.version}</version>
-
-
+    <name>Airavata Sharing Registry</name>
+    <url>http://airavata.apache.org/</url>
 
     <modules>
         <module>sharing-registry-stubs</module>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c0665f1a/modules/sharing-registry/sharing-data-migrator/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml
index 3fb2035..e8b2c35 100644
--- a/modules/sharing-registry/sharing-data-migrator/pom.xml
+++ b/modules/sharing-registry/sharing-data-migrator/pom.xml
@@ -5,18 +5,19 @@
     <parent>
         <artifactId>airavata-sharing-registry</artifactId>
         <groupId>org.apache.airavata</groupId>
-        <version>${global.version}</version>
+        <version>0.17-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>airavata-sharing-data-migrator</artifactId>
     <packaging>jar</packaging>
+    <name>Sharing Data Migrator</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-sharing-registry-server</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/c0665f1a/modules/sharing-registry/sharing-registry-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index f9bff9a..ddf2437 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -5,11 +5,14 @@
     <parent>
         <artifactId>airavata-sharing-registry</artifactId>
         <groupId>org.apache.airavata</groupId>
-        <version>${global.version}</version>
+        <version>0.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>airavata-sharing-registry-distribution</artifactId>
+    <packaging>jar</packaging>
+    <name>Sharing Registry Distribution</name>
+    <url>http://airavata.apache.org/</url>
 
     <dependencies>
         <dependency>
@@ -20,17 +23,12 @@
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-sharing-registry-stubs</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-server-configuration</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-commons</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sf.dozer</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c0665f1a/modules/sharing-registry/sharing-registry-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 1498575..2822f35 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -6,12 +6,15 @@
         <artifactId>airavata-sharing-registry</artifactId>
         <groupId>org.apache.airavata</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>${global.version}</version>
+        <version>0.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>airavata-sharing-registry-server</artifactId>
     <packaging>jar</packaging>
+    <name>Sharing Registry Server</name>
+    <url>http://airavata.apache.org/</url>
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -21,17 +24,17 @@
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-sharing-registry-stubs</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-server-configuration</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-commons</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sf.dozer</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c0665f1a/modules/sharing-registry/sharing-registry-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml
index ce39e03..87e80da 100644
--- a/modules/sharing-registry/sharing-registry-stubs/pom.xml
+++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml
@@ -6,12 +6,15 @@
         <artifactId>airavata-sharing-registry</artifactId>
         <groupId>org.apache.airavata</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>${global.version}</version>
+        <version>0.17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>airavata-sharing-registry-stubs</artifactId>
     <packaging>jar</packaging>
+    <name>Sharing Registry Stubs</name>
+    <url>http://airavata.apache.org/</url>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.thrift</groupId>


Mime
View raw message