Merge branch 'develop' into feature/corese-next

Author: remiceres

CHANGELOG.md

@@ -9,6 +9,7 @@
   - Add imports to the Getting Started guide.
 - Improved GitHub Actions log messages for the documentation workflow (`run-name` is now clearer).
 - Added new GitHub Actions workflow to automatically publish a development pre-release (`dev-prerelease`) on pushes to the `develop` branch.
+- Added `slf4j-simple` as a development-only runtime dependency.
 
 ### Fixed
 

build.gradle.kts

@@ -106,22 +106,29 @@ dependencies {
     val jersey_version = "3.0.4"
     val semargl_version = "0.7.1"
 
-    api("fr.com.hp.hpl.jena.rdf.arp:arp:2.2.b")                                          // RDF parser to handle RDF/XML files
-    implementation("org.apache.commons:commons-text:1.10.0")                             // Text manipulation utilities (Apache Commons)
-    implementation("commons-lang:commons-lang:2.4")                                      // Basic functions for handling strings and objects
-    implementation("org.json:json:20240303")                                             // JSON processing for reading, writing, and manipulating JSON objects
-    implementation("fr.inria.lille.shexjava:shexjava-core:1.0")                          // ShEx implementation for RDF validation
-    implementation("org.glassfish.jersey.core:jersey-client:${jersey_version}")          // REST client for creating HTTP requests
-    implementation("org.glassfish.jersey.inject:jersey-hk2:${jersey_version}")           // Dependency injection for Jersey
-    implementation("com.sun.activation:jakarta.activation:2.0.1")                        // JavaBeans Activation Framework for MIME data handling
-    implementation("javax.xml.bind:jaxb-api:2.3.1")                                      // JAXB API for converting between Java objects and XML
-    implementation("fr.inria.corese.org.semarglproject:semargl-rdfa:${semargl_version}") // RDFa parser to extract RDF metadata from HTML
-    implementation("fr.inria.corese.org.semarglproject:semargl-core:${semargl_version}") // Semargl core for RDF parsing and transformation
-    implementation("com.github.jsonld-java:jsonld-java:0.13.4")                          // JSON-LD processing for Linked Data in JSON format
-    implementation("junit:junit:4.13.2")                                                 // JUnit framework for unit testing in Java
-    implementation("com.typesafe:config:1.4.3")                                          // Typesafe config
-    api("org.slf4j:slf4j-api:2.0.9")                                                     // Simple Logging Facade for Java (SLF4J)
-    testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
+    // === Public API (Corese-Core users must see these classes) ===
+    api("org.slf4j:slf4j-api:2.0.9")                                                   // Exposed: Logging API
+
+    // === Internal implementations ===
+    implementation("fr.com.hp.hpl.jena.rdf.arp:arp:2.2.b")                             // Exposed: RDF/XML parser
+    implementation("org.apache.commons:commons-text:1.10.0")                           // Used internally (text manipulation)
+    implementation("commons-lang:commons-lang:2.4")                                    // Used internally (basic utilities)
+    implementation("org.json:json:20240303")                                           // Used internally (JSON)
+    implementation("fr.inria.lille.shexjava:shexjava-core:1.0")                        // Used internally (ShEx validation)
+    implementation("org.glassfish.jersey.core:jersey-client:$jersey_version")          // Internal HTTP client
+    implementation("org.glassfish.jersey.inject:jersey-hk2:$jersey_version")           // Internal Jersey injection
+    implementation("com.sun.activation:jakarta.activation:2.0.1")                      // Internal MIME handling
+    implementation("javax.xml.bind:jaxb-api:2.3.1")                                    // Internal XML binding
+    implementation("fr.inria.corese.org.semarglproject:semargl-rdfa:$semargl_version") // RDFa parsing
+    implementation("fr.inria.corese.org.semarglproject:semargl-core:$semargl_version") // RDF core parser
+    implementation("com.github.jsonld-java:jsonld-java:0.13.4")                        // Internal JSON-LD parser
+    implementation("com.typesafe:config:1.4.3")                                        // Typesafe config
+
+    // === For tests ===
+    testImplementation("junit:junit:4.13.2")                                           // Unit testing framework
+
+    // === For viewing logs during development (DO NOT include in production) ===
+    runtimeOnly("org.slf4j:slf4j-simple:2.0.9")                                        // Simple SLF4J implementation for logging
 }
 
 // Configure extra Java module information for dependencies without module-info
@@ -130,11 +137,11 @@ extraJavaModuleInfo {
     failOnMissingModuleInfo.set(false)
 
     // Map automatic module names for non-modular libraries.
-    automaticModule("fr.com.hp.hpl.jena.rdf.arp:arp", "arp") // Module for Jena RDF ARP
-    automaticModule("com.github.jsonld-java:jsonld-java", "jsonld.java") // Module for JSON-LD Java
-    automaticModule("commons-lang:commons-lang", "commons.lang") // Module for Commons Lang
-    automaticModule("fr.inria.lille.shexjava:shexjava-core", "shexjava.core")
-    automaticModule("org.eclipse.rdf4j:rdf4j-model", "rdf4j.model")
+    automaticModule("fr.com.hp.hpl.jena.rdf.arp:arp", "arp")                           // Module for Jena RDF ARP
+    automaticModule("com.github.jsonld-java:jsonld-java", "jsonld.java")               // Module for JSON-LD Java
+    automaticModule("commons-lang:commons-lang", "commons.lang")                       // Module for Commons Lang
+    automaticModule("fr.inria.lille.shexjava:shexjava-core", "shexjava.core")          // Module for ShexJava core
+    automaticModule("org.eclipse.rdf4j:rdf4j-model", "rdf4j.model")                    // Module for RDF4J model
 }
 
 

src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj

@@ -2971,7 +2971,7 @@ TOKEN:
 
 | <QNAME_NS: (<NCNAME_PREFIX>)? ":" >
 
-| <QNAME: (<NCNAME_PREFIX>)? ":" (["0"-"9"] | "-")* (<NCNAME>)? >
+| <QNAME: (<NCNAME_PREFIX>)? ":" (["0"-"9"] | "-" | "_" | ".")* (<NCNAME>)? >
 
 | <BLANK_NODE_LABEL:   "_:"   ( ["0"-"9"]  | <BLANKNAME> )   ( (<BLANKNAME> | ".")* <BLANKNAME> ) ?   >
 
@@ -3351,7 +3351,7 @@ TOKEN:
 |
   // With a leading "_", no dot at end of local name.
 
-    <#NCNAME:  <NCCHAR1>   ((<NCCHAR> | "." | ":" | "_" | <LOCAL_ESC> | <PERCENT> )*     (<NCCHAR> | ":" | <LOCAL_ESC> | <PERCENT> ))? > 
+       <#NCNAME:  <NCCHAR1>   ((<NCCHAR> | "." | ":" | "_" | <LOCAL_ESC> | <PERCENT> )*     (<NCCHAR> | ":" | <LOCAL_ESC> | <PERCENT> ))? > 
 |
 
 

src/main/java/module-info.java

@@ -13,7 +13,6 @@
     requires org.json; //
     requires org.apache.commons.lang3;
     requires org.slf4j;
-    requires junit;
     requires jsonld.java;
     requires commons.lang; //
     requires typesafe.config; //