From 49ec789230beb8db0406d0bdf9dd4f335d624d2c Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Mon, 2 Nov 2020 21:31:46 +0100
Subject: [PATCH] Update dependencies (and make jar much smaller).
---
build.gradle | 23 +++++++++++--------
.../java/org/jastadd/relast/tests/Errors.java | 7 ++----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0c9aca6..4bd217b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,8 @@
import org.jastadd.relast.plugin.RelastTest
+apply plugin: "com.github.ben-manes.versions"
apply plugin: 'java'
+apply plugin: 'java-library'
apply plugin: 'jastadd'
apply plugin: 'application'
apply plugin: "idea"
@@ -21,20 +23,21 @@ buildscript {
repositories.jcenter()
dependencies {
classpath 'org.jastadd:jastaddgradle:1.13.3'
+ classpath "com.github.ben-manes:gradle-versions-plugin:0.34.0"
}
}
+dependencyUpdates.gradleReleaseChannel="current"
+dependencyUpdates.revision="release"
+
dependencies {
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
- testCompile 'org.assertj:assertj-core:3.12.1'
- compile 'com.fasterxml.jackson.core:jackson-core:2.9.8'
- compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
- compile 'org.jastadd:jastadd:2.3.4'
- runtime 'org.jastadd:jastadd:2.3.4'
- compile group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0'
- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+ testImplementation 'org.assertj:assertj-core:3.18.0'
+ testImplementation 'com.fasterxml.jackson.core:jackson-core:2.11.3'
+ testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.11.3'
+ implementation group: 'org.jastadd', name: 'jastadd', version: '2.3.4'
+ api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
}
File genSrc = file("src/gen/java")
diff --git a/src/test/java/org/jastadd/relast/tests/Errors.java b/src/test/java/org/jastadd/relast/tests/Errors.java
index 5134381..4221dc6 100644
--- a/src/test/java/org/jastadd/relast/tests/Errors.java
+++ b/src/test/java/org/jastadd/relast/tests/Errors.java
@@ -1,7 +1,5 @@
package org.jastadd.relast.tests;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.jastadd.relast.compiler.Compiler;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -20,7 +18,6 @@ import static org.jastadd.relast.tests.TestHelpers.readFile;
class Errors {
- private static final Logger logger = LogManager.getLogger(Errors.class);
private static final String FILENAME_PATTERN = "$FILENAME";
@Test
@@ -61,7 +58,7 @@ class Errors {
String expectedFile = "./src/test/jastadd/errors/" + name + ".expected";
try {
- logger.debug("user.dir: {}", System.getProperty("user.dir"));
+ System.out.println("user.dir: " + System.getProperty("user.dir"));
int returnValue = exec(Compiler.class, inFiles.toArray(new String[0]), new File(outFile));
Assertions.assertEquals(1, returnValue, "Relast did not return with value 1");
} catch (IOException | InterruptedException e) {
@@ -86,7 +83,7 @@ class Errors {
Assertions.assertLinesMatch(expectedList, outList);
- logger.info("relast for " + name + " returned \n{}", out);
+ System.out.println("relast for " + name + " returned \n" + out);
}
--
GitLab