|
66 | 66 | <version.docker-maven-plugin>0.22.1</version.docker-maven-plugin> |
67 | 67 | <version.networknt.validator>0.1.7</version.networknt.validator> |
68 | 68 | <version.jgit>5.0.1.201806211838-r</version.jgit> |
| 69 | + <version.hamcrest-library>1.3</version.hamcrest-library> |
69 | 70 |
|
70 | 71 | <!-- ======================================================= --> |
71 | 72 | <!-- === Java base image versions for docker, s2i (istag == s2i) --> |
72 | 73 | <!-- 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> |
75 | 76 |
|
76 | 77 | <!-- RedHat --> |
77 | 78 | <version.image.java.redhat.docker>2.0</version.image.java.redhat.docker> |
|
80 | 81 | <!-- ======================================================= --> |
81 | 82 | <!-- === Karaf base image versions for docker, s2i (istag == s2i) --> |
82 | 83 | <!-- 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> |
84 | 85 | <version.image.karaf.upstream.s2i>${version.image.karaf.upstream.docker}</version.image.karaf.upstream.s2i> |
85 | 86 |
|
86 | 87 | <!-- RedHat --> |
|
89 | 90 |
|
90 | 91 | <!-- ======================================================= --> |
91 | 92 | <!-- 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> |
94 | 95 | <version.image.wildfly.upstream>10.1.0.Final</version.image.wildfly.upstream> |
95 | 96 |
|
96 | 97 | <!-- ============================================= --> |
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 |
98 | 99 | these images (e.g. where the deployment directory is), so don't change them arbitrarily --> |
99 | 100 |
|
100 | 101 | <!-- java (java-exec, spring-boot, wildfly-swarm) --> |
101 | 102 | <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> |
103 | 104 | <image.java.upstream.istag>fabric8-java:${version.image.java.upstream.s2i}</image.java.upstream.istag> |
104 | 105 |
|
105 | 106 | <image.java.redhat.s2i>jboss-fuse-6/fis-java-openshift:${version.image.java.redhat.s2i}</image.java.redhat.s2i> |
|
116 | 117 | <image.karaf.redhat.istag>fis-karaf-openshift:${version.image.karaf.redhat.s2i}</image.karaf.redhat.istag> |
117 | 118 |
|
118 | 119 | <!-- 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> |
120 | 121 | <image.jetty.upstream>fabric8/jetty-9:${version.image.jetty.upstream}</image.jetty.upstream> |
121 | 122 | <image.wildfly.upstream>jboss/wildfly:${version.image.wildfly.upstream}</image.wildfly.upstream> |
122 | | - <hamcrest-library.version>1.3</hamcrest-library.version> |
123 | 123 | </properties> |
124 | 124 |
|
125 | 125 | <repositories> |
|
385 | 385 | <dependency> |
386 | 386 | <groupId>org.hamcrest</groupId> |
387 | 387 | <artifactId>hamcrest-all</artifactId> |
388 | | - <version>${hamcrest-library.version}</version> |
| 388 | + <version>${version.hamcrest-library}</version> |
389 | 389 | <scope>test</scope> |
390 | 390 | </dependency> |
391 | 391 |
|
392 | 392 | <dependency> |
393 | 393 | <groupId>org.hamcrest</groupId> |
394 | 394 | <artifactId>hamcrest-library</artifactId> |
395 | | - <version>${hamcrest-library.version}</version> |
| 395 | + <version>${version.hamcrest-library}</version> |
396 | 396 | </dependency> |
397 | 397 |
|
398 | 398 | <dependency> |
|
0 commit comments