Merge pull request #384 from timothyjward/feature/ci-friendly

Make the sensiNact build more CI friendly
eclipse · Apr 18, 2024 · de28b93 · de28b93
2 parents 28e77ce + 75ebfda
commit de28b93
Show file tree

Hide file tree

Showing 83 changed files with 262 additions and 231 deletions.
diff --git a/core/annotation/pom.xml b/core/annotation/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core</groupId>
     <artifactId>core</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>annotation</artifactId>
   <name>SensiNact core Annotations</name>

diff --git a/core/api/pom.xml b/core/api/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core</groupId>
     <artifactId>core</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>api</artifactId>
   <name>SensiNact core API</name>

diff --git a/core/emf-api/pom.xml b/core/emf-api/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core</groupId>
     <artifactId>core</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>emf-api</artifactId>
   <name>SensiNact core API with EMF dependencies</name>
@@ -48,16 +48,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>geo-json</artifactId>
       <version>${project.version}</version>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>${project.groupId}.models</groupId>
       <artifactId>provider</artifactId>
       <version>${project.version}</version>
-    </dependency> -->
-    <dependency>
-        <groupId>org.eclipse.sensinact.gateway.core.models</groupId>
-        <artifactId>provider</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/core/geo-json/pom.xml b/core/geo-json/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core</groupId>
     <artifactId>core</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>geo-json</artifactId>
   <name>SensiNact GeoJSON mapping types</name>

diff --git a/core/impl/pom.xml b/core/impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core</groupId>
     <artifactId>core</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>impl</artifactId>
   <name>SensiNact core implementation</name>
@@ -78,11 +78,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.eclipse.sensinact.gateway.core.models</groupId>
-        <artifactId>metadata</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.configadmin</artifactId>

diff --git a/core/models/metadata/pom.xml b/core/models/metadata/pom.xml
@@ -18,7 +18,7 @@
     <relativePath>../pom.xml</relativePath>
     <groupId>org.eclipse.sensinact.gateway.core.models</groupId>
     <artifactId>models</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>metadata</artifactId>
   <name>SensiNact internal Metadata Model</name>

diff --git a/core/models/pom.xml b/core/models/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core</groupId>
     <artifactId>core</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <groupId>org.eclipse.sensinact.gateway.core.models</groupId>
   <artifactId>models</artifactId>

diff --git a/core/models/provider/pom.xml b/core/models/provider/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.core.models</groupId>
     <artifactId>models</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>provider</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway</groupId>
     <artifactId>sensinact-parent</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <groupId>org.eclipse.sensinact.gateway.core</groupId>
   <artifactId>core</artifactId>

diff --git a/distribution/assembly/pom.xml b/distribution/assembly/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.distribution</groupId>
     <artifactId>distribution</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>assembly</artifactId>
   <packaging>pom</packaging>
@@ -38,7 +38,7 @@
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution</groupId>
                   <artifactId>launcher</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>jar</type>
                   <classifier>export</classifier>
                   <outputDirectory>${project.build.outputDirectory}/launch</outputDirectory>
@@ -59,70 +59,70 @@
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>core-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>gogo-shell-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>jakarta-servlet-whiteboard-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>jakarta-rest-whiteboard-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-rest-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-websocket-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-ogc-sensorthings-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-ogc-sensorthings-mqtt-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-oidc-authenticator-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>virtual-temperature-sensor-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>
@@ -141,71 +141,71 @@
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>core-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>core-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>gogo-shell-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>gogo-shell-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>jakarta-servlet-whiteboard-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>jakarta-servlet-whiteboard-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>jakarta-rest-whiteboard-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>jakarta-rest-whiteboard-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-rest-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>northbound-rest-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-websocket-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>northbound-websocket-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-ogc-sensorthings-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>northbound-ogc-sensorthings-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>northbound-ogc-sensorthings-mqtt-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>northbound-ogc-sensorthings-mqtt-feature.json</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>virtual-temperature-sensor-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>virtual-temperature-sensor-feature.json</destFileName>

diff --git a/distribution/features/core-feature/pom.xml b/distribution/features/core-feature/pom.xml
@@ -15,15 +15,13 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
     <artifactId>features</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
   <artifactId>core-feature</artifactId>
   <name>Eclipse sensiNact core Feature</name>
   <description>This project contains a feature representing the core of sensiNact</description>
   <packaging>pom</packaging>
-  <properties>
-    <gateway.version>0.0.2-SNAPSHOT</gateway.version>
-  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.sensinact.gateway.core</groupId>
@@ -136,7 +134,7 @@
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>gogo-shell-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>json</type>
                   <classifier>osgifeature</classifier>
                   <destFileName>gogo-shell-feature.json</destFileName>
@@ -152,7 +150,7 @@
                 <artifactItem>
                   <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
                   <artifactId>gogo-shell-feature</artifactId>
-                  <version>0.0.2-SNAPSHOT</version>
+                  <version>${revision}${changelist}</version>
                   <type>zip</type>
                   <classifier>osgifeaturerepo</classifier>
                 </artifactItem>

diff --git a/distribution/features/core-feature/src/main/resources/core-feature.json b/distribution/features/core-feature/src/main/resources/core-feature.json
@@ -1,13 +1,13 @@
 {
-  "id":"org.eclipse.sensinact.gateway.distribution.features:core-feature:osgifeature:0.0.2-SNAPSHOT",
+  "id":"org.eclipse.sensinact.gateway.distribution.features:core-feature:osgifeature:${gateway.version}",
   "bundles":[
-    { "id": "org.eclipse.sensinact.gateway.core:annotation:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.core:api:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.core:emf-api:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.core:impl:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.core.models:provider:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.core.models:metadata:0.0.2-SNAPSHOT" },
-    { "id": "org.eclipse.sensinact.gateway.core:geo-json:0.0.2-SNAPSHOT" },
+    { "id": "org.eclipse.sensinact.gateway.core:annotation:${gateway.version}" },
+    { "id": "org.eclipse.sensinact.gateway.core:api:${gateway.version}" },
+    { "id": "org.eclipse.sensinact.gateway.core:emf-api:${gateway.version}" },
+    { "id": "org.eclipse.sensinact.gateway.core:impl:${gateway.version}" },
+    { "id": "org.eclipse.sensinact.gateway.core.models:provider:${gateway.version}" },
+    { "id": "org.eclipse.sensinact.gateway.core.models:metadata:${gateway.version}" },
+    { "id": "org.eclipse.sensinact.gateway.core:geo-json:${gateway.version}" },
     { "id": "com.fasterxml.jackson.core:jackson-annotations:2.16.1" },
     { "id": "com.fasterxml.jackson.core:jackson-core:2.16.1" },
     { "id": "com.fasterxml.jackson.core:jackson-databind:2.16.1" },

diff --git a/distribution/features/gogo-shell-feature/pom.xml b/distribution/features/gogo-shell-feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.sensinact.gateway.distribution.features</groupId>
     <artifactId>features</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>gogo-shell-feature</artifactId>

diff --git a/distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json b/distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json
@@ -1,5 +1,5 @@
 {
-  "id":"org.eclipse.sensinact.gateway.distribution.features:gogo-shell:osgifeature:0.0.2-SNAPSHOT",
+  "id":"org.eclipse.sensinact.gateway.distribution.features:gogo-shell:osgifeature:${project.version}",
   "bundles":[
     { "id": "org.apache.felix:org.apache.felix.gogo.shell:1.1.4" },
     { "id": "org.apache.felix:org.apache.felix.gogo.runtime:1.1.4" },