Skip to content

Commit 8771600

Browse files
jainadc9jainadc9
andauthored
Excluded log4j-to-slf4j dependency and uplifted spring-boot-version to 2.6.3 (#301)
* Excluded log4j-to-slf4j dependency * Uplifted spring boot version 2.6.3 * Update env.bash Co-authored-by: jainadc9 <jainad.chinat@tcs.com>
1 parent b8c660e commit 8771600

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

pom.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.0.8.RELEASE</version>
15+
<version>2.6.3</version>
1616
<relativePath /> <!-- .. lookup parent from repository -->
1717
</parent>
1818

@@ -50,6 +50,12 @@
5050
<groupId>org.springframework.boot</groupId>
5151
<artifactId>spring-boot-starter-actuator</artifactId>
5252
<version>${springBootVersion}</version>
53+
<exclusions>
54+
<exclusion>
55+
<groupId>org.apache.logging.log4j</groupId>
56+
<artifactId>log4j-to-slf4j</artifactId>
57+
</exclusion>
58+
</exclusions>
5359
</dependency>
5460
<dependency>
5561
<groupId>org.springframework.boot</groupId>
@@ -84,6 +90,10 @@
8490
<groupId>com.vaadin.external.google</groupId>
8591
<artifactId>android-json</artifactId>
8692
</exclusion>
93+
<exclusion>
94+
<groupId>org.junit.jupiter</groupId>
95+
<artifactId>junit-jupiter</artifactId>
96+
</exclusion>
8797
</exclusions>
8898
</dependency>
8999

@@ -112,13 +122,13 @@
112122
<dependency>
113123
<groupId>junit</groupId>
114124
<artifactId>junit</artifactId>
115-
<version>4.13.1</version>
125+
<version>4.13.2</version>
116126
</dependency>
117127
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
118128
<dependency>
119129
<groupId>org.mockito</groupId>
120130
<artifactId>mockito-core</artifactId>
121-
<version>2.9.0</version>
131+
<version>4.0.0</version>
122132
<scope>test</scope>
123133
</dependency>
124134
<!-- https://mvnrepository.com/artifact/org.mock-server/mockserver-client-java -->

src/main/docker/env.bash

Lines changed: 1 addition & 1 deletion
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="bitnami/jenkins:2.138.3"
16+
export JENKINS_IMAGE="bitnami/jenkins:2.319.3"
1717
export LDAP_IMAGE="osixia/openldap:1.2.4"
1818

1919
export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:3.0.0"

0 commit comments

Comments
 (0)