diff options
| -rw-r--r-- | dependencies-odl-bom/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 5 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 5 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 5 | ||||
| -rw-r--r-- | odlparent/karaf4-parent/pom.xml | 5 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 5 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 5 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 5 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 5 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 5 | ||||
| -rwxr-xr-x | oparent/pom.xml | 54 | ||||
| -rw-r--r-- | springboot/spring-boot-setup/src/main/resources/pom-template.xml | 4 | ||||
| -rw-r--r-- | springboot/springboot1/pom.xml | 4 | ||||
| -rw-r--r-- | springboot/springboot2/pom.xml | 4 |
14 files changed, 76 insertions, 37 deletions
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 3f4a8037..4f32630c 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -112,8 +112,8 @@ <groupId>org.glassfish.jersey</groupId> <artifactId>jersey-bom</artifactId> <version>2.27</version> - <scope>import</scope> <type>pom</type> + <scope>import</scope> </dependency> <dependency> <groupId>commons-cli</groupId> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 923a4080..d7c0f209 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 39b0f103..61c87daf 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 2b9fae4a..7062a854 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 4406bc75..086a0a1d 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 76fc561a..8c41b24e 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 0c4cec79..4b157521 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index cc4644fd..7c9cb071 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 35efbe54..fed8b410 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index cf94b502..bea9eb12 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -55,7 +55,6 @@ <!-- properties from oparent --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -66,6 +65,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -301,8 +301,8 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> @@ -363,7 +363,6 @@ <name>JCenter Repository</name> <url>http://jcenter.bintray.com</url> </pluginRepository> - <pluginRepository> <id>Restlet</id> <name>Restlet Repository</name> diff --git a/oparent/pom.xml b/oparent/pom.xml index 1713ea42..ae27b326 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -76,7 +76,6 @@ <sdc.tosca.version>1.6.5</sdc.tosca.version> <antlr.version>4.8-1</antlr.version> - </properties> <dependencyManagement> @@ -92,8 +91,8 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>2.3.8.RELEASE</version> - <scope>import</scope> <type>pom</type> + <scope>import</scope> </dependency> <dependency> <groupId>org.antlr</groupId> @@ -158,7 +157,7 @@ <repositories> <repository> <id>onap-public</id> - <url>https://nexus.onap.org/content/groups/public</url> + <url>${onap.nexus.public-url}</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> @@ -170,7 +169,7 @@ </repository> <repository> <id>onap-staging</id> - <url>https://nexus.onap.org/content/groups/staging</url> + <url>${onap.nexus.staging-url}</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> @@ -183,7 +182,7 @@ <repository> <id>ecomp-release</id> <name>onap-repository-releases</name> - <url>https://nexus.onap.org/content/repositories/releases</url> + <url>${onap.nexus.release-url}</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> @@ -195,7 +194,7 @@ <repository> <id>ecomp-snapshot</id> <name>onap-repository-snapshots</name> - <url>https://nexus.onap.org/content/repositories/snapshots</url> + <url>${onap.nexus.snapshot-url}</url> <releases> <enabled>false</enabled> </releases> @@ -204,6 +203,49 @@ </snapshots> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>onap-public</id> + <url>${onap.nexus.public-url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>onap-staging</id> + <url>${onap.nexus.staging-url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>onap-snapshot</id> + <url>${onap.nexus.snapshot-url}</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <!-- Black Duck plugin dependencies --> + <pluginRepository> + <id>JCenter</id> + <name>JCenter Repository</name> + <url>http://jcenter.bintray.com</url> + </pluginRepository> + <pluginRepository> + <id>Restlet</id> + <name>Restlet Repository</name> + <url>http://maven.restlet.com</url> + </pluginRepository> + </pluginRepositories> <build> <pluginManagement> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml index c87e8653..3c0373bc 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -28,6 +28,7 @@ <system>JIRA</system> <url>https://jira.onap.org/</url> </issueManagement> + <distributionManagement> <repository> <id>ecomp-releases</id> @@ -57,7 +58,6 @@ <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version}</sitePath> @@ -68,6 +68,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -238,6 +239,7 @@ </snapshots> </repository> </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index d3c9a413..d3ad2bce 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -28,6 +28,7 @@ <system>JIRA</system> <url>https://jira.onap.org/</url> </issueManagement> + <distributionManagement> <repository> <id>ecomp-releases</id> @@ -57,7 +58,6 @@ <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -68,6 +68,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -238,6 +239,7 @@ </snapshots> </repository> </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 11b3d09e..eb6e5e5a 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -28,6 +28,7 @@ <system>JIRA</system> <url>https://jira.onap.org/</url> </issueManagement> + <distributionManagement> <repository> <id>ecomp-releases</id> @@ -57,7 +58,6 @@ <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- sitePath may be overridden in the inheriting POM if desired --> <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> @@ -68,6 +68,7 @@ <!-- end of properties from oparent --> <!-- ONAP repositories --> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.host>nexus.onap.org</onap.nexus.host> <onap.nexus.port>443</onap.nexus.port> <onap.nexus.protocol>https</onap.nexus.protocol> @@ -238,6 +239,7 @@ </snapshots> </repository> </repositories> + <pluginRepositories> <pluginRepository> <id>onap-public</id> |