diff options
author | Dan Timoney <dtimoney@att.com> | 2022-08-04 15:45:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2022-08-04 15:45:13 +0000 |
commit | 998298597c46ebc4027b3de9c42625e6a7715d6a (patch) | |
tree | 43ba7abe3fd5e3df0d4a7f698f8289e602acc392 | |
parent | 7e70156de2c31e2fc8e90a8f22905e7febba5af7 (diff) | |
parent | 1c6dd26b168d5619de5fbfc4d60051e43f603247 (diff) |
Merge "Release ODL Sulfur (v2.4.1) parent poms"
-rw-r--r-- | dependencies-bom/pom.xml | 2 | ||||
-rw-r--r-- | dependencies-odl-bom/pom.xml | 2 | ||||
-rw-r--r-- | installed-odl-bom/pom.xml | 2 | ||||
-rw-r--r-- | odlparent/binding-parent/pom.xml | 6 | ||||
-rw-r--r-- | odlparent/bundle-parent/pom.xml | 6 | ||||
-rw-r--r-- | odlparent/client-parent/pom.xml | 2 | ||||
-rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 6 | ||||
-rw-r--r-- | odlparent/karaf4-parent/pom.xml | 6 | ||||
-rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 6 | ||||
-rw-r--r-- | odlparent/odlparent-lite/pom.xml | 6 | ||||
-rw-r--r-- | odlparent/odlparent/pom.xml | 6 | ||||
-rwxr-xr-x | odlparent/pom.xml | 4 | ||||
-rwxr-xr-x | odlparent/setup/pom.xml | 4 | ||||
-rw-r--r-- | odlparent/single-feature-parent/pom.xml | 6 | ||||
-rwxr-xr-x | oparent/pom.xml | 4 | ||||
-rwxr-xr-x | pom.xml | 2 | ||||
-rw-r--r-- | releases/2.4.1.yaml | 5 | ||||
-rwxr-xr-x | springboot/pom.xml | 4 | ||||
-rw-r--r-- | springboot/spring-boot-setup/pom.xml | 4 | ||||
-rw-r--r-- | springboot/springboot1/pom.xml | 4 | ||||
-rw-r--r-- | springboot/springboot23/pom.xml | 4 | ||||
-rw-r--r-- | springboot/springboot25/pom.xml | 4 | ||||
-rw-r--r-- | springboot/springboot26/pom.xml | 4 | ||||
-rwxr-xr-x | standalone/pom.xml | 2 | ||||
-rw-r--r-- | version.properties | 2 |
25 files changed, 54 insertions, 49 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index ead7d84e..67c19361 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 0673e4bc..628bb660 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index a701a97e..7ac6e35f 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>installed-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <distributionManagement> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index a217d3b4..ffba59ae 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index a4a67f61..1c92a822 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>bundle-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index e3f8c66c..1711edf8 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>client-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index cc41fd71..576c9ea1 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index fa818905..403eee47 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>karaf4-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-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 03ec9d35..df1d76fe 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>mdsal-it-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index eb4a0311..2cb217f0 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 83e3d57c..c0af0509 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 2ed664e6..8e628dec 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 2188b668..48346cc3 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-aggregator</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>setup</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 6834e096..7788d755 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -196,14 +196,14 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/oparent/pom.xml b/oparent/pom.xml index 27f62edd..645fdcf7 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -97,7 +97,7 @@ otherwise ccsdk/distribution/dependencies is not resolving correctly --> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/releases/2.4.1.yaml b/releases/2.4.1.yaml new file mode 100644 index 00000000..3e4185f3 --- /dev/null +++ b/releases/2.4.1.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '2.4.1' +project: 'ccsdk-parent' +log_dir: 'ccsdk-parent-maven-stage-master/204/' diff --git a/springboot/pom.xml b/springboot/pom.xml index f8272a8c..de3cb192 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index 9b803ed9..18de4a8a 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-setup</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 5598716d..ffc65e43 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -150,7 +150,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot23/pom.xml b/springboot/springboot23/pom.xml index d2425168..ba0bb3c3 100644 --- a/springboot/springboot23/pom.xml +++ b/springboot/springboot23/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -150,7 +150,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index 7201b241..90bf6bd5 100644 --- a/springboot/springboot25/pom.xml +++ b/springboot/springboot25/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-25-starter-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -147,7 +147,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml index 4aa44396..6b83497f 100644 --- a/springboot/springboot26/pom.xml +++ b/springboot/springboot26/pom.xml @@ -14,7 +14,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-26-starter-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> @@ -147,7 +147,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-bom</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/standalone/pom.xml b/standalone/pom.xml index a28015a4..8759e01d 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/version.properties b/version.properties index 677c00a9..d8440018 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=2 sprint_number=4 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} |