Skip to content
This repository has been archived by the owner on Mar 31, 2022. It is now read-only.

Commit

Permalink
Merge pull request #230 from spotify/mattbrown/java11
Browse files Browse the repository at this point in the history
update org.apache.maven:maven-archiver to resolve Java 11 issue
  • Loading branch information
mattnworb authored Oct 8, 2018
2 parents a916466 + 6744acf commit 358c3a6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: java

jdk:
- openjdk11
- openjdk10
- openjdk9
- openjdk8
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

## 1.4.6 (release TBD)
- Fix an ExceptionInInitializerError when plugin is used on Java 11 ([230][])

[230]: https://github.com/spotify/dockerfile-maven/pull/230

## 1.4.6 (released October 5 2018)

- Support for Java 9 and 10

Expand Down
22 changes: 16 additions & 6 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.24</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -43,7 +53,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<version>23.6.1-jre</version>
</dependency>
<dependency>
<groupId>com.spotify</groupId>
Expand All @@ -54,18 +64,18 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.3.9</version>
<version>3.5.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.3.9</version>
<version>3.5.4</version>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
</dependency>

<dependency>
Expand All @@ -83,7 +93,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.4</version>
<version>3.5.2</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -117,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.4</version>
<version>3.5.2</version>
<configuration>
<goalPrefix>dockerfile</goalPrefix>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
Expand Down

0 comments on commit 358c3a6

Please sign in to comment.