Update version.properties to aaf authz

Updating version.properties file in aaf authz.

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

2 files changed, 59 insertions, 100 deletions

diff --git a/authz-certman/pom.xml b/authz-certman/pom.xml
index 3579e1b0..dd89698a 100644
--- a/authz-certman/pom.xml
+++ b/authz-certman/pom.xml
@@ -55,6 +55,13 @@
 		<project.swmVersion>45</project.swmVersion>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>

+		<sonar.language>java</sonar.language>

+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>

+		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>

+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>

+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>

+		<sonar.projectVersion>${project.version}</sonar.projectVersion>

         <nexusproxy>https://nexus.onap.org</nexusproxy>

 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>

 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>

@@ -153,7 +160,59 @@
 					<nexusUrl>${nexusproxy}</nexusUrl>

 					<stagingProfileId>176c31dfe190a</stagingProfileId>

 					<serverId>ecomp-staging</serverId>

+					<skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>

 				</configuration>

+			</plugin>		

+			<plugin>

+				<groupId>org.jacoco</groupId>

+				<artifactId>jacoco-maven-plugin</artifactId>

+				<version>0.7.7.201606060606</version>

+				<configuration>

+					<dumpOnExit>true</dumpOnExit>

+					<includes>

+						<include>org.onap.aaf.*</include>

+					</includes>

+				</configuration>

+				<executions>

+					<execution>

+						<id>pre-unit-test</id>

+						<goals>

+							<goal>prepare-agent</goal>

+						</goals>

+						<configuration>

+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>

+							<!-- <append>true</append> -->

+						</configuration>

+					</execution>

+					<execution>

+						<id>pre-integration-test</id>

+						<phase>pre-integration-test</phase>

+						<goals>

+							<goal>prepare-agent</goal>

+						</goals>

+						<configuration>

+							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>

+							<!-- <append>true</append> -->

+						</configuration>

+					</execution>

+					<execution>

+                        <goals>

+                            <goal>merge</goal>

+                        </goals>

+                        <phase>post-integration-test</phase>

+                        <configuration>

+                            <fileSets>

+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">

+                                    <directory>${project.build.directory}/coverage-reports</directory>

+                                    <includes>

+                                        <include>*.exec</include>

+                                    </includes>

+                                </fileSet>

+                            </fileSets>

+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>

+                        </configuration>

+                    </execution>

+				</executions>

 			</plugin>

 

 			</plugins>

diff --git a/authz-certman/src/test/java/org/onap/aaf/authz/cm/validation/JU_Validator.java b/authz-certman/src/test/java/org/onap/aaf/authz/cm/validation/JU_Validator.java
deleted file mode 100644
index b7600112..00000000
--- a/authz-certman/src/test/java/org/onap/aaf/authz/cm/validation/JU_Validator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * ===========================================================================

- * * Licensed under the Apache License, Version 2.0 (the "License");

- * * you may not use this file except in compliance with the License.

- * * You may obtain a copy of the License at

- * * 

- *  *      http://www.apache.org/licenses/LICENSE-2.0

- * * 

- *  * Unless required by applicable law or agreed to in writing, software

- * * distributed under the License is distributed on an "AS IS" BASIS,

- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * * See the License for the specific language governing permissions and

- * * limitations under the License.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package org.onap.aaf.authz.cm.validation;

-

-import static org.junit.Assert.*;

-

-import java.util.ArrayList;

-

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.runners.MockitoJUnitRunner;

-import org.onap.aaf.authz.cm.validation.Validator;

-import org.onap.aaf.dao.aaf.cass.ArtiDAO;

-

-@RunWith(MockitoJUnitRunner.class)

-public class JU_Validator {

-	

-	private static Validator validator;

-	

-	@BeforeClass

-	public static void setUp() {

-		validator = new Validator();

-	}

-	

-	@Test

-	public void nullCheck() {

-		assertNotNull(validator.nullOrBlank("TestName", null).errs());

-	}

-	

-	@Test

-	public void blankCheck() {

-		assertNotNull(validator.nullOrBlank("TestName", "").err());

-	}

-	

-	@Test

-	public void notOK_null() {

-		assertNotNull(validator.notOK(null));

-	}

-	

-	@Test

-	public void isNullCheck() {

-		assertNotNull(validator.isNull("TestName", null).errs());

-	}

-	

-	@Test

-	public void nullBlankMin() {

-		assertNotNull(validator.nullBlankMin("TestName", null, 0));

-	}

-	

-	@Test

-	public void artistsRequired() {

-		assertNotNull(validator.artisRequired(null, 0));

-	}

-	

-	@Test

-	public void artistRequired() {

-		assertNotNull(validator.artisRequired(new ArrayList<ArtiDAO.Data>(), -1));

-	}

-	

-	@Test

-	public void artistRequired_Null() {

-		assertNotNull(validator.artisRequired(null, -1));

-	}

-	

-	@Test

-	public void artistkeys() {

-		assertNotNull(validator.artisKeys(new ArrayList<ArtiDAO.Data>(), -1));

-	}

-	

-	@Test

-	public void artistKeys_Null() {

-		assertNotNull(validator.artisKeys(null, -1));

-	}

-	

-	@Test

-	public void keys() {

-		assertNotNull(validator.keys(new ArtiDAO.Data()));

-	}

-}