Skip to content

Commit 70172b0

Browse files
Vinay-kalpaguriVinay Kumar Gupta Kalpaguri (EXT)
andauthored
Uplift to OpenJdk 17.0.5 (#312)
* Replaced selenium-server with selenium-java dependency * Updated cucumber dependency and firefox version to make it compatable with openjdk17 * Updated jenkins image version to jenkins:2.346.1-lts * Updated EIFFEL_ER_PORT to 8083. --------- Co-authored-by: Vinay Kumar Gupta Kalpaguri (EXT) <vinay.kumar.gupta.kalpaguri.ext@ericsson.com>
1 parent 0e0d92e commit 70172b0

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<properties>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22-
<java.version>1.8</java.version>
22+
<java.version>17</java.version>
2323
<output-relative-path>src/main/java</output-relative-path>
2424
<skipTests>false</skipTests>
2525
<skipUTs>${skipTests}</skipUTs>
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>org.projectlombok</groupId>
112112
<artifactId>lombok</artifactId>
113-
<version>1.18.6</version>
113+
<version>1.18.24</version>
114114
<scope>provided</scope>
115115
</dependency>
116116
<dependency>
@@ -158,19 +158,19 @@
158158
<dependency>
159159
<groupId>io.cucumber</groupId>
160160
<artifactId>cucumber-junit</artifactId>
161-
<version>2.4.0</version>
161+
<version>4.8.1</version>
162162
<scope>test</scope>
163163
</dependency>
164164
<dependency>
165165
<groupId>io.cucumber</groupId>
166166
<artifactId>cucumber-java</artifactId>
167-
<version>2.4.0</version>
167+
<version>4.8.1</version>
168168
<scope>test</scope>
169169
</dependency>
170170
<dependency>
171171
<groupId>io.cucumber</groupId>
172172
<artifactId>cucumber-spring</artifactId>
173-
<version>2.4.0</version>
173+
<version>4.8.1</version>
174174
<scope>test</scope>
175175
</dependency>
176176
<!-- RabbitMQ -->

src/functionaltest/resources/functional-test.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
test.selenium.firefox.TarFile.url.linux = https://ftp.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-GB/firefox-61.0.1.tar.bz2
1+
test.selenium.firefox.TarFile.url.linux = https://ftp.mozilla.org/pub/firefox/releases/102.0esr/linux-x86_64/en-GB/firefox-102.0esr.tar.bz2
22
ei.backend.instances.list.json.content=[{"name":"EI-Backend-1","host":"localhost","port":8070,"contextPath":"","https":false,"defaultBackend":true}, \
33
{"name":"EI-Backend-2","host":"localhost","port":8077,"contextPath":"","https":false,"defaultBackend":false},\
44
{"name":"EI-Backend-3","host":"localhost","port":8078,"contextPath":"","https":false,"defaultBackend":true}]

src/main/docker/env.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export EIFFEL_ER_IMAGE="eiffelericsson/eiffel-er:0.0.67"
1313
export MAILSERVER_IMAGE="mailhog/mailhog"
1414
export REMREM_GENERATE_IMAGE="eiffelericsson/eiffel-remrem-generate:2.0.4"
1515
export REMREM_PUBLISH_IMAGE="eiffelericsson/eiffel-remrem-publish:2.0.2"
16-
export JENKINS_IMAGE="jenkins/jenkins:2.332.2-lts"
16+
export JENKINS_IMAGE="jenkins/jenkins:2.346.1-lts"
1717
export LDAP_IMAGE="osixia/openldap:1.2.4"
1818

1919
export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:3.0.0"
@@ -22,7 +22,7 @@ export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:3.0.0"
2222
export MONGODB_PORT=27017
2323
export RABBITMQ_AMQP_PORT=5672
2424
export RABBITMQ_WEB_PORT=15672
25-
export EIFFEL_ER_PORT=8084
25+
export EIFFEL_ER_PORT=8083
2626
export EIFFEL_ER_INTERNAL_PORT=8080
2727

2828
export JENKINS_PORT=8082

0 commit comments

Comments
 (0)