This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit 07dbb7563a3ff09a3f2bffeab353275185bba9d0 Author: Aarushi <[email protected]> AuthorDate: Sat Aug 10 18:46:04 2019 -0400 removed hard coded version from the pom.xml files which now uses project version --- custos-authentication/pom.xml | 8 +++----- custos-client/pom.xml | 12 ++++-------- custos-commons/pom.xml | 5 ++--- custos-connectors/pom.xml | 4 ++-- custos-profile-service/iam-admin-services/pom.xml | 4 ++-- custos-profile-service/profile-service-commons/pom.xml | 5 ++--- custos-profile-service/profile-service-server/pom.xml | 9 +++------ custos-profile-service/tenant-profile-service/pom.xml | 10 +++------- custos-profile-service/user-profile-service/pom.xml | 9 +++------ ide-integration/pom.xml | 6 ++---- 10 files changed, 26 insertions(+), 46 deletions(-) diff --git a/custos-authentication/pom.xml b/custos-authentication/pom.xml index c8f8cf3..fc2a34f 100644 --- a/custos-authentication/pom.xml +++ b/custos-authentication/pom.xml @@ -10,20 +10,18 @@ <modelVersion>4.0.0</modelVersion> <artifactId>custos-authentication</artifactId> + <dependencies> <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-commons</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-connectors</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> - </project> \ No newline at end of file diff --git a/custos-client/pom.xml b/custos-client/pom.xml index 2c2ee4c..7c241a8 100644 --- a/custos-client/pom.xml +++ b/custos-client/pom.xml @@ -13,26 +13,22 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-authentication</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>user-profile-service</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>iam-admin-services</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>tenant-profile-service</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> <properties> diff --git a/custos-commons/pom.xml b/custos-commons/pom.xml index 85b8584..5a78df1 100644 --- a/custos-commons/pom.xml +++ b/custos-commons/pom.xml @@ -7,15 +7,14 @@ <artifactId>custos</artifactId> <groupId>org.apache.custos</groupId> <version>1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <properties> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> </properties> - <groupId>org.apache.custos</groupId> + <artifactId>custos-commons</artifactId> - <version>${parent.version}</version> + <dependencies> <dependency> <groupId>org.apache.thrift</groupId> diff --git a/custos-connectors/pom.xml b/custos-connectors/pom.xml index f3ab17d..aa5f07c 100644 --- a/custos-connectors/pom.xml +++ b/custos-connectors/pom.xml @@ -18,12 +18,12 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-commons</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-model</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.google.inject</groupId> diff --git a/custos-profile-service/iam-admin-services/pom.xml b/custos-profile-service/iam-admin-services/pom.xml index e5136ae..d67b676 100644 --- a/custos-profile-service/iam-admin-services/pom.xml +++ b/custos-profile-service/iam-admin-services/pom.xml @@ -14,12 +14,12 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-model</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-authentication</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <properties> diff --git a/custos-profile-service/profile-service-commons/pom.xml b/custos-profile-service/profile-service-commons/pom.xml index 2688339..949246a 100644 --- a/custos-profile-service/profile-service-commons/pom.xml +++ b/custos-profile-service/profile-service-commons/pom.xml @@ -13,7 +13,6 @@ <artifactId>custos-profile-service</artifactId> <groupId>org.apache.custos</groupId> <version>1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -67,12 +66,12 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-commons</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-model</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/custos-profile-service/profile-service-server/pom.xml b/custos-profile-service/profile-service-server/pom.xml index 53b8128..b021ff5 100644 --- a/custos-profile-service/profile-service-server/pom.xml +++ b/custos-profile-service/profile-service-server/pom.xml @@ -14,20 +14,17 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-commons</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>user-profile-service</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>tenant-profile-service</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/custos-profile-service/tenant-profile-service/pom.xml b/custos-profile-service/tenant-profile-service/pom.xml index f151c8b..d672cfa 100644 --- a/custos-profile-service/tenant-profile-service/pom.xml +++ b/custos-profile-service/tenant-profile-service/pom.xml @@ -14,22 +14,18 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-model</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-commons</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-commons</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> - </project> \ No newline at end of file diff --git a/custos-profile-service/user-profile-service/pom.xml b/custos-profile-service/user-profile-service/pom.xml index 1854131..4afd95c 100644 --- a/custos-profile-service/user-profile-service/pom.xml +++ b/custos-profile-service/user-profile-service/pom.xml @@ -22,20 +22,17 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-commons</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-connectors</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>iam-admin-services</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/ide-integration/pom.xml b/ide-integration/pom.xml index 00adb60..ee1a01d 100644 --- a/ide-integration/pom.xml +++ b/ide-integration/pom.xml @@ -24,14 +24,12 @@ <dependency> <groupId>org.apache.custos</groupId> <artifactId>profile-service-server</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.custos</groupId> <artifactId>custos-authentication</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies>
