Merge branch 'prepare-1.2.0' into 'master'

Prepare 1.2.0

See merge request interconnect/knowledge-engine!368

Author: Han Kruiger

README.md

@@ -71,7 +71,7 @@ The easiest way to start a Knowledge Engine runtime is with Docker:
 ```bash
 docker run \
 	-p 8280:8280 \
-	ghcr.io/tno/knowledge-engine/smart-connector:1.1.3
+	ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
 ```
 
 The Knowledge Engine runtime is now available to use via the REST API at base URL `http://localhost:8280/rest` on your host machine.
@@ -93,7 +93,7 @@ docker run \
   -p 8081:8081 \
   -e KD_URL=https://knowledge-directory.example.org \
   -e KE_RUNTIME_EXPOSED_URL=https://your-domain.example.org:8081 \
-  ghcr.io/tno/knowledge-engine/smart-connector:1.1.3
+  ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
 ```
 
 ### Running with Java
@@ -111,7 +111,7 @@ export KE_RUNTIME_EXPOSED_URL=https://your-domain.example.org:8081
 # Start it. The argument (8280) denotes the port number at which it
 # will listen for connections to the Knowledge Engine REST API.
 java -jar -Dorg.slf4j.simpleLogger.logFile=smart-connector.log \
-  smart-connector-rest-dist-1.1.3-with-dependencies.jar 8280
+  smart-connector-rest-dist-1.2.0-with-dependencies.jar 8280
 ```
 
 The JAR can be retrieved by compiling the project:
@@ -202,14 +202,14 @@ These are instructions on what to do when we release a new version of the knowle
 3. `mvn deploy` (for this you need `Deploy-Token` or `Private-Token` configured in your Maven's `settings.xml`, see [GitLab's documentation on this](https://docs.gitlab.com/ee/user/packages/maven_repository/#authenticate-to-the-package-registry-with-maven))
 4. Build and push the new Docker images:
 ```bash
-docker buildx build ./smart-connector-rest-dist --platform linux/arm64,linux/amd64 --tag ghcr.io/tno/knowledge-engine/smart-connector:1.1.3 --push
-docker buildx build ./knowledge-directory --platform linux/arm64,linux/amd64 --tag ghcr.io/tno/knowledge-engine/knowledge-directory:1.1.3 --push
-docker buildx build ./admin-ui --platform linux/arm64,linux/amd64 --tag ghcr.io/tno/knowledge-engine/admin-ui:1.1.3 --push
+docker buildx build ./smart-connector-rest-dist --platform linux/arm64,linux/amd64 --tag ghcr.io/tno/knowledge-engine/smart-connector:1.2.0 --push
+docker buildx build ./knowledge-directory --platform linux/arm64,linux/amd64 --tag ghcr.io/tno/knowledge-engine/knowledge-directory:1.2.0 --push
+docker buildx build ./admin-ui --platform linux/arm64,linux/amd64 --tag ghcr.io/tno/knowledge-engine/admin-ui:1.2.0 --push
 ```
 5. Prepare the next SNAPSHOT version and make a commit for that too.
 
 ## (advanced) Administering a Knowledge Engine runtime
-To start a new instance of the REST API knowledge engine version 1.1.3, make sure you have `git checkout 1.1.3` the tag `1.1.3`. Now make sure you run the `mvn clean install` command successfully from the root of the repository.
+To start a new instance of the REST API knowledge engine version 1.2.0, make sure you have `git checkout 1.2.0` the tag `1.2.0`. Now make sure you run the `mvn clean install` command successfully from the root of the repository.
 
 ### Starting the Knowledge Engine in local mode
 When no additional configuration parameters are provided, the Knowledge Engine will by default run in local mode. This means you can create multiple smart connectors that can communicate with each other through the REST API, but the Knowledge Engine will not connect to a knowledge directory and will not be able to connect with smart connectors running in other runtimes.
@@ -223,13 +223,13 @@ cd smart-connector-rest-dist/target
 Finally, start the server (note that you can configure a log file by including the `-Dorg.slf4j.simpleLogger.logFile=ke.log` system property to the JVM):
 
 ```bash
-java -Dorg.slf4j.simpleLogger.logFile=ke.log -cp "smart-connector-rest-dist-1.1.3.jar:dependency/*" eu.knowledge.engine.rest.Main 8280
+java -Dorg.slf4j.simpleLogger.logFile=ke.log -cp "smart-connector-rest-dist-1.2.0.jar:dependency/*" eu.knowledge.engine.rest.Main 8280
 ```
 
 If you want to run in it in the background, you can use the `nohup` linux command (which does not use the simpleLogger configuration system property, but redirects the standard err/out):
 
 ```bash
-nohup java -cp "smart-connector-rest-dist-1.1.3.jar:dependency/*" eu.knowledge.engine.rest.Main 8280 > ke.log
+nohup java -cp "smart-connector-rest-dist-1.2.0.jar:dependency/*" eu.knowledge.engine.rest.Main 8280 > ke.log
 ```
 
 ### Starting the Knowledge Engine in distributed mode
@@ -242,7 +242,7 @@ First of all, you need to start a knowledge directory. The desired port number f
 ```bash
 cd knowledge-directory/target/
 
-java -Dorg.slf4j.simpleLogger.logFile=kd.log -cp "knowledge-directory-1.1.3.jar:dependency/*" eu.knowledge.engine.knowledgedirectory.Main 8080
+java -Dorg.slf4j.simpleLogger.logFile=kd.log -cp "knowledge-directory-1.2.0.jar:dependency/*" eu.knowledge.engine.knowledgedirectory.Main 8080
 ```
 
 As explained in the local mode section, `nohup` can be used to run the process in the background. On overview of the registered Knowledge Engine runtimes can be found on `http://localhost:8080/ker/` (or another host or port if you desire).
@@ -265,7 +265,7 @@ export KD_URL=http://localhost:8080
 export KE_RUNTIME_EXPOSED_URL=http://localhost:8081
 export KE_RUNTIME_PORT=8081
 
-java -Dorg.slf4j.simpleLogger.logFile=ke.log -cp "smart-connector-rest-dist-1.1.3.jar:dependency/*" eu.knowledge.engine.rest.Main 8280
+java -Dorg.slf4j.simpleLogger.logFile=ke.log -cp "smart-connector-rest-dist-1.2.0.jar:dependency/*" eu.knowledge.engine.rest.Main 8280
 ```
 
 As explained in the local mode section, `nohup` can be used to run the process in the background.

examples/authentication/docker-compose.yml

@@ -9,15 +9,15 @@ services:
     depends_on:
       - knowledge-directory
   knowledge-directory:
-    image: ghcr.io/tno/knowledge-engine/knowledge-directory:1.1.4-SNAPSHOT
+    image: ghcr.io/tno/knowledge-engine/knowledge-directory:1.2.0
   runtime-1:
-    image: ghcr.io/tno/knowledge-engine/smart-connector:1.1.4-SNAPSHOT
+    image: ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
     environment:
       KE_RUNTIME_PORT: 8081 # The port that the KE uses to listen for inter-KE-runtime communication.
       KD_URL: http://thisisausername:thisisapassword@nginx/kd
       KE_RUNTIME_EXPOSED_URL: http://thisisausername:thisisapassword@nginx/ker1
   runtime-2:
-    image: ghcr.io/tno/knowledge-engine/smart-connector:1.1.4-SNAPSHOT
+    image: ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
     environment:
       KE_RUNTIME_PORT: 8081 # The port that the KE uses to listen for inter-KE-runtime communication.
       KD_URL: http://thisisausername:thisisapassword@nginx/kd

examples/multiple-runtimes/docker-compose.yml

@@ -2,25 +2,25 @@ services:
   # This is the knowledge directory, facilitating discovery between different
   # runtimes. It exposes its service over port 8282.
   knowledge-directory:
-    image: ghcr.io/tno/knowledge-engine/knowledge-directory:1.1.3
+    image: ghcr.io/tno/knowledge-engine/knowledge-directory:1.2.0
 
   # These services are seperate Knowledge Engine runtime, which can host
   # multiple smart connectors. Note that the REST API port is a DIFFERENT port
   # number than the ones configured below. It is still the default 8280.
   runtime-1:
-    image: ghcr.io/tno/knowledge-engine/smart-connector:1.1.3
+    image: ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
     environment: 
       KE_RUNTIME_PORT: 8081 # The port that the KE uses to listen for inter-KE-runtime communication.
       KE_RUNTIME_EXPOSED_URL: http://runtime-1:8081 # The URL where the runtime is available for inter-runtime communication from the outside.
       KD_URL: http://knowledge-directory:8282
   runtime-2:
-    image: ghcr.io/tno/knowledge-engine/smart-connector:1.1.3
+    image: ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
     environment: 
       KE_RUNTIME_PORT: 8081
       KE_RUNTIME_EXPOSED_URL: http://runtime-2:8081
       KD_URL: http://knowledge-directory:8282
   runtime-3:
-    image: ghcr.io/tno/knowledge-engine/smart-connector:1.1.3
+    image: ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
     environment: 
       KE_RUNTIME_PORT: 8081
       KE_RUNTIME_EXPOSED_URL: http://runtime-3:8081

examples/rest-api/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   knowledge-engine:
-    image: ghcr.io/tno/knowledge-engine/smart-connector:1.1.3
+    image: ghcr.io/tno/knowledge-engine/smart-connector:1.2.0
     healthcheck:
       test: curl -f http://localhost:8280/rest/sc
       interval: 1s

pom.xml

@@ -74,7 +74,7 @@
 		<java.version>17</java.version>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
-		<revision>1.1.4-SNAPSHOT</revision>
+		<revision>1.2.0</revision>
 	</properties>
 
 	<dependencyManagement>

smart-connector-rest-server/src/main/resources/openapi-sc.yaml

@@ -7,7 +7,7 @@ info:
     Interactions are (un)registered and data is exchanged. Each Smart Connector
     is coupled with a Knowledge Base Id, so every rest call uses this Knowledge
     Base Id to identify yourself.
-  version: 1.1.4-SNAPSHOT
+  version: 1.2.0
 
 paths:
   /sc:

smart-connector/src/main/java/eu/knowledge/engine/smartconnector/runtime/messaging/KnowledgeDirectoryConnection.java

@@ -39,7 +39,7 @@ public class KnowledgeDirectoryConnection {
 
 	private final static Logger LOG = org.slf4j.LoggerFactory.getLogger(KnowledgeDirectoryConnection.class);
 
-	private static final String PROTOCOL_VERSION = "1.0.0-SNAPSHOT";
+	private static final String PROTOCOL_VERSION = "1.0.0";
 
 	public static enum State {
 		UNREGISTERED, REGISTERED, INTERRUPTED, STOPPING, STOPPED