Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1384: Building spring-boot-with-jib fails with NoSuchMethodEror #1386

Merged
merged 2 commits into from
Oct 10, 2020
Merged

Fix #1384: Building spring-boot-with-jib fails with NoSuchMethodEror #1386

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df34d97
Fix #1384: Building spring-boot-with-jib fails with NoSuchMethodEror
rohanKanojia Oct 2, 2020
c783091
Merge branch 'master' into pr/issue1384
rhuss Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
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.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" }}
Expand Down
4 changes: 4 additions & 0 deletions doc/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 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))

* **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))
Expand Down
10 changes: 5 additions & 5 deletions it/docker-compose/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 6 additions & 6 deletions it/dockerfile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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-->
Expand Down
2 changes: 1 addition & 1 deletion it/dockerfile/src/main/java/io/fabric8/dmp/samples/dockerfile/HelloWorldServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.fabric8.dmp.samples.dockerfile;
package io.fabric8.dmp.itests.dockerfile;

import java.io.File;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion it/dockerfile/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions it/dockerignore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions it/healthcheck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions it/helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions it/log/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions it/net/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -58,5 +58,6 @@
<module>dockerfile</module>
<module>log</module>
<module>run-java</module>
<module>spring-boot-with-jib</module>
</modules>
</project>
11 changes: 6 additions & 5 deletions it/properties/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions it/run-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
10 changes: 5 additions & 5 deletions it/smallest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading