Skip to content

Commit

Permalink
Update Ares and other dependencies (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strohgelaender
Strohgelaender authored Aug 11, 2023
1 parent 3c99f27 commit 5af3b9e
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 36 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/gradle-wrapper-validation.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "Validate Gradle Wrapper"
on:
push:
branches:
- main
paths:
- '**/gradle/**'
pull_request:
branches: [main]
paths:
- '**/gradle/**'

jobs:
validation:
name: "Gradle Wrapper Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
14 changes: 7 additions & 7 deletions artemis-java-template/build.gradle
View file
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.14'
id 'com.github.spotbugs' version '5.1.1'
id 'maven-publish'
id 'com.teamscale' version '30.0.2'
id 'com.teamscale' version '30.1.1'
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.27'
id 'org.springframework.boot' version '3.1.2'
id 'io.spring.dependency-management' version '1.1.2'
id 'org.checkerframework' version '0.6.30'
}

apply plugin: 'java'
Expand All @@ -19,8 +19,8 @@ repositories {
}

dependencies {
testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.11.3'
implementation 'org.apache.commons:commons-lang3:3.12.0'
testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.13.0'
implementation 'org.apache.commons:commons-lang3:3.13.0'
}

def assignmentSrcDir = "assignment/src"
Expand Down
Binary file modified artemis-java-template/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
3 changes: 2 additions & 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,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion artemis-java-template/gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down
56 changes: 29 additions & 27 deletions artemis-java-template/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
<argLine>-Dfile.encoding=UTF-8</argLine>
<javafx.version>17.0.2</javafx.version>
<mockito.version>5.2.0</mockito.version>
<springboot.version>3.1.0</springboot.version>
<bytebuddy.version>1.14.4</bytebuddy.version>
<springboot.version>3.1.2</springboot.version>
<bytebuddy.version>1.14.5</bytebuddy.version>
<scaConfigDirectory>${project.basedir}/staticCodeAnalysisConfig</scaConfigDirectory>
<analyzeTests>false</analyzeTests>
</properties>
<dependencies>
<dependency>
<groupId>de.tum.in.ase</groupId>
<artifactId>artemis-java-test-sandbox</artifactId>
<version>1.11.3</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.9.2</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-testkit</artifactId>
<version>1.9.2</version>
<version>1.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20230618</version>
</dependency>
<dependency>
<groupId>me.xdrop</groupId>
Expand Down Expand Up @@ -87,7 +87,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>6.5.0.202303070854-r</version>
<version>6.6.0.202305301015-r</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down Expand Up @@ -117,7 +117,7 @@
<dependency>
<groupId>com.konghq</groupId>
<artifactId>unirest-java</artifactId>
<version>3.14.1</version>
<version>3.14.5</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand Down Expand Up @@ -157,7 +157,7 @@
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
<version>1.7.2</version>
<version>1.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -183,7 +183,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-components</artifactId>
<version>10.0</version>
<version>14.1</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -251,7 +251,7 @@
<optimize>true</optimize>
<failOnError>false</failOnError>
<compilerArguments>
<proceedOnError />
<proceedOnError/>
</compilerArguments>
</configuration>
</execution>
Expand All @@ -260,23 +260,23 @@
<dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-jdt</artifactId>
<version>3.0.4</version>
<version>4.0.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M8</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</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.4.2</version>
<version>3.6.0</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -339,7 +339,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.12.0</version>
<version>10.12.2</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -404,6 +404,7 @@
<requireFilesDontExist>
<files>
<file>${project.build.outputDirectory}/ch/qos/logback/</file>
<file>${project.build.outputDirectory}/com/github/javaparser/</file>
<file>${project.build.outputDirectory}/com/intellij/</file>
<file>${project.build.outputDirectory}/com/sun/</file>
<file>${project.build.outputDirectory}/de/tum/in/test/api/</file>
Expand Down Expand Up @@ -437,29 +438,30 @@
<profiles>
<profile>
<id>coverage</id>
<dependencies>
<dependency>
<groupId>com.teamscale</groupId>
<artifactId>impacted-test-engine</artifactId>
<version>30.1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
<configuration>
<systemPropertyVariables>
<ares.security.trustedpackages>okhttp3,com.teamscale,retrofit2,shadow,com.squareup,okio</ares.security.trustedpackages>
</systemPropertyVariables>
</configuration>
<dependencies>
<dependency>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-surefire-provider</artifactId>
<version>30.0.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-maven-plugin</artifactId>
<version>30.0.2</version>
<version>30.1.1</version>
<configuration>
<teamscaleUrl>http://localhost</teamscaleUrl>
<accessToken>dummy</accessToken>
Expand Down

0 comments on commit 5af3b9e

Please sign in to comment.