From 6b01958507d571ff8d161785bfd79c39dd55c5d5 Mon Sep 17 00:00:00 2001 From: Dmytro Baranov Date: Wed, 6 Nov 2024 19:59:41 +0100 Subject: [PATCH] [Java] Fix joynr-generator-standalone module failure in joynr-java-tests job --- tools/generator/framework/pom.xml | 4 ++ .../xtend/io/joynr/generator/Executor.java | 8 ++-- .../joynr-generator-standalone/pom.xml | 40 ------------------- 3 files changed, 8 insertions(+), 44 deletions(-) diff --git a/tools/generator/framework/pom.xml b/tools/generator/framework/pom.xml index 7b6ac476c3..3c5b21ddd3 100644 --- a/tools/generator/framework/pom.xml +++ b/tools/generator/framework/pom.xml @@ -91,6 +91,10 @@ org.reflections reflections + + org.slf4j + slf4j-api + diff --git a/tools/generator/framework/src/main/xtend/io/joynr/generator/Executor.java b/tools/generator/framework/src/main/xtend/io/joynr/generator/Executor.java index af947dd9be..3514bacf05 100644 --- a/tools/generator/framework/src/main/xtend/io/joynr/generator/Executor.java +++ b/tools/generator/framework/src/main/xtend/io/joynr/generator/Executor.java @@ -20,8 +20,8 @@ import static io.joynr.generator.util.FileSystemAccessUtil.createFileSystemAccess; -import java.util.logging.Level; -import java.util.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.resource.Resource; @@ -41,7 +41,7 @@ public class Executor { - private final Logger logger = Logger.getLogger("io.joynr.generator.Executor"); + private final Logger logger = LoggerFactory.getLogger(Executor.class); private final InvocationArguments arguments; private final IGenerator generator; private final IFileSystemAccess outputFileSystem; @@ -131,7 +131,7 @@ public void generate() { for (Diagnostic error : resource.getErrors()) { errorMsg.append(error.getMessage()); } - logger.log(Level.SEVERE, errorMsg.toString()); + logger.error(errorMsg.toString()); System.exit(-1); } else { joynrGenerator.updateCommunicationModelGeneration(resource); diff --git a/tools/generator/joynr-generator-standalone/pom.xml b/tools/generator/joynr-generator-standalone/pom.xml index 6a5ed0dc13..3ad853af39 100644 --- a/tools/generator/joynr-generator-standalone/pom.xml +++ b/tools/generator/joynr-generator-standalone/pom.xml @@ -329,14 +329,6 @@ com.google.errorprone error_prone_annotations - - com.github.spotbugs - spotbugs - - - com.github.spotbugs - spotbugs-annotations - org.apache.bcel bcel @@ -515,10 +507,6 @@ org.eclipse.platform org.eclipse.equinox.registry - - org.eclipse.xtend - org.eclipse.xtend.core - org.eclipse.xtend org.eclipse.xtend.lib @@ -531,18 +519,10 @@ org.eclipse.xtext org.eclipse.xtext - - org.eclipse.xtext - org.eclipse.xtext.common.types - org.eclipse.xtext org.eclipse.xtext.util - - org.eclipse.xtext - org.eclipse.xtext.xbase - org.eclipse.xtext org.eclipse.xtext.xbase.lib @@ -575,26 +555,6 @@ org.reflections reflections - - org.ow2.asm - asm - - - org.ow2.asm - asm-analysis - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-util - org.slf4j slf4j-api