Merge branch 'master' into isolationTech

fabric8io · Mar 7, 2021 · 9b5fea4 · 9b5fea4
2 parents 57a83e7 + 9f729e2
commit 9b5fea4
Show file tree

Hide file tree

Showing 61 changed files with 1,333 additions and 151 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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.29-SNAPSHOT/'"$PROJECT_VERSION"'/g' {} +
+          find . -type f -exec sed -i 's/0.34-SNAPSHOT/'"$PROJECT_VERSION"'/g' {} +
           mvn clean install
     - save_cache:
         key: dmp-{{ checksum "pom.xml" }}

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -0,0 +1,24 @@
+name: Windows Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    name: Windows Java ${{ matrix.java }} Maven
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        java: [8, 11]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build Project
+        run: mvn clean install
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+* 0.34-SNAPSHOT
+  - 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))
+  - `assembly.inline` is removed when external properties are enabled ([1082](https://github.com/fabric8io/docker-maven-plugin/issues/1082))
+  - Fix Support for Podman REST API(when configured) Related to ([1330](https://github.com/fabric8io/docker-maven-plugin/issues/1330))
+
 * **0.34.1** (2020-09-27)
   - Fix NPE with "skipPush" and no build configuration given ([#1381](https://github.com/fabric8io/docker-maven-plugin/issues/1381))
   - upgrade to jib-core 0.15.0 ([#1378](https://github.com/fabric8io/docker-maven-plugin/issues/1378))

diff --git a/it/docker-compose/pom.xml b/it/docker-compose/pom.xml
@@ -20,14 +20,14 @@
   -->
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>dmp-sample-docker-compose</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-docker-compose</artifactId>
+  <version>0.34-SNAPSHOT</version>
 
   <url>http://www.jolokia.org</url>
 

diff --git a/it/dockerfile/pom.xml b/it/dockerfile/pom.xml
@@ -10,16 +10,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dockerfile</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <version>0.34-SNAPSHOT</version>
   <packaging>war</packaging>
-  <name>dmp-sample-dockerfile</name>
+  <name>dmp-it-dockerfile</name>
 
   <properties>
     <file>welcome.txt</file>
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -77,7 +77,7 @@
         <configuration>
           <images>
             <image>
-              <name>fabric8:dmp-sample-dockerfile</name>
+              <name>fabric8:dmp-it-dockerfile</name>
               <alias>dockerfile</alias>
               <build>
                 <!-- filter>@</filter-->

diff --git a/it/dockerfile/src/main/java/io/fabric8/dmp/samples/dockerfile/HelloWorldServlet.java b/it/dockerfile/src/main/java/io/fabric8/dmp/samples/dockerfile/HelloWorldServlet.java
@@ -1,4 +1,4 @@
-package io.fabric8.dmp.samples.dockerfile;
+package io.fabric8.dmp.itests.dockerfile;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/it/dockerfile/src/main/webapp/WEB-INF/web.xml b/it/dockerfile/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns
   <servlet>
     <display-name>HelloWold</display-name>
     <servlet-name>hello-world</servlet-name>
-    <servlet-class>io.fabric8.dmp.samples.dockerfile.HelloWorldServlet</servlet-class>
+    <servlet-class>io.fabric8.dmp.itests.dockerfile.HelloWorldServlet</servlet-class>
   </servlet>
 
   <servlet-mapping>

diff --git a/it/dockerignore/pom.xml b/it/dockerignore/pom.xml
@@ -8,14 +8,14 @@
   -->
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>dmp-sample-dockerignore</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-dockerignore</artifactId>
+  <version>0.34-SNAPSHOT</version>
   <packaging>docker-build</packaging>
 
   <build>
@@ -44,7 +44,7 @@
           <images>
             <image>
               <alias>simple</alias>
-              <name>dmp-sample/dockerignore</name>
+              <name>dmp-it/dockerignore</name>
               <build>
                 <dockerFileDir>${project.basedir}</dockerFileDir>
                 <compression>gzip</compression>

diff --git a/it/healthcheck/pom.xml b/it/healthcheck/pom.xml
@@ -10,14 +10,14 @@
   -->
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>dmp-sample-healthcheck</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-healthcheck</artifactId>
+  <version>0.34-SNAPSHOT</version>
 
 
   <build>

diff --git a/it/helloworld/pom.xml b/it/helloworld/pom.xml
@@ -10,17 +10,17 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
 
-  <artifactId>dmp-sample-helloworld</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-helloworld</artifactId>
+  <version>0.34-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>dmp-sample-helloworld</name>
+  <name>dmp-it-helloworld</name>
 
   <dependencies>
     <dependency>

diff --git a/it/log/pom.xml b/it/log/pom.xml
@@ -11,16 +11,16 @@
   -->
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
 
   <groupId>io.fabric8</groupId>
-  <artifactId>dmp-sample-log</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-log</artifactId>
+  <version>0.34-SNAPSHOT</version>
 
   <build>
     <plugins>

diff --git a/it/net/pom.xml b/it/net/pom.xml
@@ -14,14 +14,14 @@
   -->
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>dmp-sample-net</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-net</artifactId>
+  <version>0.34-SNAPSHOT</version>
 
   <profiles>
     <profile>

diff --git a/it/pom.xml b/it/pom.xml
@@ -19,9 +19,9 @@
 
   -->
 
-  <groupId>io.fabric8.dmp.samples</groupId>
-  <artifactId>dmp-sample-parent</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <groupId>io.fabric8.dmp.itests</groupId>
+  <artifactId>dmp-it-parent</artifactId>
+  <version>0.34-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <url>http://www.jolokia.org</url>
@@ -58,5 +58,6 @@
     <module>dockerfile</module>
     <module>log</module>
     <module>run-java</module>
+    <module>spring-boot-with-jib</module>
   </modules>
 </project>
diff --git a/it/properties/pom.xml b/it/properties/pom.xml
@@ -8,21 +8,22 @@
   -->
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>dmp-sample-properties</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-properties</artifactId>
+  <version>0.34-SNAPSHOT</version>
   <packaging>docker-build</packaging>
 
   <build>
     <plugins>
       <plugin>
         <groupId>io.fabric8</groupId>
         <artifactId>docker-maven-plugin</artifactId>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>start</id>

diff --git a/it/run-java/pom.xml b/it/run-java/pom.xml
@@ -5,16 +5,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>io.fabric8.dmp.samples</groupId>
-  <artifactId>dmp-sample-run-java</artifactId>
+  <groupId>io.fabric8.dmp.itests</groupId>
+  <artifactId>dmp-it-run-java</artifactId>
   <packaging>jar</packaging>
-  <version>0.29-SNAPSHOT</version>
+  <version>0.34-SNAPSHOT</version>
 
   <build>
 

diff --git a/it/smallest/pom.xml b/it/smallest/pom.xml
@@ -2,15 +2,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.fabric8.dmp.samples</groupId>
-    <artifactId>dmp-sample-parent</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.34-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>fabric8io</groupId>
-  <artifactId>dmp-sample-smallest</artifactId>
-  <version>0.29-SNAPSHOT</version>
+  <artifactId>dmp-it-smallest</artifactId>
+  <version>0.34-SNAPSHOT</version>
 
   <build>
     <plugins>