Change Beijing Release to 2.1.1

[aaf/authz.git] / auth / auth-cmd / pom.xml

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 4f83551..55c709f 100644 (file)
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -16,9 +16,9 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.onap.aaf.authz.auth</groupId>
-               <artifactId>parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>authparent</artifactId>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -30,12 +30,13 @@
        <properties>
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <!-- SONAR -->
+               <!-- <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>
                <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
                <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
                        below -->
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@ -94,7 +95,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -105,7 +105,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>
@@ -164,17 +163,46 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <classifier>tests</classifier>
+                                       <archive>
+                                               <manifest>
+                                                       <mainClass>org.onap.aaf.auth.cmd.AAFcli</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/auth-cmd.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       
                </plugins>
        </build>
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
                </dependency>