Skip to content

Commit cfeb6a4

Browse files
author
Dennis Kieselhorst
authored
Merge pull request #397 from deki/jdk11-build
Allow compilation with JDK version >8 (update jacoco and spotbugs, added activation dependency)
2 parents 5bfacf2 + 0871464 commit cfeb6a4

File tree

7 files changed

+28
-13
lines changed
  • aws-serverless-java-container-core
  • aws-serverless-java-container-jersey
  • aws-serverless-java-container-spark
  • aws-serverless-java-container-springboot2
  • aws-serverless-java-container-spring
  • aws-serverless-java-container-struts2

7 files changed

+28
-13
lines changed

‎aws-serverless-java-container-core/pom.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<plugin>
105105
<groupId>org.jacoco</groupId>
106106
<artifactId>jacoco-maven-plugin</artifactId>
107-
<version>0.8.1</version>
107+
<version>0.8.6</version>
108108
<configuration>
109109
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
110110
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -151,7 +151,7 @@
151151
<plugin>
152152
<groupId>com.github.spotbugs</groupId>
153153
<artifactId>spotbugs-maven-plugin</artifactId>
154-
<version>3.1.1</version>
154+
<version>4.2.0</version>
155155
<configuration>
156156
<!--
157157
Enables analysis which takes more memory but finds more bugs.
@@ -210,4 +210,19 @@
210210
</plugins>
211211
</build>
212212

213+
<profiles>
214+
<profile>
215+
<id>java9-plus</id>
216+
<activation>
217+
<jdk>[9,)</jdk>
218+
</activation>
219+
<dependencies>
220+
<dependency>
221+
<groupId>com.sun.activation</groupId>
222+
<artifactId>jakarta.activation</artifactId>
223+
<version>1.2.2</version>
224+
</dependency>
225+
</dependencies>
226+
</profile>
227+
</profiles>
213228
</project>

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/filters/UrlPathValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
8181

8282
// switching to this mechanism to avoid ReDOS attacks on the path pattern regex
8383
try {
84-
URI uriPath = new URI(path);
84+
new URI(path);
8585
} catch (URISyntaxException e) {
8686
log.error("Invalid uri path in doFilter", e);
8787
setErrorResponse(servletResponse);

‎aws-serverless-java-container-jersey/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<plugin>
108108
<groupId>org.jacoco</groupId>
109109
<artifactId>jacoco-maven-plugin</artifactId>
110-
<version>0.8.1</version>
110+
<version>0.8.6</version>
111111
<configuration>
112112
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
113113
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -160,7 +160,7 @@
160160
<plugin>
161161
<groupId>com.github.spotbugs</groupId>
162162
<artifactId>spotbugs-maven-plugin</artifactId>
163-
<version>3.1.1</version>
163+
<version>4.2.0</version>
164164
<configuration>
165165
<!--
166166
Enables analysis which takes more memory but finds more bugs.

‎aws-serverless-java-container-spark/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<plugin>
4848
<groupId>org.jacoco</groupId>
4949
<artifactId>jacoco-maven-plugin</artifactId>
50-
<version>0.8.1</version>
50+
<version>0.8.6</version>
5151
<configuration>
5252
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
5353
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -100,7 +100,7 @@
100100
<plugin>
101101
<groupId>com.github.spotbugs</groupId>
102102
<artifactId>spotbugs-maven-plugin</artifactId>
103-
<version>3.1.1</version>
103+
<version>4.2.0</version>
104104
<configuration>
105105
<!--
106106
Enables analysis which takes more memory but finds more bugs.

‎aws-serverless-java-container-spring/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
<plugin>
189189
<groupId>org.jacoco</groupId>
190190
<artifactId>jacoco-maven-plugin</artifactId>
191-
<version>0.8.1</version>
191+
<version>0.8.6</version>
192192
<configuration>
193193
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
194194
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -241,7 +241,7 @@
241241
<plugin>
242242
<groupId>com.github.spotbugs</groupId>
243243
<artifactId>spotbugs-maven-plugin</artifactId>
244-
<version>3.1.1</version>
244+
<version>4.2.0</version>
245245
<configuration>
246246
<!--
247247
Enables analysis which takes more memory but finds more bugs.

‎aws-serverless-java-container-springboot2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
<plugin>
180180
<groupId>org.jacoco</groupId>
181181
<artifactId>jacoco-maven-plugin</artifactId>
182-
<version>0.8.1</version>
182+
<version>0.8.6</version>
183183
<configuration>
184184
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
185185
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -234,7 +234,7 @@
234234
<plugin>
235235
<groupId>com.github.spotbugs</groupId>
236236
<artifactId>spotbugs-maven-plugin</artifactId>
237-
<version>3.1.1</version>
237+
<version>4.2.0</version>
238238
<configuration>
239239
<!--
240240
Enables analysis which takes more memory but finds more bugs.

‎aws-serverless-java-container-struts2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<plugin>
106106
<groupId>org.jacoco</groupId>
107107
<artifactId>jacoco-maven-plugin</artifactId>
108-
<version>0.8.1</version>
108+
<version>0.8.6</version>
109109
<configuration>
110110
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
111111
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -158,7 +158,7 @@
158158
<plugin>
159159
<groupId>com.github.spotbugs</groupId>
160160
<artifactId>spotbugs-maven-plugin</artifactId>
161-
<version>3.1.1</version>
161+
<version>4.2.0</version>
162162
<configuration>
163163
<!--
164164
Enables analysis which takes more memory but finds more bugs.

0 commit comments

Comments
 (0)