Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

Commit

Permalink
feature: Update default base images to their latest versions (#1345)
Browse files Browse the repository at this point in the history
* feature: Updaste default base images to their latest versions

These also include a Java update to 1.8.0_181 (from _161)

* update(jetty): Update to 1.5.1 which contains some minor optimization
  • Loading branch information
rhuss authored and rohanKanojia committed Aug 1, 2018
1 parent 48e1957 commit f0b51f8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,13 @@
<version.docker-maven-plugin>0.22.1</version.docker-maven-plugin>
<version.networknt.validator>0.1.7</version.networknt.validator>
<version.jgit>5.0.1.201806211838-r</version.jgit>
<version.hamcrest-library>1.3</version.hamcrest-library>

<!-- ======================================================= -->
<!-- === Java base image versions for docker, s2i (istag == s2i) -->
<!-- Upstream -->
<version.image.java.upstream.docker>1.3</version.image.java.upstream.docker>
<version.image.java.upstream.s2i>2.2</version.image.java.upstream.s2i>
<version.image.java.upstream.docker>1.5</version.image.java.upstream.docker>
<version.image.java.upstream.s2i>2.3</version.image.java.upstream.s2i>

<!-- RedHat -->
<version.image.java.redhat.docker>2.0</version.image.java.redhat.docker>
Expand All @@ -80,7 +81,7 @@
<!-- ======================================================= -->
<!-- === Karaf base image versions for docker, s2i (istag == s2i) -->
<!-- Upstream -->
<version.image.karaf.upstream.docker>2.1</version.image.karaf.upstream.docker>
<version.image.karaf.upstream.docker>2.3</version.image.karaf.upstream.docker>
<version.image.karaf.upstream.s2i>${version.image.karaf.upstream.docker}</version.image.karaf.upstream.s2i>

<!-- RedHat -->
Expand All @@ -89,17 +90,17 @@

<!-- ======================================================= -->
<!-- Servlet container images -->
<version.image.tomcat.upstream>1.1.6</version.image.tomcat.upstream>
<version.image.jetty.upstream>1.1.10</version.image.jetty.upstream>
<version.image.tomcat.upstream>1.2.0</version.image.tomcat.upstream>
<version.image.jetty.upstream>1.5.1</version.image.jetty.upstream>
<version.image.wildfly.upstream>10.1.0.Final</version.image.wildfly.upstream>

<!-- ============================================= -->
<!-- Default images used in the defult generators. Please note that the generators make some assumption about
<!-- Default images used in the default generators. Please note that the generators make some assumption about
these images (e.g. where the deployment directory is), so don't change them arbitrarily -->

<!-- java (java-exec, spring-boot, wildfly-swarm) -->
<image.java.upstream.s2i>fabric8/s2i-java:${version.image.java.upstream.s2i}</image.java.upstream.s2i>
<image.java.upstream.docker>fabric8/java-jboss-openjdk8-jdk:${version.image.java.upstream.docker}</image.java.upstream.docker>
<image.java.upstream.docker>fabric8/java-centos-openjdk8-jdk:${version.image.java.upstream.docker}</image.java.upstream.docker>
<image.java.upstream.istag>fabric8-java:${version.image.java.upstream.s2i}</image.java.upstream.istag>

<image.java.redhat.s2i>jboss-fuse-6/fis-java-openshift:${version.image.java.redhat.s2i}</image.java.redhat.s2i>
Expand All @@ -116,10 +117,9 @@
<image.karaf.redhat.istag>fis-karaf-openshift:${version.image.karaf.redhat.s2i}</image.karaf.redhat.istag>

<!-- webapp -->
<image.tomcat.upstream>fabric8/tomcat-8:${version.image.tomcat.upstream}</image.tomcat.upstream>
<image.tomcat.upstream>fabric8/tomcat-9:${version.image.tomcat.upstream}</image.tomcat.upstream>
<image.jetty.upstream>fabric8/jetty-9:${version.image.jetty.upstream}</image.jetty.upstream>
<image.wildfly.upstream>jboss/wildfly:${version.image.wildfly.upstream}</image.wildfly.upstream>
<hamcrest-library.version>1.3</hamcrest-library.version>
</properties>

<repositories>
Expand Down Expand Up @@ -385,14 +385,14 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest-library.version}</version>
<version>${version.hamcrest-library}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest-library.version}</version>
<version>${version.hamcrest-library}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/spring-boot-with-yaml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.5-SNAPSHOT</version>

<configuration>

Expand Down

0 comments on commit f0b51f8

Please sign in to comment.