From 53a21834ccd5925b806c245650ee3aa9a94f9fbf Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 24 Sep 2021 08:53:11 -0400 Subject: [PATCH] Roll versions for Jakarta release Roll versions in master branch for use in Jakarta release Issue-ID: SDNC-1611 Signed-off-by: Dan Timoney Change-Id: Ie3e9bd9728359278ec631047fcdc48ddcc5aaea7 Former-commit-id: 54d26a0fdd15cb78879043e4dd79f7626feb99a8 --- SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- data-migrator/pom.xml | 2 +- installation/ansible-server/pom.xml | 2 +- .../ansible-server/src/main/dc/docker-compose.yaml | 52 ++++++++++++++++++++++ installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 24 +++++----- version.properties | 4 +- 23 files changed, 86 insertions(+), 34 deletions(-) create mode 100644 installation/ansible-server/src/main/dc/docker-compose.yaml diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index e12759cd..666dbc7f 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.2.1 + 2.3.0-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index 67367831..5c3bb19d 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.2.1 + 2.3.0-SNAPSHOT diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 073aad35..3e235abd 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.2.1 + 2.3.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml index 8eaba23f..69b3e43f 100644 --- a/data-migrator/pom.xml +++ b/data-migrator/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT data-migrator diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 6bfbbeb3..a76bf357 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT installation-ansible-server diff --git a/installation/ansible-server/src/main/dc/docker-compose.yaml b/installation/ansible-server/src/main/dc/docker-compose.yaml new file mode 100644 index 00000000..371aabde --- /dev/null +++ b/installation/ansible-server/src/main/dc/docker-compose.yaml @@ -0,0 +1,52 @@ +version: '2.1' + +networks: + default: + driver: bridge + driver_opts: + com.docker.network.driver.mtu: ${MTU} + + +services: + + db: + image: mariadb:10.5 + container_name: sdnc_db_container + ports: + - "23306:3306" + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_ROOT_HOST=% + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + ansible: + image: onap/sdnc-ansible-server-image:latest + depends_on : + - db + container_name: sdnc_ansible_container + entrypoint: ["/opt/ansible-server/startAnsibleServer.sh"] + ports: + - "8000" + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - ANSIBLE_TRUSTSTORE_PASSWORD=${ANSIBLE_TRUSTSTORE_PASSWORD} + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 8e490a00..4dad6354 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index 4d6b57d3..fa6062b3 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index b3a935bf..8817c936 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index fd45b007..11118491 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 2ccbde80..60641de7 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index bdcb95b5..018fe2c9 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index b3155499..95b0e6e8 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 6b97c7a0..ffba78bf 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index d1259096..8e0a03e9 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 657dd185..893fe3ba 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index d7660afb..85d9ec72 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 9a049b46..a054e88a 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index f27b12f0..3dca238b 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index afe6e800..0b62d169 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 479855cb..66924b8e 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index a4f0d54d..a9c6a03b 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.2.1 + 2.3.0-SNAPSHOT org.onap.sdnc.oam sdnc-oam - 2.2.1-SNAPSHOT + 2.3.0-SNAPSHOT pom sdnc-oam @@ -25,17 +25,17 @@ ${project.version} - 1.2.1 - 2.2.0 - 1.2.1 - 1.3.1 - 1.2.3 - 1.3.1 + 1.3.0-SNAPSHOT + 2.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT + 1.3.0-SNAPSHOT + ${ccsdk.sli.version} - 1.2-STAGING-latest - 1.2-SNAPSHOT-latest - 1.2-STAGING-latest - 1.2-STAGING-latest + 1.3-STAGING-latest + 1.3-SNAPSHOT-latest + 1.3-STAGING-latest + 1.3-STAGING-latest diff --git a/version.properties b/version.properties index 1891b1f2..9bbfe902 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=2 -sprint_number=2 -feature_revision=1 +sprint_number=3 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6