You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/02/04 15:46:08 UTC

[airavata] 01/02: FIxing maven warnings

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 665bed88e8bfc3b40a91905b8cdc99af9efbd9c9
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Sun Feb 4 10:44:52 2018 -0500

    FIxing maven warnings
---
 airavata-api/airavata-api-server/pom.xml           | 10 ---------
 .../credential-store-service/pom.xml               |  5 -----
 modules/distribution/pom.xml                       |  5 -----
 .../sharing-registry/sharing-data-migrator/pom.xml |  5 -----
 .../sharing-registry-distribution/pom.xml          |  5 -----
 pom.xml                                            | 24 +++++++++-------------
 6 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index a4d10af..0e96478 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -165,19 +165,9 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>registry-api-stubs</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>profile-service-stubs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>services-security</artifactId>
-            <version>0.17-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index b7e7b2c..d605a2b 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -144,11 +144,6 @@
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-            <version>10.11.1.1</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index de9cc8d..b940653 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -89,11 +89,6 @@
             <version>2.4</version>
         </dependency>
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.6</version>
diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml
index f282f53..9c308be 100644
--- a/modules/sharing-registry/sharing-data-migrator/pom.xml
+++ b/modules/sharing-registry/sharing-data-migrator/pom.xml
@@ -60,11 +60,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.10</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
             <version>0.9.3</version>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index d43e229..f909525 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -43,11 +43,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-sharing-registry-stubs</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-commons</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 8d26886..ec7997e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
@@ -645,21 +641,21 @@
                         </configuration>
                     </plugin>
                     <plugin>
-                        <groupId>com.lukegb.mojo</groupId>
-                        <artifactId>gitdescribe-maven-plugin</artifactId>
-                        <version>3.0</version>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>3.0.0-M1</version>
                         <executions>
                             <execution>
+                                <id>enforce-versions</id>
                                 <goals>
-                                    <goal>gitdescribe</goal>
+                                    <goal>enforce</goal>
                                 </goals>
-                                <id>git-describe</id>
-                                <phase>initialize</phase>
                                 <configuration>
-                                    <extraArguments>
-                                        <param>--tags</param>
-                                    </extraArguments>
-                                    <descriptionProperty>git-describe</descriptionProperty>
+                                    <rules>
+                                        <requireMavenVersion>
+                                            <version>3.0</version>
+                                        </requireMavenVersion>
+                                    </rules>
                                 </configuration>
                             </execution>
                         </executions>

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.