Fix a bug in OmlCatalog

opencaesar · Jul 18, 2024 · 458bb8e · 458bb8e
1 parent 8ba4fe2
commit 458bb8e
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ It also publishes the following artifacts (see the OML specification for using i
 
 ## Build
 
-Dependencies: Gradle 6.x, Maven 3.6.x, Java 11
+Dependencies: Gradle 7.6.+, Maven 3.9.+, Java 17+
 ```
   ./gradlew build
   mvn verify

diff --git a/io.opencaesar.oml.api.feature/feature.xml b/io.opencaesar.oml.api.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.oml.api.feature"
       label="%featureName"
-      version="2.7.1"
+      version="2.7.2"
       provider-name="%providerName">
 
    <description>

diff --git a/io.opencaesar.oml.api.feature/pom.xml b/io.opencaesar.oml.api.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.api.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

diff --git a/io.opencaesar.oml.dsl.feature/feature.xml b/io.opencaesar.oml.dsl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.oml.dsl.feature"
       label="%featureName"
-      version="2.7.1"
+      version="2.7.2"
       provider-name="%providerName">
 
    <description>

diff --git a/io.opencaesar.oml.dsl.feature/pom.xml b/io.opencaesar.oml.dsl.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.dsl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

diff --git a/io.opencaesar.oml.dsl.ide/META-INF/MANIFEST.MF b/io.opencaesar.oml.dsl.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.opencaesar.oml.dsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-SymbolicName: io.opencaesar.oml.dsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

diff --git a/io.opencaesar.oml.dsl.ide/pom.xml b/io.opencaesar.oml.dsl.ide/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.dsl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/io.opencaesar.oml.dsl.ui.tests/META-INF/MANIFEST.MF b/io.opencaesar.oml.dsl.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.opencaesar.oml.dsl.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-SymbolicName: io.opencaesar.oml.dsl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

diff --git a/io.opencaesar.oml.dsl.ui.tests/pom.xml b/io.opencaesar.oml.dsl.ui.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.dsl.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

diff --git a/io.opencaesar.oml.dsl.ui/META-INF/MANIFEST.MF b/io.opencaesar.oml.dsl.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.opencaesar.oml.dsl.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-SymbolicName: io.opencaesar.oml.dsl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

diff --git a/io.opencaesar.oml.dsl.ui/pom.xml b/io.opencaesar.oml.dsl.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.dsl.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/io.opencaesar.oml.dsl/META-INF/MANIFEST.MF b/io.opencaesar.oml.dsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.opencaesar.oml.dsl
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-SymbolicName: io.opencaesar.oml.dsl; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

diff --git a/io.opencaesar.oml.dsl/pom.xml b/io.opencaesar.oml.dsl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.dsl</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/io.opencaesar.oml.edit/META-INF/MANIFEST.MF b/io.opencaesar.oml.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.oml.edit;singleton:=true
 Automatic-Module-Name: io.opencaesar.oml.edit
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-ClassPath: .
 Bundle-Activator: io.opencaesar.oml.provider.OmlEditPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/io.opencaesar.oml.edit/pom.xml b/io.opencaesar.oml.edit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/io.opencaesar.oml.editor/META-INF/MANIFEST.MF b/io.opencaesar.oml.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.oml.editor;singleton:=true
 Automatic-Module-Name: io.opencaesar.oml.editor
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-ClassPath: .
 Bundle-Activator: io.opencaesar.oml.presentation.OmlEditorPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/io.opencaesar.oml.editor/pom.xml b/io.opencaesar.oml.editor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.editor</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/io.opencaesar.oml.repository/pom.xml b/io.opencaesar.oml.repository/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

diff --git a/io.opencaesar.oml.sdk.feature/feature.xml b/io.opencaesar.oml.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.oml.sdk.feature"
       label="%featureName"
-      version="2.7.1"
+      version="2.7.2"
       provider-name="%providerName">
 
    <description>

diff --git a/io.opencaesar.oml.sdk.feature/pom.xml b/io.opencaesar.oml.sdk.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

diff --git a/io.opencaesar.oml.target/pom.xml b/io.opencaesar.oml.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

diff --git a/io.opencaesar.oml/META-INF/MANIFEST.MF b/io.opencaesar.oml/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.oml;singleton:=true
 Automatic-Module-Name: io.opencaesar.oml
-Bundle-Version: 2.7.1
+Bundle-Version: 2.7.2
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/io.opencaesar.oml/pom.xml b/io.opencaesar.oml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.oml</groupId>
 		<artifactId>io.opencaesar.oml.parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.2</version>
 	</parent>
 	<artifactId>io.opencaesar.oml</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/io.opencaesar.oml/src/io/opencaesar/oml/util/OmlCatalog.java b/io.opencaesar.oml/src/io/opencaesar/oml/util/OmlCatalog.java
@@ -161,8 +161,9 @@ public List<URI> getResolvedUris() throws IOException {
 			var dirPath = (path.isDirectory())? path : path.getParentFile();
 			for (var file : getFiles(dirPath, extensions)) {
 				if (file.getAbsolutePath().startsWith(path.getAbsolutePath())) {
-					String relative = path.toURI().relativize(file.toURI()).getPath();
-					uris.add(URI.createURI(rewriteUri+"/"+relative));
+					var relative = path.toPath().relativize(file.toPath()).toString().replace("\\", "/");
+					var uri = java.net.URI.create(rewriteUri + "/" + relative).normalize();
+					uris.add(URI.createURI(uri.toString()));
 				}
 			}
 		}

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	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>
 	<groupId>io.opencaesar.oml</groupId>
-	<version>2.7.1</version>
+	<version>2.7.2</version>
 	<artifactId>io.opencaesar.oml.parent</artifactId>
 	<packaging>pom</packaging>
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.7.1
+2.7.2