Merge pull request #103 from OPENDAP/HYRAX-292

HYRAX-292. Corrected build.gradle and updated build.xml
OPENDAP · Nov 30, 2020 · bc9efa3 · bc9efa3
2 parents e8f6f0d + ccfb015
commit bc9efa3
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -70,10 +70,6 @@ dependencies {
     implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
 //    implementation group: 'xalan', name: 'xalan', version: '2.7.1'
     implementation group: 'xalan', name: 'xalan', version: '2.7.2'
-
-//    implementation group: 'art.uniroma2.it.org.openrdf.sesame', name: 'sesame-onejar', version: '2.6.8'
-//    "owlim-lite-4.3.jar"
-
 //    providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.14'
     providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.53'
     providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'

diff --git a/build.xml b/build.xml
@@ -212,11 +212,13 @@
 
 
     <property name="slf4j.lib" value="slf4j-api-1.6.1.jar"/>
-    <property name="logback-core.lib" value="logback-core-0.9.26.jar"/>
-    <property name="logback-classic.lib" value="logback-classic-0.9.26.jar"/>
+    <!-- property name="logback-core.lib" value="logback-core-0.9.26.jar"/-->
+    <property name="logback-core.lib" value="logback-core-1.1.11.jar"/>
+    <!-- property name="logback-classic.lib" value="logback-classic-0.9.26.jar"/-->
+    <property name="logback-classic.lib" value="logback-classic-1.2.0.jar"/>
 
-    <property name="owlim.lib" value="owlim-lite-4.3.jar"/>
-    <property name="openrdf-sesame.lib" value="openrdf-sesame-2.6.2-onejar.jar"/>
+    <!-- property name="owlim.lib" value="owlim-lite-4.3.jar"/ -->
+    <!-- property name="openrdf-sesame.lib" value="openrdf-sesame-2.6.2-onejar.jar"/-->
 
     <property name="commons-cli.lib" value="apache-commons-cli-1.2.jar"/>
     <property name="commons-codec.lib" value="apache-commons-codec-1.8.jar"/>
@@ -230,15 +232,18 @@
     <property name="http-components-httpcore.lib" value="org.apache.httpcomponents.httpcore_4.4.6.jar"/>
 
 
-    <property name="xalan.lib" value="xalan.jar"/>
-    <property name="xercesImpl.lib" value="xercesImpl-2.8.1.jar"/>
+    <!-- property name="xalan.lib" value="xalan.jar"/-->
+    <property name="xalan.lib" value="xalan-2.7.2.jar"/>
+    <!-- property name="xercesImpl.lib" value="xercesImpl-2.8.1.jar"/-->
+    <property name="xercesImpl.lib" value="xercesImpl-2.12.0.jar"/>
     <property name="xercesXmlApis.lib" value="xml-apis-2.8.1.jar"/>
 
     <property name="saxon-jdom.lib" value="saxon-9.1.0.5-jdom.jar"/>
     <property name="saxon-s9api.lib" value="saxon-9.1.0.5-s9api.jar"/>
     <property name="saxon.lib" value="saxon-9.1.0.5.jar"/>
 
-    <property name="catalina.lib" value="catalina-6.0.14.jar"/>
+    <!-- property name="catalina.lib" value="catalina-6.0.14.jar"/-->
+    <property name="catalina.lib" value="catalina-6.0.53.jar"/>
     <property name="servlet-api.lib" value="servlet-api-3.0.jar"/>
 
     <property name="json.lib" value="json-simple-1.1.1.jar"/>

diff --git a/lib/catalina-6.0.14.jar b/lib/catalina-6.0.14.jar
diff --git a/lib/catalina-6.0.53.jar b/lib/catalina-6.0.53.jar
diff --git a/lib/logback-classic-0.9.26.jar b/lib/logback-classic-0.9.26.jar
diff --git a/lib/logback-classic-1.2.0.jar b/lib/logback-classic-1.2.0.jar
diff --git a/lib/logback-core-0.9.26.jar b/lib/logback-core-0.9.26.jar
diff --git a/lib/logback-core-1.1.11.jar b/lib/logback-core-1.1.11.jar
diff --git a/lib/xalan-2.7.2.jar b/lib/xalan-2.7.2.jar
diff --git a/lib/xalan.jar b/lib/xalan.jar
diff --git a/lib/xercesImpl-2.12.0.jar b/lib/xercesImpl-2.12.0.jar
diff --git a/lib/xercesImpl-2.8.1.jar b/lib/xercesImpl-2.8.1.jar
diff --git a/lib/openrdf-sesame-2.6.2-onejar.jar → retired/libs/openrdf-sesame-2.6.2-onejar.jar b/lib/openrdf-sesame-2.6.2-onejar.jar → retired/libs/openrdf-sesame-2.6.2-onejar.jar
diff --git a/lib/owlim-lite-4.3.jar → retired/libs/owlim-lite-4.3.jar b/lib/owlim-lite-4.3.jar → retired/libs/owlim-lite-4.3.jar