Update aaf client module

Remove aaf submodules and update aaf client
module.

Issue-id: AAF-21
Change-Id: I750ec9e26596652a142b014db94aabd082880130
Signed-off-by: sg481n <sg481n@att.com>

1 files changed, 14 insertions, 200 deletions

diff --git a/pom.xml b/pom.xml
index 2a72e2d9..d657a27c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   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>
-	<groupId>com.att.authz</groupId>
+	<groupId>org.onap.aaf.authz</groupId>
 	<artifactId>parent</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Authz Parent (pom)</name>
@@ -50,6 +50,11 @@
 		packaged.  This prevents duplication of these common artifacts, plugins, and 
 		other settings and provides a single place to support this configuration.
 	</description>
+		 <parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<skipTests>false</skipTests>
@@ -57,14 +62,6 @@
 		<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
 		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
 		<project.dme2Version>3.1.200</project.dme2Version>
-				<!-- version>  2.8.8</version -->
-				<!-- version>  2.8.5.8</version -->
-				<!-- version>  2.8.2.5</version -->
-				<!-- version>2.8.1.3</version -->
-				<!-- version>2.8.1</version This version changes Servlet to 3.0-->
-				<!-- version>2.6.29</version -->
-				<!-- version>2.6.20</version -->
-		
 	</properties>
 
 	<build>
@@ -88,43 +85,6 @@
 						</configuration>        
 				</plugin>
 	
-				<plugin>
-				  <groupId>org.apache.maven.plugins</groupId>
-				  <artifactId>maven-surefire-plugin</artifactId>
-				  <version>2.17</version>
-				  <configuration>
-					<skipTests>${skipTests}</skipTests>
-					<includes>
-					  <include>**/JU*.java</include>
-					</includes>
-					<excludes>
-					<exclude>**/JU_DataFile.java</exclude>
-					<exclude>**/JU_ArtiDAO.java</exclude>
-					<exclude>**/JU_CertDAO.java</exclude>
-					<exclude>**/JU_FastCalling.java</exclude>
-					<exclude>**/JU_NsDAO.java</exclude>
-					  <!-- <exclude>**/authz-cass/**</exclude> -->
-					  <!-- <exclude>**/JU_UseCase1.java</exclude> -->
-					  <exclude>**/JU_RoleDAO.java</exclude>
-					  <exclude>**/JU_PermDAO.java</exclude>
-					   <exclude>**/JU_Question.java</exclude> 
-					  <!-- <exclude>**/JU_NS.java</exclude> -->
-					  <exclude>**/JU_HistoryDAO.java</exclude>				  
-					  <exclude>**/JU_DelegateDAO.java</exclude>
-					  <exclude>**/JU_CredDAO.java</exclude>
-					  <exclude>**/JU_CacheInfoDAO.java</exclude>
-					  <exclude>**/JU_ApprovalDAO.java</exclude>
-					  <exclude>**/JU_Define.java</exclude>
-					  <exclude>**/JU_AuthzTransFilter.java</exclude>
-					  <exclude>**/JU_CachingFileAccess.java</exclude>
-					  <!-- <exclude>**/AbsServiceTest.java</exclude> -->
-					  <exclude>**/JU_DefaultOrg.java</exclude>
-					  <!-- <exclude>**/JU_Perm_2_0*.java</exclude> -->
-					  <!-- <exclude>**/JU_Role_2_0*.java</exclude>				   -->
-					</excludes>
-	
-				  </configuration>
-				</plugin>
 	
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -160,41 +120,7 @@
 					</execution>
 				  </executions>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jarsigner-plugin</artifactId>
-					<version>1.2</version>
-					<executions>
-						<execution>
-							<id>sign</id>
-							<goals>
-								<goal>sign</goal>
-							</goals>
-							<configuration>
-								<!--  skip>${skipSigning}</skip -->
-								<archive>target/${project.artifactId}-${project.version}.jar</archive>
-							</configuration>
-						</execution>
-						<execution>
-							<id>verify</id>
-							<goals>
-								<goal>verify</goal>
-							</goals>
-							<configuration>
-								<archive>target/${project.artifactId}-${project.version}.jar</archive>
-							</configuration>
-						</execution>
-					</executions>
-					<configuration>
-						<skip>true</skip>
-						<alias>aaf</alias>
-						<keystore>/Volumes/Data/src/cadi/keys/aaf_cadi.jks</keystore>
-						<storepass>Surprise!</storepass>
-						<keypass>Surprise!</keypass>
-						<verbose>true</verbose>
-						<certs>true</certs>
-					</configuration>
-				</plugin>
+				
 				
 							<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
@@ -226,19 +152,6 @@
 			</execution>
 		      </executions>
 		    </plugin>
- 
-			
-		<plugin>
-			<groupId>org.sonatype.plugins</groupId>
-			<artifactId>nexus-staging-maven-plugin</artifactId>
-			<version>1.6.7</version>
-			<extensions>true</extensions>
-			<configuration>
-			<serverId>ossrhdme</serverId>
-			<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-			<autoReleaseAfterClose>true</autoReleaseAfterClose>
-			</configuration>
-		</plugin>
 			
 		<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -288,125 +201,43 @@
 	</dependencies>    	
 
 	<modules>
-		<!-- 
-		   <module> auth-client</module>
-		   complile manually with mvn -N independently
-		-->
+
 		<module>authz-client</module>
-		<module>authz-core</module>
-		<module>authz-cass</module>
-		<module>authz-defOrg</module>
-		<module>authz-service</module>
- 		<module>authz-cmd</module>
- 		<!--  <module>authz-batch</module>-->
- 		<module>authz-test</module>
- 		<!--  <module>authz-gui</module> -->
- 		<module>authz-gw</module>
- 		<module>authz-certman</module>
- 		<module>authz-fs</module>
+	
  	</modules>
 	
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>env</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>log4j</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>rosetta</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>xgen</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 			
-			<dependency>
-				<groupId>com.att.cadi</groupId>
-				<artifactId>cadi-core</artifactId>
-				<version>${project.cadiVersion}</version>
-			</dependency>
 
-			<dependency>
-				<groupId>com.att.cadi</groupId>
-				<artifactId>cadi-client</artifactId>
-				<version>${project.cadiVersion}</version>
-			</dependency>
-			
 			
-			<dependency>
-				<groupId>com.att.cadi</groupId>
-				<artifactId>cadi-aaf</artifactId>
-				<version>${project.cadiVersion}</version>
-				<exclusions>
-			      <exclusion> 
-					<groupId>org.apache.cassandra</groupId>
-		    		<artifactId>cassandra-all</artifactId>
-    		      </exclusion>
-			    </exclusions> 
-			</dependency>
-			
-			<dependency>
-				<groupId>com.att.authz</groupId>
-				<artifactId>authz-client</artifactId>
-				<version>${project.interfaceVersion}</version>
-			</dependency>
-			
-			
-			<dependency>
-				<groupId>com.att.authz</groupId>
-				<artifactId>authz-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			
-			<dependency>
-	            <groupId>com.att.authz</groupId>
-	            <artifactId>authz-cass</artifactId>
-				<version>${project.version}</version>
-	        </dependency>
-	        
-	        <dependency>
-				<groupId>com.att.authz</groupId>
-				<artifactId>authz-batch</artifactId>
-				<version>${project.interfaceVersion}</version>
-			</dependency>
-	    
-	    <!--  <dependency>
-	            <groupId>com.att.authz</groupId>
-	            <artifactId>authz-att</artifactId>
-				<version>${project.version}</version>
-	        </dependency>     --> 
-
-		    <dependency>
-	            <groupId>com.att.authz</groupId>
-	            <artifactId>authz-cmd</artifactId>
-				<version>${project.version}</version>
-	        </dependency>
-	        <dependency>
-	            <groupId>com.att.authz</groupId>
-	            <artifactId>authz-gw</artifactId>
-				<version>${project.version}</version>
-	        </dependency>
 
 			<dependency>
 				<groupId>com.att.aft</groupId>
 				<artifactId>dme2</artifactId>
-				<!--  version>2.6.20</version -->
-				<!-- version>2.6.29</version -->
-				<!-- version>2.8.1</version This version changes Servlet to 3.0-->
-				<!-- version>2.8.1.3</version -->
-				<!-- version>2.8.2.5</version -->
 				<version>${project.dme2Version}</version>
 			</dependency>
 		
@@ -470,23 +301,6 @@
 			
 		</dependencies>
 	</dependencyManagement>
-	
-	
-<distributionManagement>
-    		<snapshotRepository>
-      			<id>ossrhdme</id>
-      			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    		</snapshotRepository>
-    		<repository>
-      			<id>ossrhdme</id>
-      			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    		</repository>
-	</distributionManagement>
-	
-	<scm>
-		<connection>https://github.com/att/AAF.git</connection>
-		<developerConnection>${project.scm.connection}</developerConnection>
-		<url>http://github.com/att/AAF/tree/master</url>
-	</scm>
+
 	
 </project>