From: sg481n Date: Fri, 1 Sep 2017 17:12:31 +0000 (-0400) Subject: Update version.properties to aaf authz X-Git-Tag: v1.0.1~43 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=40cd35657e9ced190833274bccd4bae4481171d9 Update version.properties to aaf authz Updating version.properties file in aaf authz. Issue-id: AAF-21 Change-Id: I8a14b765663533064ad8f403640f4d580c65ec90 Signed-off-by: sg481n --- diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml index a2233f06..1fc09676 100644 --- a/authz-batch/pom.xml +++ b/authz-batch/pom.xml @@ -171,7 +171,7 @@ - com.att.authz.Batch + org.onap.aaf.authz.Batch @@ -240,17 +240,7 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - + diff --git a/authz-cass/pom.xml b/authz-cass/pom.xml index f1e34a77..b04f151b 100644 --- a/authz-cass/pom.xml +++ b/authz-cass/pom.xml @@ -53,6 +53,13 @@ UTF-8 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -152,7 +159,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + 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 @@ 45 UTF-8 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -153,7 +160,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + 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(), -1)); - } - - @Test - public void artistRequired_Null() { - assertNotNull(validator.artisRequired(null, -1)); - } - - @Test - public void artistkeys() { - assertNotNull(validator.artisKeys(new ArrayList(), -1)); - } - - @Test - public void artistKeys_Null() { - assertNotNull(validator.artisKeys(null, -1)); - } - - @Test - public void keys() { - assertNotNull(validator.keys(new ArtiDAO.Data())); - } -} diff --git a/authz-client/pom.xml b/authz-client/pom.xml index 38fe15c5..8d2c79ef 100644 --- a/authz-client/pom.xml +++ b/authz-client/pom.xml @@ -54,6 +54,13 @@ /opt/app/aft/${project.artifactId}/${project.version} true 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -188,7 +195,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + diff --git a/authz-cmd/pom.xml b/authz-cmd/pom.xml index e1a14e27..4e25c765 100644 --- a/authz-cmd/pom.xml +++ b/authz-cmd/pom.xml @@ -55,6 +55,13 @@ false 21 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -163,8 +170,60 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} - + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + diff --git a/authz-core/pom.xml b/authz-core/pom.xml index 085110df..a1a7d593 100644 --- a/authz-core/pom.xml +++ b/authz-core/pom.xml @@ -52,6 +52,13 @@ 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -144,7 +151,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + diff --git a/authz-defOrg/pom.xml b/authz-defOrg/pom.xml index 6487aaa9..ee1c9417 100644 --- a/authz-defOrg/pom.xml +++ b/authz-defOrg/pom.xml @@ -55,6 +55,13 @@ false 0 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -92,7 +99,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + diff --git a/authz-fs/pom.xml b/authz-fs/pom.xml index bef84424..6ed46fd1 100644 --- a/authz-fs/pom.xml +++ b/authz-fs/pom.xml @@ -54,6 +54,13 @@ true 9 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -138,7 +145,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + diff --git a/authz-gui/pom.xml b/authz-gui/pom.xml index a513a31c..8a6121e0 100644 --- a/authz-gui/pom.xml +++ b/authz-gui/pom.xml @@ -178,34 +178,71 @@ - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + ${skip.staging.artifacts} + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - - + @@ -213,20 +250,4 @@ - - - ossrhdme - https://oss.sonatype.org/content/repositories/snapshots - - - ossrhdme - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - https://github.com/att/AAF.git - ${project.scm.connection} - http://github.com/att/AAF/tree/master - diff --git a/authz-gw/pom.xml b/authz-gw/pom.xml index 6b085f7c..e997dfde 100644 --- a/authz-gw/pom.xml +++ b/authz-gw/pom.xml @@ -54,6 +54,13 @@ true 30 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -133,8 +140,60 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} - + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + diff --git a/authz-service/pom.xml b/authz-service/pom.xml index 677d84db..609967f6 100644 --- a/authz-service/pom.xml +++ b/authz-service/pom.xml @@ -54,6 +54,13 @@ true 1 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -210,8 +217,60 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} - + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + diff --git a/authz-test/pom.xml b/authz-test/pom.xml index de326876..a7b326a3 100644 --- a/authz-test/pom.xml +++ b/authz-test/pom.xml @@ -56,6 +56,13 @@ false 0 1.0.0-SNAPSHOT + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -158,7 +165,7 @@ - + org.sonatype.plugins nexus-staging-maven-plugin 1.6.7 @@ -167,9 +174,60 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} - - + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + diff --git a/pom.xml b/pom.xml index 552017c5..95b93a9a 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,13 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT 3.1.200 + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -245,7 +252,59 @@ ${nexusproxy} 176c31dfe190a ecomp-staging + ${skip.staging.artifacts} + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + diff --git a/version.properties b/version.properties index e354de49..7bdcb459 100644 --- a/version.properties +++ b/version.properties @@ -1,13 +1,36 @@ -########################################################### -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -release_name=1 -sprint_number=1 -feature_revision=0 - -base_version=${release_name}.${sprint_number}.${feature_revision} - -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT +### +# ============LICENSE_START======================================================= +# ONAP AAF +# ================================================================================ +# Copyright (C) 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. +### + +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=1 +minor=0 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file