X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=1f61700bd7323231b6956508b47c6ba38db6a2b6;hb=eaea5ad06aa510cbf36bb95c920932ab6de0e6de;hp=b853ccf30d58ad7f88d7a83e20fce9996f519994;hpb=1736336840125ff2c1aef00c7d55b1471e380cb7;p=clamp.git diff --git a/pom.xml b/pom.xml index b853ccf3..1f61700b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,38 +1,78 @@ + + 4.0.0 org.onap.clamp clds - 1.0.0-SNAPSHOT - ONAP CLAMP - - - org.onap.oparent - oparent - 1.0.0-SNAPSHOT - - + 1.1.0 + clamp + + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + + + This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code. + + By Default "mvn clean install" command will execute also the unit tests + and the integration tests. The integration tests require a docker engine running. + + If you want to skip the intergation test you can by doing: + "mvn clean install -DskipITs=true" + + For Spring it's possible to specify the application.properties location + "mvn clean install -Dspring.config.location=classpath:application-test.properties" + + The application.properties contains the location of the CLAMP parameters files: + - org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties + - org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties + - org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json + - org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties + + + + yyyy.MM.dd'T'hh.mm.ss'Z' + ${project.version} + ${maven.build.timestamp} 1.8 1.8 UTF-8 - 3306 + UTF-8 + + 3306 0.0.3-oss git-server - ${basedir}/target/classes/META-INF/resources/icd - service.json - org.onap.clamp.clds.service.rs 1.8 - local - ajsc-svc-account - com.att.ajsc - 2.2.11 6.1.0.6-oss 6.2.0.6-oss 6.1.0.3-oss - UTF-8 - UTF-8 + java jacoco ${project.build.directory}/surefire-reports @@ -43,31 +83,24 @@ localhost:5000 true - true true false - - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/clamp/${project.version} ecomp-releases Clamp Release Repository - ${nexusproxy}/${releaseNexusPath} + https://nexus.onap.org/content/repositories/releases/ ecomp-snapshots Clamp Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} + https://nexus.onap.org/content/repositories/snapshots/ ecomp-site - dav:${nexusproxy}${sitePath} + dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version} @@ -77,32 +110,26 @@ Maven 2 repository 2 http://repo2.maven.org/maven2/ - - JBOSS - JBoss Repository - http://repository.jboss.org/nexus/content/groups/public-jboss/ - - - jboss-deprecated-repository - JBoss Deprecated Maven Repository - https://repository.jboss.org/nexus/content/repositories/deprecated/ - ecomp-releases ONAP Release Repository - ${nexusproxy}/${releaseNexusPath} + https://nexus.onap.org/content/repositories/releases/ ecomp-staging ONAP Staging Repository - ${nexusproxy}/${stagingNexusPath} + https://nexus.onap.org/content/repositories/staging/ ecomp-snapshots ONAP Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - true - false + https://nexus.onap.org/content/repositories/snapshots/ + + true + + + false + spring-repo @@ -110,31 +137,12 @@ https://artifacts.alfresco.com/nexus/content/repositories/public/ - soapUI - http://www.soapui.org/repository/maven2/ - SoapUI plugin + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public - - This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code. - - By Default "mvn clean install" command will execute also the unit tests - and the integration tests. The integration tests require a docker engine running. - - If you want to skip the intergation test you can by doing: - "mvn clean install -DskipITs=true" - - For Spring it's possible to specify the application.properties location - "mvn clean install -Dspring.config.location=classpath:application-test.properties" - - The application.properties contains the location of the CLAMP parameters files: - clds-policy-config.properties and clds-reference.properties - - The licenses and headers can be generated by using this maven command: - mvn license:update-file-header license:update-project-license - - @@ -149,11 +157,26 @@ - - org.apache.commons - commons-vfs2 - 2.0 - + + + com.googlecode.json-simple + json-simple + 1.1 + + + org.apache.commons + commons-vfs2 + 2.0 + + + + org.springframework.security + spring-security-test + + test + + + com.att.ajsc @@ -170,9 +193,9 @@ spring-boot-starter-actuator - org.springframework.boot - spring-boot-starter-security - + org.springframework.boot + spring-boot-starter-security + org.springframework.boot spring-boot-starter-test @@ -287,11 +310,18 @@ swagger-annotations 1.5.8 + com.att.ajsc sdk-java-camunda-core ${sdk.camunda.core} + + + mysql + mysql-connector-java + + @@ -318,7 +348,7 @@ org.onap.policy.engine PolicyEngineAPI - 1.1.0-SNAPSHOT + 1.1.0 log4j @@ -332,11 +362,38 @@ apache-log4j-extras log4j + + jackson-databind + com.fasterxml.jackson.core + + + mysql + mysql-connector-java + org.onap.policy.common ONAP-Logging + 1.1.0 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + apache-log4j-extras + log4j + + + + + org.onap.policy.engine + ControlloopPolicy 1.1.0-SNAPSHOT @@ -354,29 +411,13 @@ - org.onap.policy.engine - ControlloopPolicy - 1.1.0-SNAPSHOT - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - - + com.fasterxml.jackson.core + jackson-databind + 2.6.3 + com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.6.3 @@ -400,43 +441,38 @@ 2.1.7 + + + org.mariadb.jdbc + mariadb-java-client + 2.1.1 + + clamp + - - src/test/resources - - **/* - - true - - - - - src/main/resources + + src/test/resources + + **/*.jks + true - - - target/generated-sources/license + + + src/test/resources/https - third-party-licenses.txt + **.jks - - - target/generated-resources/licenses - - *.* - - third-party-licenses - + false + https + + + - ${project.basedir}/etc - ${project.build.directory}/etc + src/main/resources true - - **/* - src/main/docker @@ -445,124 +481,95 @@ true - - src/main/doxygen - - **/* - - true - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - ${projectTag} - ${scm.commit.message} - - - - com.github.kongchen - swagger-maven-plugin - 3.1.3 - - - - ${icd.package} - / - - ${project.artifactId} Service - ${project.version} - - ${swagger.directory} - - - - - - compile - - generate - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - com.github.kongchen - swagger-maven-plugin - 3.1.3 - - generate - - - - - - - - - - - - + - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - jar-with-only-classes - package - - jar - - - classes - - META-INF/resources/designer/** - META-INF/resources/icd/** - META-INF/resources/index.html - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - - attach-artifact - - package - - - - ${project.build.directory}/clds-${project.version}-classes.jar - jar - classes - - - - - - + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${project.basedir}/src/main/script/TagVersion.groovy + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + jar-with-only-classes + package + + jar + + + classes + + org/** + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.5 + + + compile + + generate + + + + + + org.onap.clamp.clds.service + + / + + ${project.artifactId} Service + ${project.version} + + ${project.build.directory}/classes/META-INF/resources/icd + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + + attach-artifact + + package + + + + ${project.build.directory}/clamp-classes.jar + jar + classes + + + + + + org.springframework.boot @@ -577,16 +584,6 @@ - - maven-release-plugin - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9 - - - org.apache.maven.plugins maven-gpg-plugin @@ -610,48 +607,24 @@ 1.6.7 true - ossrhajsc - https://oss.sonatype.org/ - true + https://nexus.onap.org + 176c31dfe190a + ecomp-staging ${skip.staging.artifacts} - - com.github.kongchen - swagger-maven-plugin - - - - org.onap.clamp.clds.service.rs - //rest - - ${project.artifactId} Service - ${project.version} - - ${swagger.directory} - - - - - - compile - - generate - - - - com.spotify docker-maven-plugin - 0.4.11 + 1.0.0 - ${docker.push.registry}/onap/clamp + onap/clamp src/main/docker docker-hub - ${project.version} latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} true @@ -665,6 +638,11 @@ ${project.build.directory} etc/config/** + + / + ${project.build.directory} + etc/keystore/** + @@ -682,6 +660,53 @@ + + + tag-image-latest-timestamp + package + + tag + + + onap/clamp + ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version} + ${skip.docker.push} + + + + push-image-latest-timestamp + deploy + + push + + + ${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version} + ${skip.docker.push} + + + + tag-image-latest + package + + tag + + + onap/clamp + ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version} + ${skip.docker.push} + + + + push-image-latest + deploy + + push + + + ${docker.push.registry}/onap/clamp:${project.docker.latesttag.version} + ${skip.docker.push} + + tag-image package @@ -690,9 +715,8 @@ onap/clamp - ${docker.push.registry}/onap/clamp - true - ${skip.docker.tag} + ${docker.push.registry}/onap/clamp:latest + ${skip.docker.push} @@ -702,6 +726,7 @@ push + ${docker.push.registry}/onap/clamp:latest ${skip.docker.push} @@ -724,6 +749,7 @@ + integration-tests integration-test verify @@ -760,7 +786,7 @@ socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution - + ${docker.mariadb.port.host}:3306 @@ -806,7 +832,7 @@ - jacoco-unit-tests + pre-unit-test prepare-agent @@ -816,7 +842,7 @@ - jacoco-integration-tests + pre-integration-test pre-integration-test prepare-agent @@ -826,45 +852,26 @@ + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + - - - org.codehaus.mojo - license-maven-plugin - 1.12 - - false - ONAP CLAMP - true - true - true - - ============LICENSE_START======================================================= - - ================================================================================ - AT&T Intellectual Property. All rights - reserved. - 2017 - true - - clamp_apache_v2 - ${project.baseUri}/src/licenses - - - **/*.properties - **/icd/** - **/designer/lib/** - **/*.json - **/*.yaml - **/*.yml - **/licenses/** - - - - - org.codehaus.mojo @@ -879,6 +886,8 @@ true false + false + false