Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Gradle 8.1.1 #133

Merged
merged 2 commits into from
Jun 5, 2023
Merged

Update to Gradle 8.1.1 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3329911
Update to Gradle 8.1.1
Strohgelaender Jun 1, 2023
d105fbb
Update plugins
Strohgelaender Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions artemis-java-template/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id 'checkstyle'
id 'pmd'
id 'com.github.spotbugs' version '5.0.13'
id 'com.github.spotbugs' version '5.0.14'
id 'maven-publish'
id 'com.teamscale' version '29.1.2'
id 'org.openjfx.javafxplugin' version '0.0.13'
id 'org.springframework.boot' version '3.0.3'
id 'com.teamscale' version '30.0.2'
id 'org.openjfx.javafxplugin' version '0.0.14'
id 'org.springframework.boot' version '3.1.0'
id 'io.spring.dependency-management' version '1.1.0'
id 'org.checkerframework' version '0.6.24'
id 'org.checkerframework' version '0.6.27'
}

apply plugin: 'java'
Expand Down
Binary file modified artemis-java-template/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion artemis-java-template/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 4 additions & 3 deletions artemis-java-template/gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
42 changes: 20 additions & 22 deletions artemis-java-template/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<argLine>-Dfile.encoding=UTF-8</argLine>
<javafx.version>17.0.2</javafx.version>
<mockito.version>5.1.1</mockito.version>
<springboot.version>3.0.3</springboot.version>
<bytebuddy.version>1.14.0</bytebuddy.version>
<mockito.version>5.2.0</mockito.version>
<springboot.version>3.1.0</springboot.version>
<bytebuddy.version>1.14.4</bytebuddy.version>
<scaConfigDirectory>${project.basedir}/staticCodeAnalysisConfig</scaConfigDirectory>
<analyzeTests>false</analyzeTests>
</properties>
Expand Down Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220924</version>
<version>20230227</version>
</dependency>
<dependency>
<groupId>me.xdrop</groupId>
Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.2</version>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.jsonschema2pojo</groupId>
Expand All @@ -87,7 +87,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>6.4.0.202211300538-r</version>
<version>6.5.0.202303070854-r</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -173,7 +173,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.1.0</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand All @@ -194,7 +194,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.0</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.sonatype.spice</groupId>
Expand All @@ -216,7 +216,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</dependency>
</dependencies>
<build>
Expand All @@ -231,7 +231,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<source>17</source>
<target>17</target>
Expand Down Expand Up @@ -260,14 +260,14 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-jdt</artifactId>
<version>3.0.3</version>
<version>3.0.4</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M9</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -314,7 +314,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.3.0</version>
<version>4.7.3.4</version>
<configuration>
<!-- Do not analyze the files in the test directory -->
<includeTests>${analyzeTests}</includeTests>
Expand All @@ -334,12 +334,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.8.0</version>
<version>10.12.0</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -349,14 +349,12 @@
Add sun_checks.xml to check for the official Oracle code conventions or add google_checks.xml to
check for the Google's Java Style Guide -->
<configLocation>${scaConfigDirectory}/checkstyle-configuration.xml</configLocation>
<!-- No documentation and not needed -->
<enableRSS>false</enableRSS>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
Expand Down Expand Up @@ -391,7 +389,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce-no-student-code-in-trusted-packages</id>
Expand Down Expand Up @@ -444,7 +442,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M9</version>
<version>3.1.0</version>
<configuration>
<systemPropertyVariables>
<ares.security.trustedpackages>okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio</ares.security.trustedpackages>
Expand All @@ -454,14 +452,14 @@
<dependency>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-surefire-provider</artifactId>
<version>29.1.2</version>
<version>30.0.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-maven-plugin</artifactId>
<version>29.1.2</version>
<version>30.0.2</version>
<configuration>
<teamscaleUrl>http://localhost</teamscaleUrl>
<accessToken>dummy</accessToken>
Expand Down