Merge branch 'develop' into feature/github-actions

corese-stack · Sep 11, 2024 · 662a90f · 662a90f
2 parents 8416c37 + 38e4b5e
commit 662a90f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,12 @@
     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>
 
+    <name>corese-core</name>
     <groupId>fr.inria.corese</groupId>
     <artifactId>corese-core</artifactId>
     <version>4.5.1</version>
 
-    <name>corese-core</name>
+
     <properties>
         <maven.test.skip>false</maven.test.skip>
 

diff --git a/src/main/java/fr/inria/corese/core/shex/shacl/Constant.java b/src/main/java/fr/inria/corese/core/shex/shacl/Constant.java
@@ -1,4 +1,4 @@
-package fr.inria.corese.shex.shacl;
+package fr.inria.corese.core.shex.shacl;
 
 /**
  *

diff --git a/src/main/java/fr/inria/corese/core/shex/shacl/Context.java b/src/main/java/fr/inria/corese/core/shex/shacl/Context.java
@@ -1,4 +1,4 @@
-package fr.inria.corese.shex.shacl;
+package fr.inria.corese.core.shex.shacl;
 
 import fr.inria.lille.shexjava.schema.abstrsynt.NodeConstraint;
 import fr.inria.lille.shexjava.schema.abstrsynt.OneOf;

diff --git a/src/main/java/fr/inria/corese/core/shex/shacl/Qualified.java b/src/main/java/fr/inria/corese/core/shex/shacl/Qualified.java
@@ -1,4 +1,4 @@
-package fr.inria.corese.shex.shacl;
+package fr.inria.corese.core.shex.shacl;
 
 import fr.inria.lille.shexjava.schema.abstrsynt.AbstractNaryShapeExpr;
 import fr.inria.lille.shexjava.schema.abstrsynt.AbstractNaryTripleExpr;

diff --git a/src/main/java/fr/inria/corese/core/shex/shacl/Shex.java b/src/main/java/fr/inria/corese/core/shex/shacl/Shex.java
@@ -1,4 +1,4 @@
-package fr.inria.corese.shex.shacl;
+package fr.inria.corese.core.shex.shacl;
 
 import fr.inria.corese.core.sparql.triple.parser.NSManager;
 import fr.inria.lille.shexjava.graph.TCProperty;

diff --git a/src/main/java/fr/inria/corese/core/shex/shacl/ShexConstraint.java b/src/main/java/fr/inria/corese/core/shex/shacl/ShexConstraint.java
@@ -1,4 +1,4 @@
-package fr.inria.corese.shex.shacl;
+package fr.inria.corese.core.shex.shacl;
 
 import fr.inria.lille.shexjava.schema.concrsynt.*;
 import java.math.BigDecimal;

diff --git a/src/main/java/fr/inria/corese/core/shex/shacl/ShexShacl.java b/src/main/java/fr/inria/corese/core/shex/shacl/ShexShacl.java
@@ -1,6 +1,6 @@
-package fr.inria.corese.shex.shacl;
+package fr.inria.corese.core.shex.shacl;
 
-import static fr.inria.corese.shex.shacl.Constant.SH_INVERSEPATH;
+import static fr.inria.corese.core.shex.shacl.Constant.SH_INVERSEPATH;
 import fr.inria.corese.core.sparql.triple.parser.NSManager;
 import fr.inria.lille.shexjava.schema.concrsynt.LanguageConstraint;
 import java.math.BigDecimal;

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -40,17 +40,14 @@
     exports fr.inria.corese.core.storage;
     exports fr.inria.corese.core.storage.api.dataManager;
 
-    // exports fr.inria.corese.core.compiler;
     exports fr.inria.corese.core.compiler.parser;
     exports fr.inria.corese.core.compiler.eval;
     exports fr.inria.corese.core.compiler.api;
     exports fr.inria.corese.core.compiler.result;
     exports fr.inria.corese.core.compiler.federate;
 
-    // exports fr.inria.corese.core.shex;
-    // exports fr.inria.corese.core.shex.shacl;
+    exports fr.inria.corese.core.shex.shacl;
 
-    // exports fr.inria.corese.core.kgram;
     exports fr.inria.corese.core.kgram.core;
     exports fr.inria.corese.core.kgram.api.core;
     exports fr.inria.corese.core.kgram.api.query;
@@ -61,7 +58,6 @@
     exports fr.inria.corese.core.kgram.path;
     exports fr.inria.corese.core.kgram.sorter.impl.qpv1;
 
-    // exports fr.inria.corese.core.sparql;
     exports fr.inria.corese.core.sparql.triple.parser;
     exports fr.inria.corese.core.sparql.triple.parser.visitor;
     exports fr.inria.corese.core.sparql.triple.parser.context;

diff --git a/src/test/java/fr/inria/corese/test/shex/TestShex.java b/src/test/java/fr/inria/corese/test/shex/TestShex.java
@@ -1,6 +1,6 @@
 package fr.inria.corese.test.shex;
 
-import fr.inria.corese.shex.shacl.Shex;
+import fr.inria.corese.core.shex.shacl.Shex;
 
 
 /**