Skip to content

Commit fe5deb1

Browse files
freelansamfreelansam
committed
JAVA-9824: Identify boot modules not using parent-boot-2 as parent and
upgrade log4j for them
1 parent 4b62cbf commit fe5deb1

File tree

30 files changed

+242
-1
lines changed

30 files changed

+242
-1
lines changed

‎jta/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@
1515
<version>0.0.1-SNAPSHOT</version>
1616
<relativePath>../parent-boot-2</relativePath>
1717
</parent>
18+
19+
<dependencyManagement>
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.apache.logging.log4j</groupId>
23+
<artifactId>log4j-bom</artifactId>
24+
<version>${log4j2.version}</version>
25+
<scope>import</scope>
26+
<type>pom</type>
27+
</dependency>
28+
</dependencies>
29+
</dependencyManagement>
1830

1931
<dependencies>
2032
<dependency>
@@ -37,6 +49,7 @@
3749

3850
<properties>
3951
<spring-boot.version>2.4.7</spring-boot.version>
52+
<log4j2.version>2.17.1</log4j2.version>
4053
</properties>
4154

4255
</project>

‎maven-modules/maven-generate-war/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363

6464
<properties>
6565
<java.version>11</java.version>
66+
<log4j2.version>2.17.1</log4j2.version>
6667
</properties>
6768

6869
</project>

‎patterns/enterprise-patterns/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@
4848
<type>pom</type>
4949
<scope>import</scope>
5050
</dependency>
51+
<dependency>
52+
<groupId>org.apache.logging.log4j</groupId>
53+
<artifactId>log4j-bom</artifactId>
54+
<version>${log4j2.version}</version>
55+
<scope>import</scope>
56+
<type>pom</type>
57+
</dependency>
5158
</dependencies>
5259
</dependencyManagement>
5360

@@ -63,6 +70,7 @@
6370
<properties>
6471
<camel.version>3.7.4</camel.version>
6572
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
73+
<log4j2.version>2.17.1</log4j2.version>
6674
</properties>
6775

6876
</project>

‎persistence-modules/spring-data-dynamodb/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.apache.logging.log4j</groupId>
29+
<artifactId>log4j-bom</artifactId>
30+
<version>${log4j2.version}</version>
31+
<scope>import</scope>
32+
<type>pom</type>
33+
</dependency>
2734
</dependencies>
2835
</dependencyManagement>
2936

@@ -184,6 +191,7 @@
184191
<dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
185192
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
186193
<spring-boot.version>2.4.7</spring-boot.version>
194+
<log4j2.version>2.17.1</log4j2.version>
187195
</properties>
188196

189197
</project>

‎quarkus-vs-springboot/spring-project/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
<java.version>11</java.version>
188188
<repackage.classifier />
189189
<spring-native.version>0.11.0-RC1</spring-native.version>
190+
<log4j2.version>2.17.1</log4j2.version>
190191
</properties>
191192

192193
</project>

‎spring-5-data-reactive/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@
1313
<version>0.0.1-SNAPSHOT</version>
1414
<relativePath>../parent-boot-2</relativePath>
1515
</parent>
16+
17+
<dependencyManagement>
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.apache.logging.log4j</groupId>
21+
<artifactId>log4j-bom</artifactId>
22+
<version>${log4j2.version}</version>
23+
<scope>import</scope>
24+
<type>pom</type>
25+
</dependency>
26+
</dependencies>
27+
</dependencyManagement>
1628

1729
<dependencies>
1830
<dependency>
@@ -138,6 +150,7 @@
138150
<reactor-core.version>3.3.1.RELEASE</reactor-core.version>
139151
<!-- This spring-boot.version is set manually, For upgrading this please refer http://team.baeldung.com/browse/JAVA-2802 -->
140152
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>
153+
<log4j2.version>2.17.1</log4j2.version>
141154
</properties>
142155

143156
</project>

‎spring-activiti/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
<version>0.0.1-SNAPSHOT</version>
1717
<relativePath>../parent-boot-1</relativePath>
1818
</parent>
19+
20+
<dependencyManagement>
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.apache.logging.log4j</groupId>
24+
<artifactId>log4j-bom</artifactId>
25+
<version>${log4j2.version}</version>
26+
<scope>import</scope>
27+
<type>pom</type>
28+
</dependency>
29+
</dependencies>
30+
</dependencyManagement>
1931

2032
<dependencies>
2133
<dependency>
@@ -59,6 +71,7 @@
5971

6072
<properties>
6173
<activiti.version>6.0.0</activiti.version>
74+
<log4j2.version>2.17.1</log4j2.version>
6275
</properties>
6376

6477
</project>

‎spring-boot-modules/spring-boot-2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</build>
6363

6464
<properties>
65-
<log4j2.version>2.14.1</log4j2.version>
65+
<log4j2.version>2.17.1</log4j2.version>
6666
<spring-core.version>5.3.15</spring-core.version>
6767
<maven.compiler.target>11</maven.compiler.target>
6868
<maven.compiler.source>11</maven.compiler.source>

‎spring-boot-modules/spring-boot-logging-log4j2/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
<!-- used only in dependency management to force this version, not included as a direct dependency -->
103103
<junit.version>4.13.2</junit.version>
104104
<junit-jupiter.version>5.8.1</junit-jupiter.version>
105+
<log4j2.version>2.17.1</log4j2.version>
105106
</properties>
106107

107108
</project>

‎spring-boot-modules/spring-boot-mvc-birt/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<maven.compiler.target>1.8</maven.compiler.target>
7171
<eclipse.birt.runtime.version>4.8.0</eclipse.birt.runtime.version>
7272
<log4j.version>1.2.17</log4j.version>
73+
<log4j2.version>2.17.1</log4j2.version>
7374
</properties>
7475

7576
</project>

‎spring-boot-modules/spring-boot-react/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
<version>1.0.0-SNAPSHOT</version>
1212
</parent>
1313

14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.apache.logging.log4j</groupId>
18+
<artifactId>log4j-bom</artifactId>
19+
<version>${log4j2.version}</version>
20+
<scope>import</scope>
21+
<type>pom</type>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
25+
1426
<dependencies>
1527
<dependency>
1628
<groupId>org.springframework.boot</groupId>
@@ -128,6 +140,7 @@
128140
<yarn.version>v1.12.1</yarn.version>
129141
<spring-boot.version>2.4.4</spring-boot.version>
130142
<javafaker.version>1.0.2</javafaker.version>
143+
<log4j2.version>2.17.1</log4j2.version>
131144
</properties>
132145

133146
</project>

‎spring-boot-modules/spring-boot-swagger-keycloak/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.apache.logging.log4j</groupId>
29+
<artifactId>log4j-bom</artifactId>
30+
<version>${log4j2.version}</version>
31+
<scope>import</scope>
32+
<type>pom</type>
33+
</dependency>
2734
</dependencies>
2835
</dependencyManagement>
2936

@@ -62,6 +69,7 @@
6269
<spring-boot.version>2.4.5</spring-boot.version>
6370
<springfox.version>3.0.0</springfox.version>
6471
<keycloak.version>15.0.2</keycloak.version>
72+
<log4j2.version>2.17.1</log4j2.version>
6573
</properties>
6674

6775
</project>

‎spring-boot-modules/spring-boot-testing/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
<version>1.0.0-SNAPSHOT</version>
1515
</parent>
1616

17+
<dependencyManagement>
18+
<dependencies>
19+
<dependency>
20+
<groupId>org.apache.logging.log4j</groupId>
21+
<artifactId>log4j-bom</artifactId>
22+
<version>${log4j2.version}</version>
23+
<scope>import</scope>
24+
<type>pom</type>
25+
</dependency>
26+
</dependencies>
27+
</dependencyManagement>
28+
1729
<dependencies>
1830
<dependency>
1931
<groupId>org.springframework.boot</groupId>
@@ -131,6 +143,7 @@
131143
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
132144
<redis.version>0.7.2</redis.version>
133145
<spring-boot.version>2.5.0</spring-boot.version>
146+
<log4j2.version>2.17.1</log4j2.version>
134147
</properties>
135148

136149
</project>

‎spring-cloud/spring-cloud-contract/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121

2222
<dependencyManagement>
2323
<dependencies>
24+
<dependency>
25+
<groupId>org.apache.logging.log4j</groupId>
26+
<artifactId>log4j-bom</artifactId>
27+
<version>${log4j2.version}</version>
28+
<scope>import</scope>
29+
<type>pom</type>
30+
</dependency>
2431
<dependency>
2532
<groupId>org.springframework.boot</groupId>
2633
<artifactId>spring-boot-starter-web</artifactId>
@@ -55,6 +62,7 @@
5562
<properties>
5663
<spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
5764
<spring-boot.version>2.1.4.RELEASE</spring-boot.version>
65+
<log4j2.version>2.17.1</log4j2.version>
5866
</properties>
5967

6068
</project>

‎spring-cloud/spring-cloud-eureka-self-preservation/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
<artifactId>spring-cloud</artifactId>
1515
<version>1.0.0-SNAPSHOT</version>
1616
</parent>
17+
18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.apache.logging.log4j</groupId>
22+
<artifactId>log4j-bom</artifactId>
23+
<version>${log4j2.version}</version>
24+
<scope>import</scope>
25+
<type>pom</type>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
1729

1830
<modules>
1931
<module>spring-cloud-eureka-server</module>
@@ -32,6 +44,7 @@
3244
<properties>
3345
<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
3446
<spring-cloud-dependencies.version>Greenwich.SR3</spring-cloud-dependencies.version>
47+
<log4j2.version>2.17.1</log4j2.version>
3548
</properties>
3649

3750
</project>

‎spring-cloud/spring-cloud-eureka/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
<artifactId>spring-cloud</artifactId>
1515
<version>1.0.0-SNAPSHOT</version>
1616
</parent>
17+
18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.apache.logging.log4j</groupId>
22+
<artifactId>log4j-bom</artifactId>
23+
<version>${log4j2.version}</version>
24+
<scope>import</scope>
25+
<type>pom</type>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
1729

1830
<modules>
1931
<module>spring-cloud-eureka-server</module>
@@ -34,6 +46,7 @@
3446
<properties>
3547
<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
3648
<spring-cloud-dependencies.version>Greenwich.RELEASE</spring-cloud-dependencies.version>
49+
<log4j2.version>2.17.1</log4j2.version>
3750
</properties>
3851

3952
</project>

‎spring-cloud/spring-cloud-load-balancer/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@
1919
<module>spring-cloud-loadbalancer-server</module>
2020
<module>spring-cloud-loadbalancer-client</module>
2121
</modules>
22+
23+
<dependencyManagement>
24+
<dependencies>
25+
<dependency>
26+
<groupId>org.apache.logging.log4j</groupId>
27+
<artifactId>log4j-bom</artifactId>
28+
<version>${log4j2.version}</version>
29+
<scope>import</scope>
30+
<type>pom</type>
31+
</dependency>
32+
</dependencies>
33+
</dependencyManagement>
2234

2335
<dependencies>
2436
<dependency>
@@ -32,6 +44,7 @@
3244
<properties>
3345
<spring-boot.version>2.6.1</spring-boot.version>
3446
<spring-cloud.version>2021.0.0</spring-cloud.version>
47+
<log4j2.version>2.17.1</log4j2.version>
3548
</properties>
3649

3750
</project>

‎spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<!-- used only in dependency management to force this version, not included as a direct dependency -->
7979
<junit.version>4.13.2</junit.version>
8080
<junit-jupiter.version>5.8.1</junit-jupiter.version>
81+
<log4j2.version>2.17.1</log4j2.version>
8182
</properties>
8283

8384
</project>

‎spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717

1818
<dependencyManagement>
1919
<dependencies>
20+
<dependency>
21+
<groupId>org.apache.logging.log4j</groupId>
22+
<artifactId>log4j-bom</artifactId>
23+
<version>${log4j2.version}</version>
24+
<scope>import</scope>
25+
<type>pom</type>
26+
</dependency>
2027
<dependency>
2128
<groupId>org.springframework.cloud</groupId>
2229
<artifactId>spring-cloud-starter-parent</artifactId>
@@ -45,5 +52,9 @@
4552
<scope>test</scope>
4653
</dependency>
4754
</dependencies>
55+
56+
<properties>
57+
<log4j2.version>2.17.1</log4j2.version>
58+
</properties>
4859

4960
</project>

0 commit comments

Comments
 (0)