Merge pull request #243 from bci-oss/188-update-to-java-17

Update to Java 17

Author: atextor

.github/workflows/pull_request_check.yml

@@ -14,6 +14,6 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
     - name: Run tests
       run: mvn -B clean install

.github/workflows/release-workflow.yml

@@ -14,11 +14,11 @@ jobs:
         with:
           ref: main
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           server-id: ossrh
           server-username: OSSRH_USERNAME
           server-password: OSSRH_TOKEN

core/sds-aspect-model-document-generators/src/test/java/io/openmanufacturing/sds/aspectmodel/generator/diagram/EntityInstance2BoxModelTest.java

@@ -21,6 +21,7 @@
 import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
+import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.RDFNode;
@@ -76,7 +77,12 @@ public void testEntityInstanceWithScalarListProperty2BoxModelExpectSuccess( fina
 
       assertTestEntityInstanceBox( queryResult, context, 2 );
       assertThat( queryResult.listStatements( context.selector( "* :title testList" ) ).toList() ).hasSize( 1 );
-      assertThat( queryResult.listStatements( context.selector( "* :text 1;2;3" ) ).toList() ).hasSize( 1 );
+      assertThat( queryResult.listStatements( context.selector( "* :text *" ) )
+            .mapWith( Statement::getObject )
+            .filterKeep( RDFNode::isLiteral )
+            .mapWith( RDFNode::asLiteral )
+            .mapWith( Literal::getString )
+            .toList() ).contains( "3" );
    }
 
    @ParameterizedTest

core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/validation/services/AspectModelValidator.java

@@ -126,7 +126,7 @@ public ValidationReport validate( final Try<VersionedModel> versionedModel ) {
 
          return metaModelVersion
                .flatMap( aspectMetaModelResourceResolver::loadShapesModel ).map( shapesModel -> {
-                  final Resource report = ValidationUtil.validateModel( dataModel, shapesModel, true );
+                  final Resource report = ValidationUtil.validateModel( dataModel, shapesModel, false );
 
                   if ( report.getProperty( SH.conforms ).getObject().asLiteral().getBoolean() ) {
                      // The SHACL validation succeeded. But to catch false positives, also try to load the model

core/sds-aspect-model-validator/src/test/java/io/openmanufacturing/sds/aspectmodel/validation/services/AspectModelValidatorTest.java

@@ -35,7 +35,7 @@
 import io.vavr.control.Try;
 
 public class AspectModelValidatorTest extends MetaModelVersions {
-   private static final String MISSING_PROPERTY_MESSAGE = "Property needs to have at least 1 values, but found 0";
+   private static final String MISSING_PROPERTY_MESSAGE = "Property needs to have at least 1 value";
 
    private final AspectModelValidator service = new AspectModelValidator();
 

documentation/developer-guide/modules/tooling-guide/pages/bamm-cli.adoc

@@ -7,7 +7,7 @@ The BAMM CLI is a command line tool for the validation of Aspect models and the
 
 TIP: Download latest version: icon:download[] https://github.com/OpenManufacturingPlatform/sds-sdk/releases/download/v{sds-sdk-version}/bamm-cli-{sds-sdk-version}.jar[bamm-cli-{sds-sdk-version}.jar]
 
-NOTE: For technical reasons, Java 11 is required to successfully run the tool.
+NOTE: For technical reasons, Java 17 or newer is required to successfully run the tool.
 
 [[bamm-cli-getting-started]]
 == Running the BAMM CLI

pom.xml

@@ -81,7 +81,7 @@
       <guice-version>5.1.0</guice-version>
       <javaparser-version>3.24.2</javaparser-version>
       <json-schema-validator-version>2.2.14</json-schema-validator-version>
-      <jena-version>4.2.0</jena-version>
+      <jena-version>4.4.0</jena-version>
       <json-path-version>2.4.0</json-path-version>
       <jqwik-version>1.6.5</jqwik-version>
       <lombok-version>1.18.24</lombok-version>
@@ -93,7 +93,7 @@
       <rgxgen-version>1.3</rgxgen-version>
       <rhino-version>1.7.14</rhino-version>
       <roaster-version>2.24.0.Final</roaster-version>
-      <shacl-version>1.3.2</shacl-version>
+      <shacl-version>1.4.2</shacl-version>
       <spring-boot-version>2.6.7</spring-boot-version>
       <swagger-parser-version>2.0.32</swagger-parser-version>
       <system-lambda-version>1.2.1</system-lambda-version>
@@ -130,8 +130,8 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-      <java-target-version>11</java-target-version>
-      <java-source-version>11</java-source-version>
+      <java-target-version>17</java-target-version>
+      <java-source-version>17</java-source-version>
 
       <sonar.coverage.jacoco.xmlReportPaths>
          ${project.basedir}/../sds-sdk-test-report/target/site/jacoco-aggregate/jacoco.xml,