X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b0c8c360f81d47d8fb0d9065051afd5cf6dcd9de;hb=5cf2360d30f580432f8feb45dbb7f0430f553c56;hp=c4bba322a2a78d2ea9adf550354af81792931892;hpb=72e56e4fbd913f133151cb52998687eabd6dfbcb;p=sdc.git diff --git a/pom.xml b/pom.xml index c4bba322a2..b0c8c360f8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,33 +4,9 @@ org.openecomp.sdc sdc-main - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT pom - - - - - security-utils - common-app-api - common-be - catalog-dao - catalog-model - catalog-be - asdctool - catalog-ui - catalog-fe - asdc-tests - ui-ci - - openecomp-be - openecomp-ui - - sdc-os-chef - - - - - + sdc @@ -38,77 +14,7 @@ -SNAPSHOT UTF-8 - - - - - - - 1610 - 0 - 2 - 33 - ${project.version} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${catalog-be.major.version}.${catalog-be.minor.version}.${catalog-be.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${catalog-fe.major.version}.${catalog-fe.minor.version}.${catalog-fe.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${catalog-ci.major.version}.${catalog-ci.minor.version}.${catalog-ci.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${catalog-ui.major.version}.${catalog-ui.minor.version}.${catalog-ui.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${catalog-model.major.version}.${catalog-model.minor.version}.${catalog-model.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${asdc-chef.major.version}.${asdc-chef.minor.version}.${asdc-chef.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${sdnc-tests.major.version}.${sdnc-tests.minor.version}.${sdnc-tests.servicepack.version}${build.type} - - - ${asdc.major.version} - ${asdc.minor.version} - ${asdc.servicepack.version} - ${asdc-tests.major.version}.${asdc-tests.minor.version}.${asdc-tests.servicepack.version}${build.type} - - - - ${asdc.full.version} - ${asdc.full.version} - ${asdc.full.version} - ${asdc.full.version} - ${asdc.full.version} - ${asdc.full.version} - ${asdc.full.version} - ${asdc.full.version} - + 74 3.3.2 @@ -118,56 +24,81 @@ 4.3.4.RELEASE 3.2.3.RELEASE 2.0.1.RELEASE - 1.9.0 - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT + 2.24 + 2.5 + + ${project.version} + ${project.version} + 1.1.0 + ${project.version} - 2.1.0 - 1.0.4 - 1.0.0-SM19 - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT 9.2.10.v20150310 2.6.2 + 2.8.1 2.6.0 - 1.12 - 4.2 + 1.14 + 4.4 4.4.1 4.4.1 1.1 - 9.2.10.v20150310 + + 1.1.2 + 1.7.10 + 1.10 + 1.2 2.3.5 3.0.6 + 0.20.1 1.8.4 + 1.7.4 0.13.2 + 1.6.4 + 3.0.3 + + 1.9.2 + + + 2.3.1 + + + 1.1 + + 1.10.19 + 4.12 + 6.9.10 + 3.0.3 + + + 1.1.32 + jacoco ${project.basedir}/target/jacoco.exec ${project.basedir}/target/it-jacoco.exec - - ${asdc.major.version} + java + ${project.version} 3.0.0 - + + nexus + nexus ${project.build.sourceEncoding} true @@ -176,10 +107,14 @@ **/scripts/**/* **/test/**/*,**/tests/**/* app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java + ${project.version} - https://nexus.openecomp.org + https://nexus.onap.org + /content/sites/site/org/openecomp/sdc/${project.version} 176c31dfe190a + + yyyyMMdd'T'HHmm @@ -187,7 +122,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.0.0-M1 false org.umlgraph.doclet.UmlGraphDoc @@ -203,361 +138,6 @@ - - - - - org.codehaus.mojo - wagon-maven-plugin - 1.0 - - - - org.codehaus.mojo - exec-maven-plugin - 1.4.0 - - - - com.google.guava - guava - ${guava.version} - - - - org.apache.commons - commons-lang3 - ${lang3.version} - - - - org.elasticsearch - elasticsearch - ${elastic-search.version} - - - - org.eclipse.jetty - jetty-maven-plugin - 9.2.10.v20150310 - - - - org.eclipse.jetty - jetty-servlet - 9.2.10.v20150310 - - - - org.eclipse.jetty - jetty-webapp - 9.2.10.v20150310 - - - - org.glassfish.jersey - jersey-bom - 2.24 - pom - import - - - - org.slf4j - slf4j-api - 1.7.10 - - - - javax.servlet - servlet-api - 2.5 - provided - - - - org.glassfish.jersey.containers - jersey-container-servlet - 2.24 - provided - - - - org.glassfish.jersey.media - jersey-media-json-jackson - 2.24 - compile - - - - org.glassfish.jersey.media - jersey-media-moxy - 2.24 - compile - - - - - org.yaml - snakeyaml - 1.14 - provided - - - - - org.apache.commons - commons-jci-core - 1.1 - provided - - - - - com.google.code.gson - gson - 2.3.1 - provided - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - provided - - - - org.apache.httpcomponents - httpmime - ${httpclient.version} - provided - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - provided - - - - ch.qos.logback - logback-classic - 1.1.2 - provided - - - - ch.qos.logback - logback-core - 1.1.2 - provided - - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - provided - - - - org.codehaus.janino - janino - ${janino.version} - provided - - - - commons-logging - commons-logging - 1.2.1-SNAPSHOT - provided - - - - commons-codec - commons-codec - 2.0-SNAPSHOT - provided - - - - junit - junit - 4.12 - test - - - - org.testng - testng - 6.9.10 - test - - - com.relevantcodes - extentreports - 2.41.0 - - - - org.mockito - mockito-all - 1.10.19 - provided - - - - com.googlecode.json-simple - json-simple - ${json-simple.version} - provided - - - - org.springframework - spring-core - ${spring.version} - provided - - - - org.springframework - spring-beans - ${spring.version} - provided - - - - org.springframework - spring-context - ${spring.version} - provided - - - - org.springframework - spring-context-support - ${spring.version} - provided - - - - org.springframework - spring-messaging - ${spring.version} - provided - - - - org.springframework - spring-web - ${spring.version} - provided - - - - org.springframework - spring-webmvc - ${spring.version} - provided - - - - org.springframework - spring-aop - ${spring.version} - provided - - - - org.springframework - spring-aspects - ${spring.version} - provided - - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-expression - ${spring.version} - test - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annotations.version} - provided - - - - - org.functionaljava - functionaljava - ${functionaljava.version} - provided - - - - - com.jcabi - jcabi-aspects - ${jcabi.version} - provided - - - org.aspectj - aspectjrt - ${aspectjrt.version} - provided - - - - - org.fusesource - sigar - ${sigar.version} - - - - - - - - @@ -575,15 +155,6 @@ - - io.wcm.maven.plugins - nodejs-maven-plugin - - 4.3.0 - 7.5.0 - /tmp/nodejs - - org.apache.maven.plugins @@ -606,6 +177,19 @@ + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexus.proxy} + ${staging.profile.id} + ecomp-staging + + + maven-surefire-plugin 2.19.1 @@ -615,10 +199,22 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + - - org.apache.maven.plugins maven-compiler-plugin @@ -630,17 +226,13 @@ - - org.jacoco jacoco-maven-plugin 0.7.1.201405082137 True - - prepare-agent @@ -651,8 +243,6 @@ ${sonar.jacoco.reportPath} - - report @@ -677,12 +267,20 @@ + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + - - - - org.codehaus.gmaven gmaven-plugin @@ -709,19 +307,6 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexus.proxy} - ${staging.profile.id} - ecomp-staging - - - org.codehaus.mojo @@ -734,7 +319,8 @@ ================================================================================ apache_v2 2017 - AT&T Intellectual Property. All rights reserved. + AT&T Intellectual Property. All rights + reserved. SDC true true @@ -743,15 +329,20 @@ false **/*.java - **/*.js **/*.ts + + **/*.d.ts + src app server-mock typings + + java + @@ -759,98 +350,121 @@ update-file-header - + - - - - - - - - - - - virtuos - Virtuos - http://nexus.virtuos.uos.de/nexus/content/repositories/public/ - default - - - apache-public - Apache-Public - https://repository.apache.org/content/groups/public/ - default - - - elasticsearch-releases - https://maven.elasticsearch.org/releases - - true - - - false - - - - central - Official Maven repository - http://repo2.maven.org/maven2/ - - - ecomp-releases - Release Repository - ${nexus.proxy}/content/repositories/releases/ - - - ecomp-staging - Staging Repository - ${nexus.proxy}/content/repositories/staging/ - - - ecomp-snapshots - Snapshots Repository - ${nexus.proxy}/content/repositories/snapshots/ - - - node - Node - https://maven-nodejs-proxy.pvtool.org/ - - - - - - - ecomp-releases - Release Repository - ${nexus.proxy}/content/repositories/releases/ - - - ecomp-snapshots - Snapshot Repository - ${nexus.proxy}/content/repositories/snapshots/ - - - - + + + + + + all + + true + + + build-tools + onboarding + security-utils + common-app-api + common-be + catalog-dao + catalog-model + catalog-be + asdctool + catalog-ui + catalog-fe + asdc-tests + test-apis-ci + ui-ci + sdc-os-chef + + + + + + catalog + + false + + + security-utils + common-app-api + common-be + catalog-dao + catalog-model + catalog-be + asdctool + catalog-ui + catalog-fe + asdc-tests + test-apis-ci + ui-ci + + + + 1.2.7 + 1710.0.0 + 1710.0.0 + 1710.0.0 + 1.1.32 + + + + + onboarding + + false + + + build-tools + onboarding + + + + + + + + ecomp-releases + Release Repository + ${nexus.proxy}/content/repositories/releases/ + + + ecomp-staging + Staging Repository + ${nexus.proxy}/content/repositories/staging/ + + + ecomp-snapshots + Snapshots Repository + ${nexus.proxy}/content/repositories/snapshots/ + + + ecomp-public + Public Repository + ${nexus.proxy}/content/repositories/public/ + + + + + + + + ecomp-releases + Release Repository + ${nexus.proxy}/content/repositories/releases/ + + + ecomp-snapshots + Snapshot Repository + ${nexus.proxy}/content/repositories/snapshots/ + + + ecomp-site + dav:${nexus.proxy}${sitePath} + + +