Skip to content

Commit 37a1715

Browse files
ulisseslimaulisseslima
authored
Merge pull request #18708 from Bipinkumar27/JAVA-47968
JAVA-47968: Fixes made for jenkins build warning
2 parents 62c3b15 + d550838 commit 37a1715

File tree

13 files changed

+66
-23
lines changed

13 files changed

+66
-23
lines changed

‎akka-modules/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class UserServerUnitTest extends JUnitRouteTest {
1919

2020
TestRoute appRoute = testRoute(new UserServer(userActorRef).routes());
2121

22-
@Ignore
2322
@Test
2423
public void whenRequest_thenActorResponds() {
2524

‎apache-httpclient-2/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<configuration>
6565
<source>11</source>
6666
<target>11</target>
67+
<release>11</release>
6768
</configuration>
6869
</plugin>
6970
<plugin>

‎apache-httpclient/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<configuration>
8181
<source>11</source>
8282
<target>11</target>
83+
<release>11</release>
8384
</configuration>
8485
</plugin>
8586
<plugin>

‎apache-libraries-2/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
<configuration>
234234
<source>${maven.compiler.source}</source>
235235
<target>${maven.compiler.target}</target>
236+
<release>${maven.compiler.release}</release>
236237
</configuration>
237238
</plugin>
238239
<plugin>
@@ -266,6 +267,7 @@
266267
<geode.core>1.15.1</geode.core>
267268
<maven.compiler.source>17</maven.compiler.source>
268269
<maven.compiler.target>17</maven.compiler.target>
270+
<maven.compiler.release>17</maven.compiler.release>
269271
</properties>
270272

271273
</project>

‎apache-libraries/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
<configuration>
114114
<source>15</source>
115115
<target>15</target>
116+
<release>15</release>
116117
</configuration>
117118
</plugin>
118119
</plugins>

‎aws-modules/aws-dynamodb-v2/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
<configuration>
9292
<source>9</source>
9393
<target>9</target>
94+
<release>9</release>
9495
</configuration>
9596
</plugin>
9697
</plugins>

‎aws-modules/aws-lambda-modules/lambda-function/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<!-- Exclude module-info.class -->
107107
<exclude>**/module-info.class</exclude>
108108
<!-- Exclude overlapping META-INF files -->
109+
<exclude>META-INF/MANIFEST.MF</exclude>
109110
<exclude>META-INF/LICENSE</exclude>
110111
<exclude>META-INF/NOTICE</exclude>
111112
<exclude>META-INF/LICENSE.txt</exclude>

‎aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,26 @@
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-shade-plugin</artifactId>
61-
<version>3.1.1</version>
61+
<version>${maven-shade-plugin.version}</version>
6262
<configuration>
63+
<createDependencyReducedPom>false</createDependencyReducedPom>
64+
<filters>
65+
<filter>
66+
<artifact>*:*</artifact>
67+
<excludes>
68+
<exclude>**/module-info.class</exclude>
69+
<exclude>META-INF/LICENSE</exclude>
70+
<exclude>META-INF/LICENSE.md</exclude>
71+
<exclude>META-INF/LICENSE.txt</exclude>
72+
<exclude>META-INF/NOTICE</exclude>
73+
<exclude>META-INF/NOTICE.md</exclude>
74+
<exclude>META-INF/NOTICE.txt</exclude>
75+
<exclude>META-INF/MANIFEST.MF</exclude>
76+
<exclude>META-INF/DEPENDENCIES</exclude>
77+
<exclude>META-INF/services/com.fasterxml.jackson.core.JsonFactory</exclude>
78+
</excludes>
79+
</filter>
80+
</filters>
6381
</configuration>
6482
<executions>
6583
<execution>
@@ -76,6 +94,7 @@
7694
<properties>
7795
<maven.compiler.source>11</maven.compiler.source>
7896
<maven.compiler.target>11</maven.compiler.target>
97+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
7998
<hibernate.version>6.4.2.Final</hibernate.version>
8099
<aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
81100
<aws-lambda-java-events.version>3.1.0</aws-lambda-java-events.version>

‎aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,27 @@
8787
<plugin>
8888
<groupId>org.apache.maven.plugins</groupId>
8989
<artifactId>maven-shade-plugin</artifactId>
90-
<version>3.2.4</version>
90+
<version>${maven-shade-plugin.version}</version>
9191
<configuration>
92+
<createDependencyReducedPom>false</createDependencyReducedPom>
93+
<filters>
94+
<filter>
95+
<artifact>*:*</artifact>
96+
<excludes>
97+
<exclude>**/module-info.class</exclude>
98+
<exclude>META-INF/LICENSE</exclude>
99+
<exclude>META-INF/LICENSE.md</exclude>
100+
<exclude>META-INF/LICENSE.txt</exclude>
101+
<exclude>META-INF/NOTICE</exclude>
102+
<exclude>META-INF/NOTICE.md</exclude>
103+
<exclude>META-INF/NOTICE.txt</exclude>
104+
<exclude>META-INF/MANIFEST.MF</exclude>
105+
<exclude>META-INF/DEPENDENCIES</exclude>
106+
<exclude>META-INF/services/com.fasterxml.jackson.core.JsonFactory</exclude>
107+
<exclude>META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat</exclude>
108+
</excludes>
109+
</filter>
110+
</filters>
92111
</configuration>
93112
<executions>
94113
<execution>
@@ -105,6 +124,7 @@
105124
<properties>
106125
<maven.compiler.source>11</maven.compiler.source>
107126
<maven.compiler.target>11</maven.compiler.target>
127+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
108128
<aws-lambda-java-core.version>1.2.1</aws-lambda-java-core.version>
109129
<aws-lambda-java-events.version>3.6.0</aws-lambda-java-events.version>
110130
<lightweight-config.version>1.2.1</lightweight-config.version>

‎aws-modules/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<artifactId>aws-java-sdk-dynamodb</artifactId>
5454
<version>${aws-java-sdk-dynamodb.version}</version>
5555
<scope>compile</scope>
56+
<exclusions>
57+
<exclusion>
58+
<groupId>commons-logging</groupId>
59+
<artifactId>commons-logging</artifactId>
60+
</exclusion>
61+
</exclusions>
5662
</dependency>
5763
</dependencies>
5864

0 commit comments

Comments
 (0)