diff --git a/pom.xml b/pom.xml index 84703c8e..eff73dd0 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,7 @@ UTF-8 11 - 3.17.0 - + 4.6.1 5.87.0.RELEASE 2.13.3 @@ -109,7 +108,7 @@ eclipse.preferences.version=1 org.slf4j slf4j-api - 1.7.25 + 1.7.36 @@ -152,7 +151,7 @@ eclipse.preferences.version=1 org.topbraid shacl - 1.3.2 + 1.4.3 org.apache.jena @@ -171,7 +170,7 @@ eclipse.preferences.version=1 net.sourceforge.plantuml plantuml - 1.2023.12 + 1.2024.4 diff --git a/shacl-doc/.gitignore b/shacl-doc/.gitignore new file mode 100644 index 00000000..00d2ab71 --- /dev/null +++ b/shacl-doc/.gitignore @@ -0,0 +1,2 @@ +/.apt_generated/ +/.apt_generated_tests/ diff --git a/shacl-generate/.gitignore b/shacl-generate/.gitignore new file mode 100644 index 00000000..00d2ab71 --- /dev/null +++ b/shacl-generate/.gitignore @@ -0,0 +1,2 @@ +/.apt_generated/ +/.apt_generated_tests/ diff --git a/shacl-generate/src/main/resources/shacl/generate/is-strict-superset-of.rq b/shacl-generate/src/main/resources/shacl/generate/is-strict-superset-of.rq index 4b7f3cb7..d24b9f99 100644 --- a/shacl-generate/src/main/resources/shacl/generate/is-strict-superset-of.rq +++ b/shacl-generate/src/main/resources/shacl/generate/is-strict-superset-of.rq @@ -3,5 +3,5 @@ PREFIX rdf: ASK { ?uri a $type . ?uri a $superset . - filter (?otherType != $type) + filter (?superset != $type) } \ No newline at end of file diff --git a/shacl-play-app/.gitignore b/shacl-play-app/.gitignore index b428e9e1..168dd81b 100644 --- a/shacl-play-app/.gitignore +++ b/shacl-play-app/.gitignore @@ -3,3 +3,5 @@ /.project /.classpath /.settings +/.apt_generated/ +/.apt_generated_tests/ diff --git a/shacl-play-app/src/main/java/fr/sparna/rdf/shacl/app/filter/ArgumentsFilter.java b/shacl-play-app/src/main/java/fr/sparna/rdf/shacl/app/filter/ArgumentsFilter.java index 44b966fd..1ffa3541 100644 --- a/shacl-play-app/src/main/java/fr/sparna/rdf/shacl/app/filter/ArgumentsFilter.java +++ b/shacl-play-app/src/main/java/fr/sparna/rdf/shacl/app/filter/ArgumentsFilter.java @@ -5,7 +5,7 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; -@Parameters(commandDescription = "Filters a shape model against a statistics file.") +@Parameters(commandDescription = "Filters a shape model against a statistics file. Properties used less than 0.1% of the time will be removed from the SHACL file.") public class ArgumentsFilter { diff --git a/shacl-play/.gitignore b/shacl-play/.gitignore index be0d0fff..122cab69 100644 --- a/shacl-play/.gitignore +++ b/shacl-play/.gitignore @@ -1,3 +1,5 @@ /target /.project /.classpath +/.apt_generated/ +/.apt_generated_tests/ diff --git a/shacl-play/src/main/webapp/WEB-INF/jsp/draw-form.jsp b/shacl-play/src/main/webapp/WEB-INF/jsp/draw-form.jsp index f5b63f43..d5ca13b0 100644 --- a/shacl-play/src/main/webapp/WEB-INF/jsp/draw-form.jsp +++ b/shacl-play/src/main/webapp/WEB-INF/jsp/draw-form.jsp @@ -140,11 +140,16 @@ file contains the rdfs:subClassOf links. + + https://shacl-play.sparna.fr/ontology#background-color + xsd:string + Color of the box itself. Values can be a color name, like "Green" or an hex code, like "4456BB" + + https://shacl-play.sparna.fr/ontology#color xsd:string - Color of the box. Values can be a color name, like "Green" - or an hex code, like "4456BB" + Color of the text inside the box. Values can be a color name, like "Green" or an hex code, like "4456BB" @@ -186,6 +191,30 @@ + +
+ + +

+ EBG shapes +
+ " width="100%"/> +

+ +

+ ScoloMFR Application profile, SKOS based +
+ " width="100%"/> +

+ +

+ Sparnatural configuration profile +
+ " width="100%"/> +

+ +
+ diff --git a/shacl-play/src/main/webapp/theme-default/img/diagram-ScoLOMFR-V6-AP-SHACL.png b/shacl-play/src/main/webapp/theme-default/img/diagram-ScoLOMFR-V6-AP-SHACL.png new file mode 100644 index 00000000..c27c4b97 Binary files /dev/null and b/shacl-play/src/main/webapp/theme-default/img/diagram-ScoLOMFR-V6-AP-SHACL.png differ diff --git a/shacl-play/src/main/webapp/theme-default/img/diagram-ebg-shapes.png b/shacl-play/src/main/webapp/theme-default/img/diagram-ebg-shapes.png new file mode 100644 index 00000000..e6df5f2d Binary files /dev/null and b/shacl-play/src/main/webapp/theme-default/img/diagram-ebg-shapes.png differ diff --git a/shacl-play/src/main/webapp/theme-default/img/diagram-sparnatural-configuration.png b/shacl-play/src/main/webapp/theme-default/img/diagram-sparnatural-configuration.png new file mode 100644 index 00000000..83486897 Binary files /dev/null and b/shacl-play/src/main/webapp/theme-default/img/diagram-sparnatural-configuration.png differ