Merge "Fixes test in basyx.tck" into release_1.0_java
diff --git a/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml b/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml
index 27152b1..d73f236 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml
+++ b/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.components.AASServer</artifactId>
diff --git a/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env b/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env
index 92ce56d..dc2072c 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env
+++ b/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env
@@ -21,14 +21,14 @@
# ##################
# The image of the image that is build for this component
-BASYX_IMAGE_NAME=basys/aas-server
+BASYX_IMAGE_NAME=eclipsebasyx/aas-server
# ##################
# Image Tag
# ##################
# The image tag of the image that is build for this component
-BASYX_IMAGE_TAG=1.0.0-SNAPSHOT
+BASYX_IMAGE_TAG=1.0.0
# ##################
# Container Name
diff --git a/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml b/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml
index ce512dd..0185e3f 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml
+++ b/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml
@@ -6,11 +6,12 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.components.registry</artifactId>
<name>BaSyx Registry</name>
+ <version>1.0.2</version>
<properties>
<basyx.components.executable>org.eclipse.basyx.components.registry.executable.RegistryExecutable</basyx.components.executable>
diff --git a/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/java/org/eclipse/basyx/regression/registry/ITRegistryRaw.java b/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/java/org/eclipse/basyx/regression/registry/ITRegistryRaw.java
index a7606b1..354ca28 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/java/org/eclipse/basyx/regression/registry/ITRegistryRaw.java
+++ b/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/java/org/eclipse/basyx/regression/registry/ITRegistryRaw.java
@@ -99,9 +99,9 @@
@Before
public void setUp() {
- // Post serialized descriptor to register it
- client.post(registryUrl, serializedDescriptor1);
- client.post(registryUrl, serializedDescriptor2);
+ // Put serialized descriptor to register it
+ client.put(aasUrl1, serializedDescriptor1);
+ client.put(aasUrl2, serializedDescriptor2);
}
@After
@@ -191,7 +191,7 @@
} catch(NotFoundException e) {}
// Create new AAS registration
- client.post(registryUrl, serializedDescriptor2);
+ client.put(aasUrl2, serializedDescriptor2);
// Get a known AAS by its ID
AASDescriptor result2 = new AASDescriptor((Map<String, Object>) getResult(client.get(aasUrl2)));
diff --git a/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env b/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env
index 6f427be..36083e8 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env
+++ b/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env
@@ -21,14 +21,14 @@
# ##################
# The image of the image that is build for this component
-BASYX_IMAGE_NAME=basyx/registry
+BASYX_IMAGE_NAME=eclipsebasyx/aas-registry
# ##################
# Image Tag
# ##################
# The image tag of the image that is build for this component
-BASYX_IMAGE_TAG=1.0.0-SNAPSHOT
+BASYX_IMAGE_TAG=1.0.2
# ##################
# Container Name
diff --git a/components/basys.components/basyx.components.docker/pom.xml b/components/basys.components/basyx.components.docker/pom.xml
index dd324d4..6afe083 100644
--- a/components/basys.components/basyx.components.docker/pom.xml
+++ b/components/basys.components/basyx.components.docker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.components.docker</artifactId>
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.lib</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/components/basys.components/basyx.components.lib/pom.xml b/components/basys.components/basyx.components.lib/pom.xml
index 553eae7..1cf5fe2 100644
--- a/components/basys.components/basyx.components.lib/pom.xml
+++ b/components/basys.components/basyx.components.lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.components.lib</artifactId>
diff --git a/components/basys.components/pom.xml b/components/basys.components/pom.xml
index c19d5cc..6bc6bf7 100644
--- a/components/basys.components/pom.xml
+++ b/components/basys.components/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>BaSyx Components</name>
<packaging>pom</packaging>
@@ -121,14 +121,14 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<!-- BaSyx SDK tests -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/components/basyx.tck/basyx.tck.AASServer/pom.xml b/components/basyx.tck/basyx.tck.AASServer/pom.xml
index e6e499c..f4b0326 100644
--- a/components/basyx.tck/basyx.tck.AASServer/pom.xml
+++ b/components/basyx.tck/basyx.tck.AASServer/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.tck</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.tck.AASServer</artifactId>
diff --git a/components/basyx.tck/basyx.tck.registry/pom.xml b/components/basyx.tck/basyx.tck.registry/pom.xml
index 9540f84..b609541 100644
--- a/components/basyx.tck/basyx.tck.registry/pom.xml
+++ b/components/basyx.tck/basyx.tck.registry/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.tck</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.tck.registry</artifactId>
diff --git a/components/basyx.tck/pom.xml b/components/basyx.tck/pom.xml
index 38528e2..9abf62a 100644
--- a/components/basyx.tck/pom.xml
+++ b/components/basyx.tck/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.tck</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
@@ -111,13 +111,13 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<!-- BaSyx SDK tests -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/examples/basys.examples/pom.xml b/examples/basys.examples/pom.xml
index e0975f9..e47a66e 100644
--- a/examples/basys.examples/pom.xml
+++ b/examples/basys.examples/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.examples</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>jar</packaging>
<name>BaSyx Examples</name>
@@ -104,28 +104,28 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.lib</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<!-- Add explicit SQLRegistry dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.registry</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.2</version>
</dependency>
<!-- Add explicit AAS Server component dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.AASServer</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<!-- Adds additional classes of the BaSys SDK for tests -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/examples/basyx.aasWrapper/pom.xml b/examples/basyx.aasWrapper/pom.xml
index 5fdd9a1..599b939 100644
--- a/examples/basyx.aasWrapper/pom.xml
+++ b/examples/basyx.aasWrapper/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.components.AASWrapper</artifactId>
diff --git a/examples/basyx.aasWrapper/src/test/resources/.env b/examples/basyx.aasWrapper/src/test/resources/.env
index 9800ba5..4ca39a7 100644
--- a/examples/basyx.aasWrapper/src/test/resources/.env
+++ b/examples/basyx.aasWrapper/src/test/resources/.env
@@ -28,7 +28,7 @@
# ##################
# The image tag of the image that is build for this component
-BASYX_IMAGE_TAG=1.0.0-SNAPSHOT
+BASYX_IMAGE_TAG=1.0.0
# ##################
# Container Name
diff --git a/examples/basyx.dashboardAAS/pom.xml b/examples/basyx.dashboardAAS/pom.xml
index 31f6e85..183dff4 100644
--- a/examples/basyx.dashboardAAS/pom.xml
+++ b/examples/basyx.dashboardAAS/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>basyx.components.dashboardAAS</artifactId>
diff --git a/examples/basyx.dashboardAAS/src/test/resources/.env b/examples/basyx.dashboardAAS/src/test/resources/.env
index de828f0..f71a8db 100644
--- a/examples/basyx.dashboardAAS/src/test/resources/.env
+++ b/examples/basyx.dashboardAAS/src/test/resources/.env
@@ -28,7 +28,7 @@
# ##################
# The image tag of the image that is build for this component
-BASYX_IMAGE_TAG=1.0.0-SNAPSHOT
+BASYX_IMAGE_TAG=1.0.0
# ##################
# Container Name
diff --git a/examples/basyx.hello_world/pom.xml b/examples/basyx.hello_world/pom.xml
index 88cfd3d..d5aa122 100644
--- a/examples/basyx.hello_world/pom.xml
+++ b/examples/basyx.hello_world/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.hello_world</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>BaSyx Hello World</name>
<properties>
@@ -32,21 +32,21 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.lib</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<!-- Add Registry Server component dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.registry</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.2</version>
</dependency>
<!-- Add AAS Server component dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.AASServer</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
diff --git a/sdks/java/basys.sdk/pom.xml b/sdks/java/basys.sdk/pom.xml
index 47b857f..f02c306 100644
--- a/sdks/java/basys.sdk/pom.xml
+++ b/sdks/java/basys.sdk/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>BaSyx SDK</name>
<packaging>jar</packaging>
