diff options
| author |   Venkata Harish K Kajur <vk250x@att.com> | 2017-02-20 21:33:52 +0000 |
|---|---|---|
| committer | Venkata Harish K Kajur <vk250x@att.com> | 2017-02-20 21:40:59 +0000 |
| commit | 8d5d886f9290aec88300cd8daf4cbada292dcfbf (patch) | |
| tree | 41b48cc9573cccc593e2d17b97c5088c2f2ecb4a | |
| parent | c9c51289af3574d91c25675066341bf23b098280 (diff) | |
Change profile docker back
Change-Id: If4e400f24c748f17fff4f23764b873b38ab197f3
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
| -rw-r--r-- | pom.xml | 94 | ||||
| -rw-r--r-- | version.properties | 22 |
2 files changed, 63 insertions, 53 deletions
@@ -175,6 +175,48 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>copy-docker-file</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>${basedir}/src/main/docker</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.4.11</version> + <configuration> + <serverId>nexus3.openecomp.org:10003</serverId> + <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName> + <dockerDirectory>${docker.location}</dockerDirectory> + <imageTags> + <imageTag>${docker.imagetag}</imageTag> + <imageTag>latest</imageTag> + </imageTags> + <forceTags>true</forceTags> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.5.1</version> <executions> @@ -313,57 +355,5 @@ </plugins> </build> - <profiles> - <profile> - <id>docker</id> - <build> - <defaultGoal>docker:build</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>copy-docker-file</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>${basedir}/src/main/docker</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.4.11</version> - <configuration> - <serverId>nexus3.openecomp.org:10003</serverId> - <imageName>${docker.push.registry}/ecomp/${project.artifactId}</imageName> - <dockerDirectory>${docker.location}</dockerDirectory> - <imageTags> - <imageTag>${docker.imagetag}</imageTag> - <imageTag>latest</imageTag> - </imageTags> - <forceTags>true</forceTags> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/version.properties b/version.properties index 2ccc7c2..903df0e 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,23 @@ +### +# ============LICENSE_START======================================================= +# MODEL LOADER SERVICE +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + # Versioning variables # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support @@ -10,4 +30,4 @@ base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT |