diff options
| -rw-r--r-- | apiroute/apiroute-service/dependency-reduced-pom.xml | 139 | ||||
| -rw-r--r-- | build4docker.sh | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
3 files changed, 2 insertions, 141 deletions
diff --git a/apiroute/apiroute-service/dependency-reduced-pom.xml b/apiroute/apiroute-service/dependency-reduced-pom.xml deleted file mode 100644 index 6a7f776..0000000 --- a/apiroute/apiroute-service/dependency-reduced-pom.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?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"> - <parent> - <artifactId>apiroute-parent</artifactId> - <groupId>org.onap.msb.apigateway.apiroute</groupId> - <version>1.2.5</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.msb.apigateway.apiroute</groupId> - <artifactId>apiroute-service</artifactId> - <name>onap/msb/apigateway/apiroute/apiroute-service</name> - <version>1.2.5</version> - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer /> - <transformer> - <mainClass>org.onap.msb.apiroute.ApiRouteApp</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - <configuration> - <createDependencyReducedPom>true</createDependencyReducedPom> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - </configuration> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>clean-generated-files</id> - <phase>generate-sources</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${project.build.directory}/generated-sources</directory> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.6.6</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>powermock-module-junit4-common</artifactId> - <groupId>org.powermock</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.6</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>mockito-core</artifactId> - <groupId>org.mockito</groupId> - </exclusion> - <exclusion> - <artifactId>powermock-api-mockito-common</artifactId> - <groupId>org.powermock</groupId> - </exclusion> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> -</project> - diff --git a/build4docker.sh b/build4docker.sh index 4329646..4974bcd 100644 --- a/build4docker.sh +++ b/build4docker.sh @@ -36,7 +36,7 @@ mkdir $RELEASE_DIR -p DOCKER_RUN_NAME=msb_apigateway DOCKER_IMAGE_NAME=msb_apigateway DOCKER_LATEST_VERSION=latest -DOCKER_RELEASE_VERSION=1.2.5 +DOCKER_RELEASE_VERSION=1.2.6 DOCKER_REPOSITORY=nexus3.onap.org:10003 TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ") diff --git a/version.properties b/version.properties index 4fd02cd..0cb18ba 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=2 -patch=5 +patch=6 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |