diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea98bf98cd792975e0e74921ccc5c0312a337c8f..1721f8da139ecff686a4d254dbe67b0fbcb98132 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maven:3.6.2-jdk-8 +image: maven:3.9.6-jdk-11 build: stage: build diff --git a/README.md b/README.md index 12a1ec09d1001536045a8ccf603763e56e0bbab5..f1aa1823efa3c7f2eea75620ffe38660ef714ba9 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,12 @@ This SAREF-Pipeline may be run: - by double-clicking the JAR file to starting the graphical user interface - or using the command line interface, run `java -jar saref-pipeline.jar help` to get started + +RELEASE NOTE for 2024-02-10 (v1.0.1) +This version of the SAREF-Pipeline was compiled under Java v11.0.21. +Ensure synchronized environment values by executing source saref-pipeline.env in an IntelliJ terminal. +The JDK-11 requires Apache Maven v3.9.6 which can be downloaded from https://maven.apache.org/download.cgi +Java JRE 11 does not have access to the old JAXB API, and the new JAXB RI replacement is not compatible with Java 8. +Download the JAXB RI v3.0 distribution from https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-ri/3.0.0/ +Copy the ./jaxb-ri folder into the project ./lib folder. Click Problems and Remove all unused libraries. + diff --git a/src/main/java/fr/mines_stetienne/ci/saref/checkers/AbstractClauseChecker.java b/src/main/java/fr/mines_stetienne/ci/saref/checkers/AbstractClauseChecker.java index 4ea4cbd3531e60dc3b1f9a648a201952e652f47a..88db9d2c8a458a3dbbf2d2579d4cbbe856bf506d 100644 --- a/src/main/java/fr/mines_stetienne/ci/saref/checkers/AbstractClauseChecker.java +++ b/src/main/java/fr/mines_stetienne/ci/saref/checkers/AbstractClauseChecker.java @@ -84,10 +84,10 @@ public abstract class AbstractClauseChecker extends AbstractChecker { /** * If the directory does not exist, create it. directoryPath can be relative or absolute. * If the file does not exist, create it with the default contents. Creates a file of length=0 if fileContents is empty. - * * @param directoryPath * @param fileName * @param fileContents + * @throws IOException */ public final void CreateFileInDirectoryWithContents(String directoryPath, String fileName, String[] fileContents) throws IOException { File theDir = new File(directoryPath); @@ -110,23 +110,4 @@ public abstract class AbstractClauseChecker extends AbstractChecker { } } - public final int CountFilesInDirectory(String directoryPath) throws IOException { - int count = 0; - File theDir = new File(directoryPath); - if(theDir.exists()) { - try { - for (File file : theDir.listFiles()) { - if (file.isFile()) { - count++; - } - } - } catch (Exception se) { - throw new IOException("Unable to list directory " + directoryPath); - } - } else { - throw new IOException("Directory does not exist " + directoryPath); - } - return count; - } - } \ No newline at end of file diff --git a/src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_6_Checker.java b/src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_6_Checker.java index 35140f6d657896bb8e340bd2e009b4992993a27c..c5b1337861bf0a4b0b26c39ee1855eb7a592aa91 100644 --- a/src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_6_Checker.java +++ b/src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_6_Checker.java @@ -52,7 +52,7 @@ public class Clause_9_6_Checker extends AbstractClauseChecker { if (!dir.isDirectory()) { //return; try { - String[] lines = { + String[] lines = { // saref4abcd template example1.ttl "@prefix dcterms: <http://purl.org/dc/terms/> .", "@prefix dctype: <http://purl.org/dc/dcmitype/> .", "@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .", diff --git a/src/main/java/fr/mines_stetienne/ci/saref/managers/VersionSiteManager.java b/src/main/java/fr/mines_stetienne/ci/saref/managers/VersionSiteManager.java index 7536c0d731ce70ff459f6381a6a321514bd582b7..11cee318debf805199ec839a83ec5a89faf66f4c 100644 --- a/src/main/java/fr/mines_stetienne/ci/saref/managers/VersionSiteManager.java +++ b/src/main/java/fr/mines_stetienne/ci/saref/managers/VersionSiteManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 ETSI + * Copyright 2024 ETSI * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -100,11 +100,11 @@ public class VersionSiteManager extends SAREFRepositoryVersionErrorLogger { generateHTMLFile(example); } } - /*<<<if (!pipeline.ignoreDocumentation) { + /* ??? if (!pipeline.ignoreDocumentation) { for(SAREFDocumentation documentation : version.getDocumentation().values()) { - LOG.info("Generating site for " + documentation); + LOG.info("Generating documentation for " + documentation); generateRDFFiles(documentation); - generateHTMLFile(documentation); + generateHTMLFiles(documentation); } }*/ }