Skip to content

Commit 0961501

Browse files
authored
Updated Dependencies (#14)
Updated to Java 17 Updated dependencies com.amazonaws:aws-lambda-java-core to '1.2.3' com.google.code.gson:gson to '2.10.1'
1 parent e3567fa commit 0961501

File tree

14 files changed

+283
-174
lines changed

14 files changed

+283
-174
lines changed

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<attribute name="test" value="true"/>
2727
</attributes>
2828
</classpathentry>
29-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
29+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
3030
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
3131
<classpathentry kind="output" path="bin/default"/>
3232
</classpath>

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
# Package Files #
1414
*.jar
15+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
16+
!gradle-wrapper.jar
1517
*.war
1618
*.nar
1719
*.ear
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1+
arguments=
2+
auto.sync=false
3+
build.scans.enabled=false
4+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
15
connection.project.dir=
26
eclipse.preferences.version=1
7+
gradle.user.home=
8+
java.home=
9+
jvm.arguments=
10+
offline.mode=false
11+
override.workspace.settings=false
12+
show.console.view=false
13+
show.executions.view=false
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3-
org.eclipse.jdt.core.compiler.compliance=11
4-
org.eclipse.jdt.core.compiler.source=11
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
3+
org.eclipse.jdt.core.compiler.compliance=17
4+
org.eclipse.jdt.core.compiler.source=17

build.gradle

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,41 @@
11

22
plugins {
3-
id 'com.diffplug.spotless' version '5.12.1'
4-
id 'com.github.spotbugs' version '4.7.0'
5-
id "com.github.ben-manes.versions" version "0.38.0"
3+
id 'java'
4+
id 'maven-publish'
5+
id 'signing'
6+
id 'checkstyle'
7+
id 'com.diffplug.spotless' version '6.22.0'
8+
id 'com.github.spotbugs' version '5.0.14'
9+
id 'com.github.ben-manes.versions' version '0.50.0'
610
}
711

8-
apply plugin: 'java-library'
9-
apply plugin: 'maven-publish'
10-
apply plugin: 'checkstyle'
11-
apply plugin: 'signing'
12-
apply plugin: 'com.diffplug.spotless'
13-
14-
sourceCompatibility = JavaVersion.VERSION_11
15-
targetCompatibility = JavaVersion.VERSION_11
16-
1712
group 'com.formkiq'
18-
version '2.3.1'
13+
version '2.4.0'
1914

15+
spotbugs {
16+
excludeFilter = file("$rootDir/config/spotbugs/spotbugs-exclude.xml")
17+
}
18+
2019
spotless {
2120
java {
2221
googleJavaFormat()
2322
}
2423
}
2524

2625
spotbugsMain {
27-
reports {
28-
html {
29-
enabled = true
30-
destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
31-
stylesheet = 'fancy-hist.xsl'
32-
}
26+
reports {
27+
html {
28+
enabled = true
3329
}
34-
}
30+
}
31+
}
3532

3633
checkstyle {
3734
toolVersion '8.29'
3835
configFile file("config/checkstyle/checkstyle.xml")
3936
configProperties = [project_loc: "${projectDir}"]
40-
}
41-
42-
tasks.withType(Checkstyle).each { checkstyleTask ->
43-
checkstyleTask.doLast {
44-
reports.all { report ->
45-
def outputFile = report.destination
46-
if (outputFile.exists() && outputFile.text.contains("<error ")) {
47-
throw new GradleException("There were checkstyle warnings! For more info check $outputFile")
48-
}
49-
}
50-
}
37+
ignoreFailures = false
38+
maxWarnings = 0
5139
}
5240

5341
checkstyleMain.dependsOn spotlessApply
@@ -63,6 +51,10 @@ check {
6351
java {
6452
withJavadocJar()
6553
withSourcesJar()
54+
55+
toolchain {
56+
languageVersion.set(JavaLanguageVersion.of(17))
57+
}
6658
}
6759

6860
javadoc {
@@ -84,12 +76,12 @@ afterEvaluate {
8476

8577

8678
dependencies {
87-
implementation group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.1'
88-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
89-
testImplementation group: 'com.amazonaws', name: 'aws-lambda-java-events', version: '3.8.0'
79+
implementation group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.3'
80+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
81+
testImplementation group: 'com.amazonaws', name: 'aws-lambda-java-events', version: '3.11.3'
9082
testImplementation group: 'junit', name: 'junit', version:'4.+'
91-
testImplementation group: 'org.mock-server', name: 'mockserver-netty', version: '5.11.2'
92-
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
83+
testImplementation group: 'org.mock-server', name: 'mockserver-netty', version: '5.15.0'
84+
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.9'
9385
}
9486

9587
publishing {
@@ -140,4 +132,4 @@ signing {
140132

141133
check {
142134
dependsOn(tasks.publishToMavenLocal)
143-
}
135+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<!-- Spotbugs filtering.
19+
20+
Spotbugs is a static code analysis tool run as part of the "check" phase of the build.
21+
This file dictates which categories of bugs and individual false positives that we suppress.
22+
23+
For a detailed description of spotbugs bug categories, see https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
24+
-->
25+
<FindBugsFilter>
26+
27+
<Match>
28+
<Bug pattern="EI_EXPOSE_REP"/>
29+
<OR>
30+
<Class name="com.formkiq.lambda.runtime.graalvm.HttpResponse"/>
31+
</OR>
32+
</Match>
33+
34+
<Match>
35+
<Bug pattern="EI_EXPOSE_REP2"/>
36+
<OR>
37+
<Class name="com.formkiq.lambda.runtime.graalvm.HttpResponse"/>
38+
</OR>
39+
</Match>
40+
41+
</FindBugsFilter>

gradle/wrapper/gradle-wrapper.jar

60.6 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)