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

Commit f0b51f8

Browse files
rhussrohanKanojia
authored andcommitted
feature: Update default base images to their latest versions (#1345)
* 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
1 parent 48e1957 commit f0b51f8

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

parent/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@
6666
<version.docker-maven-plugin>0.22.1</version.docker-maven-plugin>
6767
<version.networknt.validator>0.1.7</version.networknt.validator>
6868
<version.jgit>5.0.1.201806211838-r</version.jgit>
69+
<version.hamcrest-library>1.3</version.hamcrest-library>
6970

7071
<!-- ======================================================= -->
7172
<!-- === Java base image versions for docker, s2i (istag == s2i) -->
7273
<!-- Upstream -->
73-
<version.image.java.upstream.docker>1.3</version.image.java.upstream.docker>
74-
<version.image.java.upstream.s2i>2.2</version.image.java.upstream.s2i>
74+
<version.image.java.upstream.docker>1.5</version.image.java.upstream.docker>
75+
<version.image.java.upstream.s2i>2.3</version.image.java.upstream.s2i>
7576

7677
<!-- RedHat -->
7778
<version.image.java.redhat.docker>2.0</version.image.java.redhat.docker>
@@ -80,7 +81,7 @@
8081
<!-- ======================================================= -->
8182
<!-- === Karaf base image versions for docker, s2i (istag == s2i) -->
8283
<!-- Upstream -->
83-
<version.image.karaf.upstream.docker>2.1</version.image.karaf.upstream.docker>
84+
<version.image.karaf.upstream.docker>2.3</version.image.karaf.upstream.docker>
8485
<version.image.karaf.upstream.s2i>${version.image.karaf.upstream.docker}</version.image.karaf.upstream.s2i>
8586

8687
<!-- RedHat -->
@@ -89,17 +90,17 @@
8990

9091
<!-- ======================================================= -->
9192
<!-- Servlet container images -->
92-
<version.image.tomcat.upstream>1.1.6</version.image.tomcat.upstream>
93-
<version.image.jetty.upstream>1.1.10</version.image.jetty.upstream>
93+
<version.image.tomcat.upstream>1.2.0</version.image.tomcat.upstream>
94+
<version.image.jetty.upstream>1.5.1</version.image.jetty.upstream>
9495
<version.image.wildfly.upstream>10.1.0.Final</version.image.wildfly.upstream>
9596

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

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

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

118119
<!-- webapp -->
119-
<image.tomcat.upstream>fabric8/tomcat-8:${version.image.tomcat.upstream}</image.tomcat.upstream>
120+
<image.tomcat.upstream>fabric8/tomcat-9:${version.image.tomcat.upstream}</image.tomcat.upstream>
120121
<image.jetty.upstream>fabric8/jetty-9:${version.image.jetty.upstream}</image.jetty.upstream>
121122
<image.wildfly.upstream>jboss/wildfly:${version.image.wildfly.upstream}</image.wildfly.upstream>
122-
<hamcrest-library.version>1.3</hamcrest-library.version>
123123
</properties>
124124

125125
<repositories>
@@ -385,14 +385,14 @@
385385
<dependency>
386386
<groupId>org.hamcrest</groupId>
387387
<artifactId>hamcrest-all</artifactId>
388-
<version>${hamcrest-library.version}</version>
388+
<version>${version.hamcrest-library}</version>
389389
<scope>test</scope>
390390
</dependency>
391391

392392
<dependency>
393393
<groupId>org.hamcrest</groupId>
394394
<artifactId>hamcrest-library</artifactId>
395-
<version>${hamcrest-library.version}</version>
395+
<version>${version.hamcrest-library}</version>
396396
</dependency>
397397

398398
<dependency>

samples/spring-boot-with-yaml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<plugin>
6565
<groupId>io.fabric8</groupId>
6666
<artifactId>fabric8-maven-plugin</artifactId>
67-
<version>3.2-SNAPSHOT</version>
67+
<version>3.5-SNAPSHOT</version>
6868

6969
<configuration>
7070

0 commit comments

Comments
 (0)