Skip to content

Commit

Permalink
update SCA tools and plugins (#125)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strohgelaender
Strohgelaender authored Feb 27, 2023
1 parent 9f2fbb6 commit 4ee55da
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions artemis-java-template/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
id 'pmd'
id 'com.github.spotbugs' version '5.0.13'
id 'maven-publish'
id 'com.teamscale' version '27.0.1'
id 'com.teamscale' version '29.1.2'
id 'org.openjfx.javafxplugin' version '0.0.13'
id 'org.springframework.boot' version '3.0.2'
id 'org.springframework.boot' version '3.0.3'
id 'io.spring.dependency-management' version '1.1.0'
id 'org.checkerframework' version '0.6.20'
id 'org.checkerframework' version '0.6.24'
}

apply plugin: 'java'
Expand Down
Binary file modified artemis-java-template/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion artemis-java-template/gradle/wrapper/gradle-wrapper.properties
View file
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-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions artemis-java-template/gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
38 changes: 19 additions & 19 deletions artemis-java-template/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<argLine>-Dfile.encoding=UTF-8</argLine>
<javafx.version>17.0.2</javafx.version>
<mockito.version>5.1.1</mockito.version>
<springboot.version>3.0.2</springboot.version>
<bytebuddy.version>1.12.23</bytebuddy.version>
<springboot.version>3.0.3</springboot.version>
<bytebuddy.version>1.14.0</bytebuddy.version>
<scaConfigDirectory>${project.basedir}/staticCodeAnalysisConfig</scaConfigDirectory>
<analyzeTests>false</analyzeTests>
</properties>
Expand Down Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-core</artifactId>
<version>1.1.3</version>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
Expand All @@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.19.0</version>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -260,23 +260,23 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-jdt</artifactId>
<version>2.7.0</version>
<version>3.0.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
<version>3.0.0-M8</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>3.3.0</version>
<executions>
<execution>
<id>copy-resources</id>
Expand All @@ -299,7 +299,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<!-- mvn clean compile assembly:single -->
<version>3.3.0</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -334,12 +334,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.5.0</version>
<version>10.8.0</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -356,17 +356,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.19.0</version>
<version>3.20.0</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>6.52.0</version>
<version>6.55.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>6.52.0</version>
<version>6.55.0</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -391,7 +391,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>enforce-no-student-code-in-trusted-packages</id>
Expand Down Expand Up @@ -444,7 +444,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M9</version>
<configuration>
<systemPropertyVariables>
<ares.security.trustedpackages>okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio</ares.security.trustedpackages>
Expand All @@ -454,18 +454,18 @@
<dependency>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-surefire-provider</artifactId>
<version>26.0.1</version>
<version>29.1.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-maven-plugin</artifactId>
<version>26.0.1</version>
<version>29.1.2</version>
<configuration>
<teamscaleUrl>http://localhost</teamscaleUrl>
<accessToken>dummy</accessToken>
<projectId>${exerciseNamePomXml}-Tests</projectId>
<projectId>Artemis-Java-Template-Tests</projectId>
<username>dummy</username>
<partition>testwise</partition>
<includes>
Expand Down

0 comments on commit 4ee55da

Please sign in to comment.