diff --git a/json-converter/pom.xml b/json-converter/pom.xml index 78b0d34b7..fc994c067 100644 --- a/json-converter/pom.xml +++ b/json-converter/pom.xml @@ -18,6 +18,7 @@ + org.apache.maven.plugins maven-assembly-plugin @@ -41,34 +42,8 @@ org.apache.jena apache-jena-libs + 3.17.0 pom - - - 3.2.0 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - - com.hp.hpl.jena - jena - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - org.biopax.paxtools diff --git a/json-converter/src/test/java/org/biopax/paxtools/io/jsonld/JsonldBiopaxConverterTest.java b/json-converter/src/test/java/org/biopax/paxtools/io/jsonld/JsonldBiopaxConverterTest.java index 55ed9ac17..8b118211d 100644 --- a/json-converter/src/test/java/org/biopax/paxtools/io/jsonld/JsonldBiopaxConverterTest.java +++ b/json-converter/src/test/java/org/biopax/paxtools/io/jsonld/JsonldBiopaxConverterTest.java @@ -1,7 +1,5 @@ package org.biopax.paxtools.io.jsonld; -import static org.junit.Assert.*; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/paxtools-console/src/main/java/org/biopax/paxtools/Main.java b/paxtools-console/src/main/java/org/biopax/paxtools/Main.java index 3dfc180c3..326d92aca 100644 --- a/paxtools-console/src/main/java/org/biopax/paxtools/Main.java +++ b/paxtools-console/src/main/java/org/biopax/paxtools/Main.java @@ -105,12 +105,12 @@ enum Command { "\t'--uri-ids' - URI,type,name(s) and standard identifiers (in JSON format) for each physical entity;\n " + "\tthe options' order defines the results output order.") {public void run(String[] argv) throws IOException{summarize(argv);} }, - blacklist(" \n" + + blacklist(" \n" + "\t- creates a blacklist of ubiquitous small molecules, like ATP, \n" + "\tfrom the BioPAX model and writes it to the output file. The blacklist can be used with\n " + "\tpaxtools graph queries or when converting from the SAME BioPAX data to the SIF formats.") {public void run(String[] argv) throws IOException{blacklist(argv);} }, - pattern("\n\t- BioPAX pattern search tool (opens a new dialog window)") + pattern("\n\t- BioPAX pattern search tool (opens a new dialog window)") {public void run(String[] argv){pattern(argv);} }, help("\n\t- prints this screen and exits\n") {public void run(String[] argv){ help();} }; diff --git a/paxtools-console/src/main/java/org/biopax/paxtools/PaxtoolsMain.java b/paxtools-console/src/main/java/org/biopax/paxtools/PaxtoolsMain.java index 01be52fc1..1e19fb641 100644 --- a/paxtools-console/src/main/java/org/biopax/paxtools/PaxtoolsMain.java +++ b/paxtools-console/src/main/java/org/biopax/paxtools/PaxtoolsMain.java @@ -341,7 +341,7 @@ public static void validate(String[] argv) throws IOException } } - Collection files = new HashSet(); + Collection files = new HashSet<>(); File fileOrDir = new File(input); if (!fileOrDir.canRead()) { System.out.println("Cannot read " + input); @@ -373,8 +373,7 @@ public boolean accept(File dir, String name) { } } catch (Exception ex) { // fall-back: not using the remote validator; trying to read files - String msg = "Unable to check with the biopax-validator web service: \n " + - ex.toString() + + String msg = "Unable to check with the biopax-validator web service: \n " + ex + "\n Fall-back: trying to parse the file(s) with paxtools " + "(up to the first syntax error in each file)...\n"; log.error(msg, ex); diff --git a/pom.xml b/pom.xml index fb2882bd5..d68a0d6f8 100644 --- a/pom.xml +++ b/pom.xml @@ -119,8 +119,8 @@ - Travis CI - https://travis-ci.org/BioPAX/Paxtools + GitHub + https://github.com/BioPAX/Paxtools/actions/workflows/maven.yml @@ -142,6 +142,7 @@ + org.apache.maven.plugins maven-source-plugin @@ -331,8 +332,8 @@ false ${java.options} -ea - - + + -ea --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED @@ -380,11 +381,6 @@ jackson-mapper-asl 1.9.12 - - com.hp.hpl.jena - jena - 2.6.4 - org.slf4j slf4j-api