commit f50906d1f48af0c5a5b190d06578103eaebdbe4d
parent f16d7d461978522bc82852961a024293489ff0b9
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date: Fri, 11 Oct 2019 12:16:42 +0200
New import after Java update (11).
Diffstat:
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
@@ -4,13 +4,17 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
+ <option name="delegatedBuild" value="true" />
+ <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/usr/share/java/gradle" />
- <option name="gradleJvm" value="1.8" />
+ <option name="gradleJvm" value="11" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/nexus" />
+ <option value="$PROJECT_DIR$/sandbox" />
</set>
</option>
<option name="useQualifiedModuleNames" value="true" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
@@ -40,10 +40,10 @@ subprojects {
compile "ch.qos.logback:logback-classic:1.2.3"
compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
compile "javax.xml.bind:jaxb-api:2.3.0"
+ compile group: 'xerces', name: 'xercesImpl', version: '2.6.2-jaxb-1.0.6'
compile "javax.activation:activation:1.1"
compile "org.glassfish.jaxb:jaxb-runtime:2.3.0"
testCompile group: 'junit', name: 'junit', version: '4.12'
runtime rootProject.files("resources")
}
-
}
\ No newline at end of file
diff --git a/resources/logback.xml b/resources/logback.xml
@@ -1,5 +1,5 @@
<configuration>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender" additivity="false">
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
@@ -21,11 +21,13 @@
</encoder>
</appender>
- <logger name="tech.libeufin.sandbox" level="DEBUG">
+ <logger name="tech.libeufin.sandbox" level="DEBUG" additivity="false">
+ <appender-ref ref="STDOUT" />
<appender-ref ref="SANDBOX-FILE" />
</logger>
- <logger name="tech.libeufin.nexus" level="TRACE">
+ <logger name="tech.libeufin.nexus" level="TRACE" additivity="false">
+ <appender-ref ref="STDOUT" />
<appender-ref ref="NEXUS-FILE" />
</logger>
@@ -33,7 +35,7 @@
<logger name="ktor" level="WARN" />
<logger name="Exposed" level="WARN" />
- <root>
+ <root level="WARN">
<appender-ref ref="STDOUT" />
</root>