Update to 2.1.11-SNAPSHOT

[aaf/authz.git] / cadi / aaf / pom.xml

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index f6fb1fd..bd2a933 100644 (file)
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -22,10 +22,10 @@
 <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">
        <parent>
-               <groupId>org.onap.aaf.authz.cadi</groupId>
-               <artifactId>parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>cadiparent</artifactId>
+               <version>2.1.11-SNAPSHOT</version>
+               <relativePath>..</relativePath>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,7 @@
 
        <properties>
        <!--  SONAR  -->
-       <sonar.skip>true</sonar.skip>
+       <!-- <sonar.skip>true</sonar.skip> -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>
            <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
            <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -48,7 +48,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-               <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
        <developers>
                <developer>
@@ -89,27 +89,23 @@
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-client</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-client</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.misc</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-env</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -137,7 +133,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>
@@ -192,14 +187,35 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       <!-- We want to create a Jar with Rosetta built in (since I don't want
-                               a separate deployment at this time Use this one as the jar to put in SWM
-                               packages <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration>
-                               <classifier>tests</classifier> <archive> <manifest> <mainClass>org.onap.aaf.cadi.cm.CmAgent</mainClass>
-                               </manifest> <manifestEntries> <Sealed>true</Sealed> </manifestEntries> </archive>
-                               </configuration> <executions> <execution> <id>full</id> <phase>package</phase>
-                               <goals> <goal>single</goal> </goals> <configuration> <descriptors> <descriptor>src/assemble/cadi-aaf.xml</descriptor>
-                               </descriptors> </configuration> </execution> </executions> </plugin> -->
+
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <classifier>tests</classifier>
+                                       <archive>
+                                               <manifest>
+                                                       <mainClass>org.onap.aaf.cadi.configure.Agent</mainClass>
+                                               </manifest>
+                                               <manifestEntries>
+                                                       <Sealed>true</Sealed>
+                                               </manifestEntries>
+                                       </archive>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>full</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <descriptors>
+                                                               <descriptor>src/assemble/cadi-aaf.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>