Skip to content

Commit

Permalink
Merge pull request #242 from agebhar1/feature/maven-3.6.3
Browse files Browse the repository at this point in the history
update to latest Maven 3.6.3
  • Loading branch information
rhuss authored Apr 29, 2020
2 parents 3a39822 + 6feac30 commit c67d2a0
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions java/images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ config:
javaPackage: "11"
javaMajor: "11"
java: "" # empty means latest
maven: "3.6.2"
maven: "3.6.3"
jolokia: "1.6.2"
jmxexporter: "0.3.1"
centos-java11:
Expand All @@ -27,12 +27,12 @@ config:
user: "jboss"
home: "/opt/jboss"
javaSecurity: "/usr/lib/jvm/java/conf/security/java.security"
description: "CentOS 7.6 S2I Java builder image with OpenJDK 11"
description: "CentOS 7.7 S2I Java builder image with OpenJDK 11"
version:
javaPackage: "11"
javaMajor: "11"
java: "" # empty means latest
maven: "3.6.2"
maven: "3.6.3"
jolokia: "1.6.2"
jmxexporter: "0.3.1"
centos:
Expand All @@ -41,7 +41,7 @@ config:
user: "jboss"
home: "/opt/jboss"
javaSecurity: "/usr/lib/jvm/java/jre/lib/security/java.security"
description: "CentOS 7.5 S2I Java builder image with OpenJDK 8"
description: "CentOS 7.7 S2I Java builder image with OpenJDK 8"
version:
javaPackage: "1.8.0"
javaMajor: "8"
Expand Down
6 changes: 3 additions & 3 deletions java/images/centos-java11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV JOLOKIA_VERSION="1.6.2" \
JAVA_DATA_DIR="/deployments/data"

# Some version information
LABEL io.fabric8.s2i.version.maven="3.6.2" \
LABEL io.fabric8.s2i.version.maven="3.6.3" \
io.fabric8.s2i.version.jolokia="1.6.2" \
io.fabric8.s2i.version.prometheus.jmx_exporter="0.3.1" \
io.k8s.description="Platform for building and running plain Java applications (fat-jar and flat classpath)" \
Expand All @@ -37,9 +37,9 @@ RUN yum -y update \
java-11-openjdk \
java-11-openjdk-devel \
&& yum clean all \
&& curl https://archive.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz | \
&& curl https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \
tar -xzf - -C /opt \
&& ln -s /opt/apache-maven-3.6.2 /opt/maven \
&& ln -s /opt/apache-maven-3.6.3 /opt/maven \
&& ln -s /opt/maven/bin/mvn /usr/bin/mvn \
&& groupadd -r jboss -g 1000 \
&& useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss \
Expand Down
2 changes: 1 addition & 1 deletion java/images/centos-java11/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CentOS 7.6 S2I Java builder image with OpenJDK 11
# CentOS 7.7 S2I Java builder image with OpenJDK 11

This is a S2I builder image for Java builds whose result can be run directly without any further application server.It's suited ideally for microservices with a flat classpath (including "far jars").

Expand Down
2 changes: 1 addition & 1 deletion java/images/centos-java11/licenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h2>JBoss Fuse </h2>
<tr>
<td>org.apache.maven</td>
<td>maven</td>
<td>3.6.2</td>
<td>3.6.3</td>
<td><a href="http://repository.jboss.org/licenses/apache-2.0.txt">Apache Software License, Version 2.0</a><br></td>
<td><a href="apache_software_license_version_2.0-apache-2.0.txt">apache software license, version 2.0 - apache-2.0.txt</a><br></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion java/images/centos-java11/licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down
2 changes: 1 addition & 1 deletion java/images/centos/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CentOS 7.5 S2I Java builder image with OpenJDK 8
# CentOS 7.7 S2I Java builder image with OpenJDK 8

This is a S2I builder image for Java builds whose result can be run directly without any further application server.It's suited ideally for microservices with a flat classpath (including "far jars").

Expand Down
6 changes: 3 additions & 3 deletions java/images/fedora-java11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV JOLOKIA_VERSION="1.6.2" \
JAVA_DATA_DIR="/deployments/data"

# Some version information
LABEL io.fabric8.s2i.version.maven="3.6.2" \
LABEL io.fabric8.s2i.version.maven="3.6.3" \
io.fabric8.s2i.version.jolokia="1.6.2" \
io.fabric8.s2i.version.prometheus.jmx_exporter="0.3.1" \
io.k8s.description="Platform for building and running plain Java applications (fat-jar and flat classpath)" \
Expand All @@ -37,9 +37,9 @@ RUN yum -y update \
java-11-openjdk \
java-11-openjdk-devel \
&& yum clean all \
&& curl https://archive.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz | \
&& curl https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \
tar -xzf - -C /opt \
&& ln -s /opt/apache-maven-3.6.2 /opt/maven \
&& ln -s /opt/apache-maven-3.6.3 /opt/maven \
&& ln -s /opt/maven/bin/mvn /usr/bin/mvn \
&& groupadd -r jboss -g 1000 \
&& useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss \
Expand Down
2 changes: 1 addition & 1 deletion java/images/fedora-java11/licenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h2>JBoss Fuse </h2>
<tr>
<td>org.apache.maven</td>
<td>maven</td>
<td>3.6.2</td>
<td>3.6.3</td>
<td><a href="http://repository.jboss.org/licenses/apache-2.0.txt">Apache Software License, Version 2.0</a><br></td>
<td><a href="apache_software_license_version_2.0-apache-2.0.txt">apache software license, version 2.0 - apache-2.0.txt</a><br></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion java/images/fedora-java11/licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down

0 comments on commit c67d2a0

Please sign in to comment.