merge upstream theodolite-kotlin

.gitlab-ci.yml

@@ -227,7 +227,7 @@ deploy-uc4-load-generator:
       - .gradle/caches
   before_script:
     - export GRADLE_USER_HOME=`pwd`/.gradle
-    - cd theodolite-quarkus
+    - cd theodolite
 
 build-theodolite-jvm:
   stage: build
@@ -235,8 +235,8 @@ build-theodolite-jvm:
   script: ./gradlew --build-cache assemble
   artifacts:
     paths:
-      - "theodolite-quarkus/build/lib/*"
-      - "theodolite-quarkus/build/*-runner.jar"
+      - "theodolite/build/lib/*"
+      - "theodolite/build/*-runner.jar"
     expire_in: 6 hours
 
 build-theodolite-native:
@@ -247,7 +247,7 @@ build-theodolite-native:
   when: manual
   artifacts:
     paths:
-      - "theodolite-quarkus/build/*-runner"
+      - "theodolite/build/*-runner"
     expire_in: 6 hours
 
 test-theodolite:
@@ -260,7 +260,7 @@ test-theodolite:
   artifacts:
     reports:
       junit:
-        - "theodolite-quarkus/**/build/test-results/test/TEST-*.xml"
+        - "theodolite/**/build/test-results/test/TEST-*.xml"
 
 # Disabled for now
 .ktlint-theodolite:
@@ -303,7 +303,7 @@ deploy-theodolite:
     - if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW && $CI_COMMIT_TAG"
       when: always
     - changes:
-      - theodolite-quarkus/**/*
+      - theodolite/**/*
       if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW"
       when: always
     - if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW"

theodolite-quarkus/README.md → theodolite/README.md

-# Theodolite-quarkus project
+# Theodolite project
 
 This project uses Quarkus, the Supersonic Subatomic Java Framework.
 
@@ -20,7 +20,7 @@ The application can be packaged using:
 ./gradlew build
 ```
 
-It produces the `theodolite-quarkus-1.0.0-SNAPSHOT-runner.jar` file in the `/build` directory. Be aware that it’s not
+It produces the `theodolite-1.0.0-SNAPSHOT-runner.jar` file in the `/build` directory. Be aware that it’s not
 an _über-jar_ as the dependencies are copied into the `build/lib` directory.
 
 If you want to build an _über-jar_, execute the following command:
@@ -29,7 +29,7 @@ If you want to build an _über-jar_, execute the following command:
 ./gradlew build -Dquarkus.package.type=uber-jar
 ```
 
-The application is now runnable using `java -jar build/theodolite-quarkus-1.0.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar build/theodolite-1.0.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
@@ -46,7 +46,7 @@ Or, if you don't have GraalVM installed, you can run the native executable build
 ```
 
 You can then execute your native executable with:
-```./build/theodolite-quarkus-1.0.0-SNAPSHOT-runner```
+```./build/theodolite-1.0.0-SNAPSHOT-runner```
 
 If you want to learn more about building native executables, please consult https://quarkus.io/guides/gradle-tooling.
 
@@ -56,14 +56,14 @@ For the jvm version use:
 
 ```shell script
 ./gradlew build
-docker build -f src/main/docker/Dockerfile.jvm -t theodolite-quarkus-jvm .
+docker build -f src/main/docker/Dockerfile.jvm -t theodolite-jvm .
 ```
 
 For the native image version use:
 
 ```shell script
 ./gradlew build -Dquarkus.package.type=native
-docker build -f src/main/docker/Dockerfile.native -t theodolite-quarkus-native .
+docker build -f src/main/docker/Dockerfile.native -t theodolite-native .
 ```
 
 ## Execute docker images:
@@ -73,13 +73,13 @@ Remember to set the environment variables first.
 Jvm version:
 
 ```shell script
-docker run -i --rm theodolite-quarkus-jvm
+docker run -i --rm theodolite-jvm
 ```
 
 Native image version:
 
 ```shell script
-docker run -i --rm theodolite-quarkus-native
+docker run -i --rm theodolite-native
 ```
 
 ## Environment variables

theodolite-quarkus/build_jvm.sh → theodolite/build_jvm.sh

 
 ./gradlew build -x test
 
-docker build -f src/main/docker/Dockerfile.jvm -t quarkus/theodolite-quarkus-jvm .
+docker build -f src/main/docker/Dockerfile.jvm -t quarkus/theodolite-jvm .
 
-docker run -i --rm -p 8080:8080 quarkus/theodolite-quarkus-jvm
+docker run -i --rm -p 8080:8080 quarkus/theodolite-jvm

theodolite-quarkus/build_native.sh → theodolite/build_native.sh

 
 ./gradlew build -Dquarkus.package.type=native -x test
 
-docker build -f src/main/docker/Dockerfile.native -t quarkus/theodolite-quarkus .
+docker build -f src/main/docker/Dockerfile.native -t quarkus/theodolite .
 
-docker run -i --rm -p 8080:8080 quarkus/theodolite-quarkus
+docker run -i --rm -p 8080:8080 quarkus/theodolite