Merge pull request #213 from eclipse-basyx/development

Prepares 1.3.0 release

Author: FrankSchnicke

.github/workflows/maven-publish-snapshot.yml

@@ -37,9 +37,9 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
@@ -58,7 +58,7 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
 
     - name: Delete old sdk package
-      uses: actions/delete-package-versions@v1
+      uses: actions/delete-package-versions@v3
       continue-on-error: true
       with:
         package-name: 'org.eclipse.basyx.basyx.sdk'

.github/workflows/maven-run-tests.yml

@@ -49,18 +49,16 @@ jobs:
           - 27017:27017
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
         cache: maven
         settings-path: ${{ github.workspace }} # location for the settings.xml file
     - name: Setup Postgres
       run: psql -f ci/sql/setup_postgres.sql postgresql://postgres:admin@localhost:5432/postgres
-    - name: Check status of Mongo
-      run: mongo test --eval "printjson(db.getSiblingDB('TestDB'), db.getCollectionNames())"
     - name: Build with Maven
       run: |
         mkdir -p ~/.m2

basyx.components/basyx.components.docker/basyx.components.AASServer/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - mongodb
 
   mongodb:
-    image: mongo:latest
+    image: mongo:5.0.10
     container_name: mongodb
     healthcheck:
       test: echo 'db.runCommand("ping").ok' | mongo mongodb:27017/test --quiet

basyx.components/basyx.components.docker/basyx.components.AASServer/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.basyx</groupId>
 		<artifactId>basyx.components.docker</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>basyx.components.AASServer</artifactId>
@@ -71,18 +71,23 @@
 	</build>
 
 	<dependencies>
+		<dependency>
+    		<groupId>ch.qos.logback</groupId>
+    		<artifactId>logback-classic</artifactId>
+    	</dependency>
+	
 		<!-- Use MongoDB Java Drivers for db connections -->
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongodb-driver-sync</artifactId>
-			<version>4.2.3</version>
+			<version>4.8.1</version>
 		</dependency>
 
 		<!-- Use Spring Data MongoDB for db data management -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>3.2.6</version>
+			<version>3.4.6</version>
 		</dependency>
 
 		<!-- Adds additional classes of the BaSys SDK for tests -->
@@ -116,7 +121,27 @@
 		<dependency>
 			<groupId>org.eclipse.basyx</groupId>
 			<artifactId>basyx.components.registry</artifactId>
-			<version>1.2.0</version>
+			<version>1.3.0-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.tngtech.keycloakmock</groupId>
+			<artifactId>mock</artifactId>
+			<scope>test</scope>
+			<version>0.12.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mock-server</groupId>
+			<artifactId>mockserver-netty</artifactId>
+			<version>5.9.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mock-server</groupId>
+			<artifactId>mockserver-client-java</artifactId>
+			<version>5.9.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -143,7 +168,7 @@
 					<!-- Build the docker image -->
 					<plugin>
 						<groupId>io.fabric8</groupId>
-	                    <artifactId>docker-maven-plugin</artifactId>
+						<artifactId>docker-maven-plugin</artifactId>
 					</plugin>
 
 					<!-- Create integration test environment -->