diff options
| author |   xg353y <xg353y@intl.att.com> | 2017-04-11 13:30:42 +0200 |
|---|---|---|
| committer | xg353y <xg353y@intl.att.com> | 2017-04-11 15:34:19 +0200 |
| commit | b6b7bef8bdcad15af01ac88a038dd763ce59f68f (patch) | |
| tree | 399d39da23aaa37701e487df064e3e0c27709ef3 /packages/docker | |
| parent | 19340cad94eeaa1b580f7c0c99531de499e8ca14 (diff) | |
[MSO-8] Update the maven dependency
Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.
Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>
Diffstat (limited to 'packages/docker')
3 files changed, 17 insertions, 11 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 58ac368d03..8cd65652dc 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -19,15 +19,18 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- If the maven profile "docker" is specified the parameter -Dmso.git.url=<MsoGitRepo> must be provided - i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.onap.org/r--> - <mso.git.url>${env.GIT_NO_PROJECT}</mso.git.url> + i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.openecomp.org/r--> + <mso.chef.git.url.prefix>${env.GIT_NO_PROJECT}</mso.chef.git.url.prefix> + <mso.chef.git.branchname>master</mso.chef.git.branchname> + <mso.chef.git.url.suffix.chef.repo>mso/chef-repo</mso.chef.git.url.suffix.chef.repo> + <mso.chef.git.url.suffix.chef.config>mso/mso-config</mso.chef.git.url.suffix.chef.config> <mso.project.version>${project.version}</mso.project.version> </properties> <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> - <plugin> + <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> <executions> @@ -56,6 +59,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-plugin</artifactId> @@ -68,9 +72,9 @@ </goals> <phase>initialize</phase> <configuration> - <connectionUrl>scm:git:${mso.git.url}/mso/chef-repo</connectionUrl> + <connectionUrl>scm:git:${mso.chef.git.url.prefix}/${mso.chef.git.url.suffix.chef.repo}</connectionUrl> <checkoutDirectory>src/main/docker/docker-files/chef-configs/chef-repo</checkoutDirectory> - <scmVersion>master</scmVersion> + <scmVersion>${mso.chef.git.branchname}</scmVersion> <scmVersionType>branch</scmVersionType> <skipCheckoutIfExists>true</skipCheckoutIfExists> <pushChanges>false</pushChanges> @@ -83,9 +87,9 @@ </goals> <phase>initialize</phase> <configuration> - <connectionUrl>scm:git:${mso.git.url}/mso/mso-config</connectionUrl> + <connectionUrl>scm:git:${mso.chef.git.url.prefix}/${mso.chef.git.url.suffix.chef.config}</connectionUrl> <checkoutDirectory>src/main/docker/docker-files/chef-configs/mso-config</checkoutDirectory> - <scmVersion>master</scmVersion> + <scmVersion>${mso.chef.git.branchname}</scmVersion> <scmVersionType>branch</scmVersionType> <skipCheckoutIfExists>true</skipCheckoutIfExists> <pushChanges>false</pushChanges> @@ -140,8 +144,8 @@ <alias>mso-arquillian</alias> <build> <tags> + <tag>${project.docker.latesttag.version}</tag> <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> </tags> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> @@ -154,8 +158,8 @@ <alias>mso</alias> <build> <tags> + <tag>${project.docker.latesttag.version}</tag> <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> </tags> <cleanup>try</cleanup> <dockerFileDir>docker-files</dockerFileDir> diff --git a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties index de9b0aac09..cff4865c3d 100644 --- a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties +++ b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-roles.properties @@ -29,4 +29,5 @@ InfraPortalClient=InfraPortal-Client MSOClient=MSO-Client sitecontrol=SiteControl-Client MSO=AAIEmul-Client -BPELClient=BPEL-Client
\ No newline at end of file +BPELClient=BPEL-Client +SDNCClient=SDNC-Client diff --git a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties index a04d22296d..f7b44d4283 100644 --- a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties +++ b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/application-users.properties @@ -31,4 +31,5 @@ InfraPortalClient=e5077b432685a94babe332893337f6fc MSOClient=72bc85031ae67afe67014c7663ae1033 sitecontrol=9a3a360d86758f69ec9508725c017335 MSO=a05cb60a04f41f750ce1fc60a2633534 -BPELClient=f2b4ce8ae1964050c0ad7e69bd88fd62
\ No newline at end of file +BPELClient=f2b4ce8ae1964050c0ad7e69bd88fd62 +SDNCClient=3c98dfba582d79948496b319e3edcb4b |