X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=5e6c358619c5bfd01a495d71f9976344ce35d510;hb=e9ae04800c417330c3e1c5dae45744f819f41130;hp=185d51c27424e63a563bdd26aa52bc62f4b5c5ff;hpb=13b7a3bc25fba512024f2e599be3eb132b0c7b16;p=aaf%2Fauthz.git

diff --git a/pom.xml b/pom.xml
index 185d51c2..5e6c3586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>parent</artifactId>
-    <version>2.1.11-SNAPSHOT</version>
+    <version>2.1.15-SNAPSHOT</version>
     <name>aaf-authz</name>
     <packaging>pom</packaging>
 
@@ -66,17 +66,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
@@ -141,6 +131,7 @@
                 </executions>
             </plugin>
 
+
         </plugins>
     </build>
     <modules>
@@ -217,13 +208,13 @@
                 <artifactId>aaf-cadi-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.onap.aaf.authz</groupId>
                 <artifactId>aaf-cadi-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.onap.aaf.authz</groupId>
                 <artifactId>aaf-cadi-aaf</artifactId>
@@ -246,48 +237,23 @@
                 <groupId>org.onap.aaf.authz</groupId>
                 <artifactId>aaf-cadi-cass</artifactId>
                 <version>${project.version}</version>
-            </dependency><dependency>
+            </dependency>
+            <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>3.0.1</version>
             </dependency>
-            
-            <!-- JettyVersion is partly covered in "OParent" 
-              dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency><dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-http</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency>
 
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-io</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-security</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency>
-
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-util</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency>
-             -->
+            <!-- JettyVersion is partly covered in "OParent" dependency> <groupId>org.eclipse.jetty</groupId> 
+                <artifactId>jetty-servlet</artifactId> <version>${project.jettyVersion}</version> 
+                </dependency><dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> 
+                <version>${project.jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> 
+                <artifactId>jetty-http</artifactId> <version>${project.jettyVersion}</version> 
+                </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> 
+                <version>${project.jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> 
+                <artifactId>jetty-security</artifactId> <version>${project.jettyVersion}</version> 
+                </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> 
+                <version>${project.jettyVersion}</version> </dependency> -->
 
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -348,7 +314,7 @@
                 <artifactId>mail</artifactId>
                 <version>1.4.7</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
@@ -362,34 +328,30 @@
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito</artifactId>
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.17</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.10</version>
                 <scope>test</scope>
             </dependency>
-            
+
         </dependencies>
     </dependencyManagement>
 
-
-
-
-
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
@@ -406,5 +368,4 @@
             <url>dav:${nexusproxy}${sitePath}</url>
         </site>
     </distributionManagement>
-
 </project>