From 6b31cbb97149a71d9cb669e3740d068f37384f42 Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Sat, 15 Apr 2023 00:02:23 +0200
Subject: [PATCH] Re-enable validation module in the build (#248)

---
 pom.xml                                       |  4 +-
 validation/pom.xml                            | 50 +++++++++++++++++--
 .../test/resources/simplelogger.properties    | 23 +++++++++
 3 files changed, 70 insertions(+), 7 deletions(-)
 create mode 100644 validation/src/test/resources/simplelogger.properties

diff --git a/pom.xml b/pom.xml
index 07bf4f9e3..93511e413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,9 +86,7 @@
     <module>trs/server</module>
     <module>trs/client</module>
     <module>store</module>
-      <!-- Remove util https://bugs.eclipse.org/bugs/show_bug.cgi?id=574043
-      and/or https://github.com/weso/shaclex/issues/390 are resolved-->
-    <!--    <module>validation</module>-->
+    <module>validation</module>
   </modules>
 
   <profiles>
diff --git a/validation/pom.xml b/validation/pom.xml
index 21c027888..68a4d85fd 100644
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -1,19 +1,20 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <!--	<groupId>org.eclipse.lyo</groupId>-->
   <artifactId>lyo-validation</artifactId>
-  <version>5.0.0-SNAPSHOT</version>
+  <version>5.0.1-SNAPSHOT</version>
   <name>Lyo :: Validation</name>
 
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>5.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <properties>
-    <v.shaclex>0.1.102</v.shaclex>
+    <v.shaclex>0.2.2</v.shaclex>
   </properties>
 
   <dependencies>
@@ -34,10 +35,18 @@
       <version>${v.shaclex}</version>
       <type>pom</type>
       <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.eclipse.rdf4j</groupId>
           <artifactId>rdf4j-runtime</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -85,11 +94,44 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <!-- same as Jena 4.5.0, consider removing -->
+      <version>2.9.0</version>
     </dependency>
 
   </dependencies>
 
+  <dependencyManagement>
+    <dependencies>
+      <!--maven enforcer for shaclex-->
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-reflect</artifactId>
+        <version>2.12.15</version>
+      </dependency>
+      <dependency>
+        <groupId>org.scala-lang.modules</groupId>
+        <artifactId>scala-collection-compat_2.12</artifactId>
+        <version>2.7.0</version>
+      </dependency>
+      <dependency>
+        <groupId>co.fs2</groupId>
+        <artifactId>fs2-core_2.12</artifactId>
+        <version>3.2.7</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-shacl</artifactId>
+        <version>${v.jena}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-shex</artifactId>
+        <version>${v.jena}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+
   <build>
     <plugins>
       <plugin>
diff --git a/validation/src/test/resources/simplelogger.properties b/validation/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..86dc56ea6
--- /dev/null
+++ b/validation/src/test/resources/simplelogger.properties
@@ -0,0 +1,23 @@
+# https://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html
+org.slf4j.simpleLogger.logFile                                                         = System.out
+org.slf4j.simpleLogger.defaultLogLevel                                                 = INFO
+org.slf4j.simpleLogger.levelInBrackets                                                 = false
+org.slf4j.simpleLogger.showLogName                                                     = true
+org.slf4j.simpleLogger.showShortLogName                                                = true
+org.slf4j.simpleLogger.showDateTime                                                    = true
+org.slf4j.simpleLogger.dateTimeFormat                                                  = HH:mm:ss.SSS
+org.slf4j.simpleLogger.showThreadName                                                  = false
+
+org.slf4j.simpleLogger.log.org.eclipse.lyo                                             = DEBUG
+org.slf4j.simpleLogger.log.es.weso.shacl                                               = INFO
+org.slf4j.simpleLogger.log.org.eclipse.lyo.validation.impl                             = INFO
+
+org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.ordfm.ResourcePackages = INFO
+org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper        = INFO
+#org.slf4j.simpleLogger.log.org.eclipse.lyo.trs            = TRACE
+
+org.slf4j.simpleLogger.log.org.apache.jena                                             = INFO
+org.slf4j.simpleLogger.log.org.glassfish                                               = INFO
+org.slf4j.simpleLogger.log.org.jboss.weld                                              = TRACE
+org.slf4j.simpleLogger.log.org.apache.http                                             = INFO
+org.slf4j.simpleLogger.log.Jena                                                        = INFO