diff options
| -rw-r--r-- | dependencies-bom/pom.xml | 2 | ||||
| -rw-r--r-- | dependencies-odl-bom/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 28 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 28 | ||||
| -rw-r--r-- | odlparent/client-parent/pom.xml | 29 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 28 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 28 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 28 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 28 | ||||
| -rwxr-xr-x | odlparent/pom.xml | 4 | ||||
| -rwxr-xr-x | odlparent/setup/pom.xml | 4 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 24 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 28 | ||||
| -rwxr-xr-x | pom.xml | 28 | ||||
| -rwxr-xr-x | springboot/pom.xml | 4 | ||||
| -rwxr-xr-x | springboot/springboot1/pom.xml | 28 | ||||
| -rwxr-xr-x | springboot/springboot2/pom.xml | 28 | ||||
| -rwxr-xr-x | standalone/pom.xml | 395 | ||||
| -rw-r--r-- | version.properties | 2 |
19 files changed, 248 insertions, 498 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 1ef2faf9..1b50df61 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -7,7 +7,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <distributionManagement> <repository> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 6be92992..3cf788d8 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -7,7 +7,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.odlparent</groupId> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 30c9ab2d..c48d9dcb 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.mdsal</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index dda8a6f9..a8996246 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>bundle-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.odlparent</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 2304952e..b9de9164 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -6,7 +6,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>client-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> <url>http://wiki.onap.org</url> @@ -341,32 +341,7 @@ <url>https://nexus.onap.org/content/repositories/snapshots</url> </snapshotRepository> </distributionManagement> - - <profiles> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <build> <pluginManagement> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 513081db..bca3619b 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.odlparent</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index fae7c4f4..a47bff8e 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>mdsal-it-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.controller</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index c3be3cbd..3bc836f5 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.odlparent</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 076258bc..145729c1 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.odlparent</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 94301b74..9b59aee3 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index d28f0517..bb500277 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -8,12 +8,12 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>setup</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index cbd808d2..8c18ee2c 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 76d7a58f..d3b98f6c 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.opendaylight.odlparent</groupId> @@ -449,29 +449,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://nexus.onap.org</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> <id>yang-compile</id> <activation> @@ -537,7 +515,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -8,7 +8,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> <properties> @@ -28,32 +28,6 @@ </snapshotRepository> </distributionManagement> - <profiles> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <build> <plugins> <plugin> diff --git a/springboot/pom.xml b/springboot/pom.xml index 606f23fc..aaf982b5 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index d86bb535..bc97b27a 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -6,7 +6,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.springframework.boot</groupId> @@ -332,30 +332,6 @@ </profile> <!-- End of profiles from ONAP oparent --> - - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> @@ -365,7 +341,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 1bc6a497..62ba02b2 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -6,7 +6,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <parent> <groupId>org.springframework.boot</groupId> @@ -346,29 +346,7 @@ </profile> <!-- End of profiles from ONAP oparent --> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> + </profiles> @@ -378,7 +356,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/standalone/pom.xml b/standalone/pom.xml index 1e68cdb6..107918e6 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -1,189 +1,212 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>standalone-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> - - - <url>http://wiki.onap.org</url> - <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> - <description>Root POM to be used in place of oparent for CCSDK based projects</description> - - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> - </parent> - - <issueManagement> - <system>JIRA</system> - <url>https://jira.onap.org/</url> - </issueManagement> - - <properties> - - - <!-- 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> - <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url> - <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url> - <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url> - <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url> - <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> - <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - - - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> - <bundle.plugin.version>2.5.0</bundle.plugin.version> - <checkstyle.skip>true</checkstyle.skip> - - - <sonar.language>java</sonar.language> - <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> - <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> - <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero> - <sonar.projectVersion>${project.version}</sonar.projectVersion> - - - - <mariadb.connector.version>2.1.1</mariadb.connector.version> - <fasterxml.jackson.version>2.9.8</fasterxml.jackson.version> - <velocity.version>2.0</velocity.version> - - <dmaap.listener.version>1.1.5</dmaap.listener.version> - <sdc.client.version>1.3.0</sdc.client.version> - <sdc.tosca.version>1.5.0</sdc.tosca.version> - - - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.sdc.sdc-distribution-client</groupId> - <artifactId>sdc-distribution-client</artifactId> - <version>${sdc.client.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.onap.sdc.sdc-tosca</groupId> - <artifactId>sdc-tosca</artifactId> - <version>${sdc.tosca.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> - <artifactId>dmaapClient</artifactId> - <version>${dmaap.listener.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.21</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>2.11.2</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> - <version>${velocity.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.11</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.2.3</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - - - <profiles> - <profile> - <id>nexus-staging</id> - <activation> - <property> - <name>!altDeploymentRepository</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>2.5</version> - <configuration> - <processAllModules>true</processAllModules> - </configuration> - </plugin> - </plugins> - </build> - <organization> - <name>ONAP</name> - </organization> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>standalone-parent</artifactId> + <version>1.3.1-SNAPSHOT</version> + + + <url>http://wiki.onap.org</url> + <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> + <description>Root POM to be used in place of oparent for CCSDK based projects</description> + + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> + </parent> + + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> + + <properties> + + + <!-- 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> + <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url> + <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url> + <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url> + <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url> + <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> + <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> + + + <java.version.source>1.8</java.version.source> + <java.version.target>1.8</java.version.target> + <bundle.plugin.version>2.5.0</bundle.plugin.version> + <checkstyle.skip>true</checkstyle.skip> + + + <sonar.language>java</sonar.language> + <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> + <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> + <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero> + <sonar.projectVersion>${project.version}</sonar.projectVersion> + + + + <mariadb.connector.version>2.1.1</mariadb.connector.version> + <fasterxml.jackson.version>2.9.8</fasterxml.jackson.version> + <velocity.version>2.0</velocity.version> + + <dmaap.listener.version>1.1.5</dmaap.listener.version> + <sdc.client.version>1.3.0</sdc.client.version> + <sdc.tosca.version>1.5.0</sdc.tosca.version> + + + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.sdc.sdc-distribution-client</groupId> + <artifactId>sdc-distribution-client</artifactId> + <version>${sdc.client.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>sdc-tosca</artifactId> + <version>${sdc.tosca.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> + <artifactId>dmaapClient</artifactId> + <version>${dmaap.listener.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.21</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.11.2</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-engine-core</artifactId> + <version>${velocity.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.11</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ch.vorburger.mariaDB4j</groupId> + <artifactId>mariaDB4j</artifactId> + <version>2.2.3</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <repositories> + <repository> + <id>onap-public</id> + <url>https://nexus.onap.org/content/groups/public</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + <repository> + <id>onap-staging</id> + <url>https://nexus.onap.org/content/groups/staging</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + <repository> + <id>ecomp-release</id> + <name>onap-repository-releases</name> + <url>https://nexus.onap.org/content/repositories/releases</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>ecomp-snapshot</id> + <name>onap-repository-snapshots</name> + <url>https://nexus.onap.org/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>2.5</version> + <configuration> + <processAllModules>true</processAllModules> + </configuration> + </plugin> + </plugins> + </build> + <organization> + <name>ONAP</name> + </organization> </project> diff --git a/version.properties b/version.properties index 8e5be7b0..beacb7c7 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=3 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |