Skip to content

Commit 180f05e

Browse files
kruschekrusche
committed
update dependencies and clean up Dockerfile
1 parent 14608ef commit 180f05e

File tree

5 files changed

+50
-57
lines changed

5 files changed

+50
-57
lines changed

‎Dockerfile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
FROM maven:3.9.6-eclipse-temurin-17
1+
FROM maven:3.9.11-eclipse-temurin-17
22

3-
MAINTAINER Stephan Krusche <krusche@tum.de>
3+
LABEL maintainer="Stephan Krusche <krusche@tum.de>"
44

5-
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
6-
gnupg \
7-
&& rm -rf /var/lib/apt/lists/*
5+
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends gnupg && \
6+
rm -rf /var/lib/apt/lists/*
87

9-
ENV M2_HOME /usr/share/maven
8+
ENV M2_HOME=/usr/share/maven
109

1110
RUN echo "$LANG -- $LANGUAGE -- $LC_ALL" \
1211
&& curl --version \
@@ -16,7 +15,6 @@ RUN echo "$LANG -- $LANGUAGE -- $LC_ALL" \
1615
&& java --version \
1716
&& javac --version
1817

19-
2018
ADD artemis-java-template /opt/artemis-java-template
2119

2220
RUN cd /opt/artemis-java-template && pwd && ls -la && mvn clean install test && mvn spotbugs:spotbugs checkstyle:checkstyle pmd:pmd

‎artemis-java-template/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
22
id 'checkstyle'
33
id 'pmd'
4-
id 'com.github.spotbugs' version '6.1.0'
4+
id 'com.github.spotbugs' version '6.2.2'
55
id 'maven-publish'
6-
id 'com.teamscale' version '34.2.1'
6+
id 'com.teamscale' version '35.2.1'
77
id 'org.openjfx.javafxplugin' version '0.1.0'
8-
id 'org.springframework.boot' version '3.4.1'
8+
id 'org.springframework.boot' version '3.5.4'
99
id 'io.spring.dependency-management' version '1.1.7'
10-
id 'org.checkerframework' version '0.6.48'
10+
id 'org.checkerframework' version '0.6.56'
1111
}
1212

1313
apply plugin: 'java'
@@ -20,9 +20,9 @@ repositories {
2020

2121
dependencies {
2222
testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.13.0'
23-
testImplementation 'net.bytebuddy:byte-buddy:1.15.11'
23+
testImplementation 'net.bytebuddy:byte-buddy:1.17.6'
2424

25-
implementation 'org.apache.commons:commons-lang3:3.17.0'
25+
implementation 'org.apache.commons:commons-lang3:3.18.0'
2626
}
2727

2828
def assignmentSrcDir = "assignment/src"
@@ -99,18 +99,18 @@ spotbugs {
9999
spotbugsTest.enabled = false
100100
spotbugsMain.reports {
101101
xml {
102-
enabled = true
103-
outputLocation = file('target/spotbugsXml.xml')
102+
required.set(true)
103+
outputLocation.set(file('target/spotbugsXml.xml'))
104104
}
105-
html.enabled = false
105+
html.required.set(false)
106106
}
107107
}
108108

109109
pmd {
110110
ruleSets = ["$scaConfigDirectory/pmd-configuration.xml"]
111111
rulesMinimumPriority = 5
112112
ignoreFailures = true
113-
toolVersion = '7.2.0'
113+
toolVersion = '7.16.0'
114114
// exclude the test files
115115
pmdTest.enabled = false
116116
pmdMain.reports {
@@ -120,7 +120,7 @@ pmd {
120120

121121
publishing {
122122
publications {
123-
mavenJava(MavenPublication) {
123+
create("mavenJava", MavenPublication) {
124124
groupId = "de.tum.in.ase"
125125
artifactId = "Artemis-Java-Gradle-Template"
126126
version = '1.6'

‎artemis-java-template/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version = '1.0'
1+
version = '1.1.0'
22
description = 'Artemis Java Template'
33
java.sourceCompatibility = JavaVersion.VERSION_17

‎artemis-java-template/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎artemis-java-template/pom.xml‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<groupId>de.tum.in.ase</groupId>
55
<artifactId>Artemis-Java-Template</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.6</version>
7+
<version>1.7</version>
88
<name>Artemis Java Template</name>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<argLine>-Dfile.encoding=UTF-8</argLine>
12-
<javafx.version>17.0.8</javafx.version>
13-
<mockito.version>5.15.2</mockito.version>
14-
<springboot.version>3.4.1</springboot.version>
15-
<bytebuddy.version>1.15.11</bytebuddy.version>
12+
<javafx.version>17.0.16</javafx.version>
13+
<mockito.version>5.18.0</mockito.version>
14+
<springboot.version>3.5.4</springboot.version>
15+
<bytebuddy.version>1.17.6</bytebuddy.version>
1616
<scaConfigDirectory>${project.basedir}/staticCodeAnalysisConfig</scaConfigDirectory>
1717
<analyzeTests>false</analyzeTests>
1818
</properties>
@@ -25,29 +25,24 @@
2525
<dependency>
2626
<groupId>org.apache.commons</groupId>
2727
<artifactId>commons-lang3</artifactId>
28-
<version>3.17.0</version>
28+
<version>3.18.0</version>
2929
</dependency>
3030
<dependency>
31-
<groupId>org.junit.vintage</groupId>
32-
<artifactId>junit-vintage-engine</artifactId>
33-
<version>5.11.4</version>
31+
<groupId>org.junit.jupiter</groupId>
32+
<artifactId>junit-jupiter</artifactId>
33+
<version>5.13.4</version>
3434
<scope>test</scope>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.junit.platform</groupId>
3838
<artifactId>junit-platform-testkit</artifactId>
39-
<version>1.11.4</version>
39+
<version>1.13.4</version>
4040
<scope>test</scope>
4141
</dependency>
42-
<dependency>
43-
<groupId>junit</groupId>
44-
<artifactId>junit</artifactId>
45-
<version>4.13.2</version>
46-
</dependency>
4742
<dependency>
4843
<groupId>org.json</groupId>
4944
<artifactId>json</artifactId>
50-
<version>20250107</version>
45+
<version>20250517</version>
5146
</dependency>
5247
<dependency>
5348
<groupId>me.xdrop</groupId>
@@ -77,7 +72,7 @@
7772
<dependency>
7873
<groupId>com.fasterxml.jackson.core</groupId>
7974
<artifactId>jackson-databind</artifactId>
80-
<version>2.18.2</version>
75+
<version>2.19.2</version>
8176
</dependency>
8277
<dependency>
8378
<groupId>org.jsonschema2pojo</groupId>
@@ -87,12 +82,12 @@
8782
<dependency>
8883
<groupId>org.eclipse.jgit</groupId>
8984
<artifactId>org.eclipse.jgit</artifactId>
90-
<version>7.1.0.202411261347-r</version>
85+
<version>7.3.0.202506031305-r</version>
9186
</dependency>
9287
<dependency>
9388
<groupId>org.apache.logging.log4j</groupId>
9489
<artifactId>log4j-core</artifactId>
95-
<version>2.24.3</version>
90+
<version>2.25.1</version>
9691
</dependency>
9792
<dependency>
9893
<groupId>org.springframework.boot</groupId>
@@ -117,12 +112,12 @@
117112
<dependency>
118113
<groupId>com.konghq</groupId>
119114
<artifactId>unirest-java-core</artifactId>
120-
<version>4.4.5</version>
115+
<version>4.5.0</version>
121116
</dependency>
122117
<dependency>
123118
<groupId>org.easymock</groupId>
124119
<artifactId>easymock</artifactId>
125-
<version>5.5.0</version>
120+
<version>5.6.0</version>
126121
</dependency>
127122
<dependency>
128123
<groupId>org.mockito</groupId>
@@ -142,7 +137,7 @@
142137
<dependency>
143138
<groupId>com.tngtech.archunit</groupId>
144139
<artifactId>archunit</artifactId>
145-
<version>1.3.0</version>
140+
<version>1.4.1</version>
146141
</dependency>
147142
<dependency>
148143
<groupId>org.jasypt</groupId>
@@ -157,7 +152,7 @@
157152
<dependency>
158153
<groupId>net.jqwik</groupId>
159154
<artifactId>jqwik</artifactId>
160-
<version>1.9.2</version>
155+
<version>1.9.3</version>
161156
<scope>test</scope>
162157
</dependency>
163158
<dependency>
@@ -178,7 +173,7 @@
178173
<dependency>
179174
<groupId>org.codehaus.plexus</groupId>
180175
<artifactId>plexus-interpolation</artifactId>
181-
<version>1.27</version>
176+
<version>1.28</version>
182177
</dependency>
183178
<dependency>
184179
<groupId>org.codehaus.plexus</groupId>
@@ -231,7 +226,7 @@
231226
<plugin>
232227
<groupId>org.apache.maven.plugins</groupId>
233228
<artifactId>maven-compiler-plugin</artifactId>
234-
<version>3.13.0</version>
229+
<version>3.14.0</version>
235230
<configuration>
236231
<source>17</source>
237232
<target>17</target>
@@ -260,19 +255,19 @@
260255
<dependency>
261256
<groupId>org.eclipse.tycho</groupId>
262257
<artifactId>tycho-compiler-jdt</artifactId>
263-
<version>4.0.8</version>
258+
<version>4.0.13</version>
264259
</dependency>
265260
</dependencies>
266261
</plugin>
267262
<plugin>
268263
<groupId>org.apache.maven.plugins</groupId>
269264
<artifactId>maven-surefire-plugin</artifactId>
270-
<version>3.2.5</version>
265+
<version>3.5.3</version>
271266
</plugin>
272267
<plugin>
273268
<groupId>org.apache.maven.plugins</groupId>
274269
<artifactId>maven-failsafe-plugin</artifactId>
275-
<version>3.2.5</version>
270+
<version>3.5.3</version>
276271
</plugin>
277272
<plugin>
278273
<artifactId>maven-resources-plugin</artifactId>
@@ -334,12 +329,12 @@
334329
<plugin>
335330
<groupId>org.apache.maven.plugins</groupId>
336331
<artifactId>maven-checkstyle-plugin</artifactId>
337-
<version>3.3.1</version>
332+
<version>3.6.0</version>
338333
<dependencies>
339334
<dependency>
340335
<groupId>com.puppycrawl.tools</groupId>
341336
<artifactId>checkstyle</artifactId>
342-
<version>10.17.0</version>
337+
<version>10.26.1</version>
343338
</dependency>
344339
</dependencies>
345340
<configuration>
@@ -354,17 +349,17 @@
354349
<plugin>
355350
<groupId>org.apache.maven.plugins</groupId>
356351
<artifactId>maven-pmd-plugin</artifactId>
357-
<version>3.22.0</version>
352+
<version>3.27.0</version>
358353
<dependencies>
359354
<dependency>
360355
<groupId>net.sourceforge.pmd</groupId>
361356
<artifactId>pmd-core</artifactId>
362-
<version>7.2.0</version>
357+
<version>7.16.0</version>
363358
</dependency>
364359
<dependency>
365360
<groupId>net.sourceforge.pmd</groupId>
366361
<artifactId>pmd-java</artifactId>
367-
<version>7.2.0</version>
362+
<version>7.16.0</version>
368363
</dependency>
369364
</dependencies>
370365
<configuration>
@@ -389,7 +384,7 @@
389384
<plugin>
390385
<groupId>org.apache.maven.plugins</groupId>
391386
<artifactId>maven-enforcer-plugin</artifactId>
392-
<version>3.4.1</version>
387+
<version>3.6.1</version>
393388
<executions>
394389
<execution>
395390
<id>enforce-no-student-code-in-trusted-packages</id>
@@ -442,7 +437,7 @@
442437
<dependency>
443438
<groupId>com.teamscale</groupId>
444439
<artifactId>impacted-test-engine</artifactId>
445-
<version>33.1.2</version>
440+
<version>35.2.1</version>
446441
<scope>test</scope>
447442
</dependency>
448443
</dependencies>
@@ -451,7 +446,7 @@
451446
<plugin>
452447
<groupId>org.apache.maven.plugins</groupId>
453448
<artifactId>maven-surefire-plugin</artifactId>
454-
<version>3.2.5</version>
449+
<version>3.5.3</version>
455450
<configuration>
456451
<systemPropertyVariables>
457452
<ares.security.trustedpackages>okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio</ares.security.trustedpackages>
@@ -461,7 +456,7 @@
461456
<plugin>
462457
<groupId>com.teamscale</groupId>
463458
<artifactId>teamscale-maven-plugin</artifactId>
464-
<version>33.1.2</version>
459+
<version>35.2.1</version>
465460
<configuration>
466461
<teamscaleUrl>http://localhost</teamscaleUrl>
467462
<accessToken>dummy</accessToken>

0 commit comments

Comments
 (0)