Skip to content

Commit

Permalink
[RELEASE] Prepare for next development iteration
Browse files Browse the repository at this point in the history
Signed-off-by: Rohan Kumar <rohaan@redhat.com>
  • Loading branch information
rohanKanojia committed Apr 4, 2021
1 parent b670520 commit ac614a2
Show file tree
Hide file tree
Showing 46 changed files with 84 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
mvn clean install -DskipTests
PROJECT_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
cd it/
find . -type f -exec sed -i 's/0.35.0/'"$PROJECT_VERSION"'/g' {} +
find . -type f -exec sed -i 's/0.35-SNAPSHOT/'"$PROJECT_VERSION"'/g' {} +
mvn clean install
- save_cache:
key: dmp-{{ checksum "pom.xml" }}
Expand Down
2 changes: 2 additions & 0 deletions doc/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ChangeLog

* **0.35-SNAPSHOT**:

* **0.35.0** (2021-04-04)
- Building 'spring-boot-with-jib' sample fails with NoSuchMethodError ([1384](https://github.com/fabric8io/docker-maven-plugin/issues/1384))
- Loading Image tarball into docker daemon fails in JIB mode ([1385](https://github.com/fabric8io/docker-maven-plugin/issues/1385))
Expand Down
2 changes: 1 addition & 1 deletion it/builder/app-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-builder-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
</parent>

<artifactId>dmp-it-builder-app-image</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion it/builder/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-builder-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
</parent>

<artifactId>dmp-it-builder-app</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion it/builder/builder-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-builder-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
</parent>

<artifactId>dmp-it-builder-builder-image</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion it/builder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions it/docker-compose/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-docker-compose</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<url>http://www.jolokia.org</url>

Expand Down
4 changes: 2 additions & 2 deletions it/dockerfile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dockerfile</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>war</packaging>
<name>dmp-it-dockerfile</name>

Expand Down
4 changes: 2 additions & 2 deletions it/dockerignore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-dockerignore</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>docker-build</packaging>

<build>
Expand Down
4 changes: 2 additions & 2 deletions it/healthcheck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-healthcheck</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>


<build>
Expand Down
4 changes: 2 additions & 2 deletions it/helloworld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>


<artifactId>dmp-it-helloworld</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dmp-it-helloworld</name>

Expand Down
4 changes: 2 additions & 2 deletions it/log/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>


<groupId>io.fabric8</groupId>
<artifactId>dmp-it-log</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions it/multi-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-multi-assembly</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>

<description>Docker Maven Plugin Integration Test with Spring Boot with Multiple Layers</description>
Expand Down
4 changes: 2 additions & 2 deletions it/net/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-net</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<profiles>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>pom</packaging>

<url>http://www.jolokia.org</url>
Expand Down
4 changes: 2 additions & 2 deletions it/properties/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-properties</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>docker-build</packaging>

<build>
Expand Down
4 changes: 2 additions & 2 deletions it/run-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-run-java</artifactId>
<packaging>jar</packaging>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<build>

Expand Down
4 changes: 2 additions & 2 deletions it/smallest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>fabric8io</groupId>
<artifactId>dmp-it-smallest</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions it/spring-boot-with-jib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-spring-boot-jib</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>jar</packaging>

<description>Docker Maven Plugin Integration test with Spring Boot With Build Mode JIB</description>
Expand Down
4 changes: 2 additions & 2 deletions it/volume/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-it-volume</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions it/zero-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>


<groupId>io.fabric8.dmp.itests</groupId>
<artifactId>dmp-it-zero-config</artifactId>
<packaging>jar</packaging>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<properties>
<jar_file>${project.build.directory}/${project.build.finalName}.jar</jar_file>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>docker-maven-plugin</name>
Expand Down
2 changes: 1 addition & 1 deletion samples/build-cache/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fabric8.dmp.samples.build-cache</groupId>
<artifactId>parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
</parent>

<artifactId>app</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion samples/build-cache/image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.fabric8.dmp.samples.build-cache</groupId>
<artifactId>parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
</parent>

<artifactId>image</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions samples/build-cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>io.fabric8.dmp.samples</groupId>
<artifactId>dmp-sample-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>io.fabric8.dmp.samples.build-cache</groupId>
<artifactId>parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions samples/cargo-jolokia/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<parent>
<groupId>io.fabric8.dmp.samples</groupId>
<artifactId>dmp-sample-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>io.fabric8</groupId>
<artifactId>dmp-sample-cargo-jolokia</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<url>http://www.jolokia.org</url>

Expand Down
2 changes: 1 addition & 1 deletion samples/copy-from-container/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.fabric8.dmp.samples</groupId>
<artifactId>dmp-sample-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>dmp-sample-copy-from-container</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions samples/custom-net/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<parent>
<groupId>io.fabric8.dmp.samples</groupId>
<artifactId>dmp-sample-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-custom-net</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions samples/data-jolokia/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>io.fabric8.dmp.samples</groupId>
<artifactId>dmp-sample-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-sample-data-jolokia</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<!-- add custom lifecycle -->
<packaging>docker</packaging>

Expand Down
4 changes: 2 additions & 2 deletions samples/docker-compose/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<groupId>io.fabric8.dmp.samples</groupId>
<artifactId>dmp-sample-parent</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dmp-sample-docker-compose</artifactId>
<version>0.35.0</version>
<version>0.35-SNAPSHOT</version>

<url>http://www.jolokia.org</url>

Expand Down
Loading

0 comments on commit ac614a2

Please sign in to comment.