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, 77 insertions, 36 deletions
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 5824f1fe..a07e4edd 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 7da4b8bf..5dc96956 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 03843e3b..c7d693e0 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 f7cdca6d..6c1521f4 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 c0fa7f09..e0ad2643 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 8d6e1a87..ed1f1790 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 c301aca1..45e3d268 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 d5602274..325e174b 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 c67c52e5..fef5c962 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 d00b4d49..a76c931a 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 83d233ee..75f1fac0 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -75,6 +75,7 @@ <sdc.client.version>1.4.1</sdc.client.version> <sdc.tosca.version>1.6.5</sdc.tosca.version> + <antlr.version>4.8-1</antlr.version> </properties> <dependencyManagement> @@ -90,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> @@ -152,7 +153,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> @@ -164,7 +165,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> @@ -177,7 +178,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> @@ -189,7 +190,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> @@ -198,6 +199,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 a0d89162..6bfaa9cf 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 93d85fb2..bf1dcbfe 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 79d2e51d..9620486a 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> |