Merge pull request #3 from hb0/release-1.0.1_ES-134

Set version to 1.0.1

README.adoc

@@ -14,7 +14,7 @@ The project uses link:https://gradle.org/[Gradle] as the build system.
 
 === Using Docker
 
-- Change to the executable folder (e.g. `./executables/scone-crawler`)
+- Change to the executable folder (e.g. `./executables/crawler`)
 - Adjust the settings in `docker-compose.yml` like the API TOKEN
 - Execute `../../gradlew copyToDockerBuildFolder` to build the jar and arrange the docker files locally.
 - Execute `docker-compose build` to build a new Docker image locally with the most recent jar.
@@ -26,11 +26,11 @@ Execute `./gradlew publishAllPublicationsToLocalRepository` to build the `jar` f
 You can find them in `./build/repo/`.
 
 ==== Crawler
-Execute `java -jar scone-crawler-{$VERSION}-all.jar -lt "LIME_API_TOKEN"`
+Execute `java -jar crawler-{$VERSION}-all.jar -lt "LIME_API_TOKEN"`
 or without parameters to see the all, including the optional, parameters.
 
 ==== Processor
-Execute `java -jar scone-processor-{$VERSION}-fat.jar`
+Execute `java -jar processor-{$VERSION}-fat.jar`
 or with another random parameter to see the all, including the optional, parameters.
 
 [#_licensing]

build.gradle

@@ -58,7 +58,7 @@ subprojects {
   apply plugin: 'java'
 
   group = 'de.cyface'
-  version = '1.0.0'
+  version = '1.0.1'
 
   tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'

executables/scone-crawler/build.gradle → executables/crawler/build.gradle

@@ -57,5 +57,5 @@ task copyToDockerBuildFolder(type: Copy) {
     into './build/docker/'
     from './src/main/docker/'
     from shadowJar.outputs
-    rename 'scone-crawler-(.*)-all.jar','scone-crawler-all.jar'
+    rename 'crawler-(.*)-all.jar','crawler-all.jar'
 }

executables/scone-crawler/docker-compose.yml → executables/crawler/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
   mongo-data:
-    container_name: scone_mongo
+    container_name: crawler_mongo
     #restart: always - only in production
     image: mongo:4.4.4
     ports:
@@ -15,11 +15,11 @@ services:
         source: mongo-data-db
         target: /data/db
 
-  scone-crawler:
-    container_name: scone_crawler
+  crawler-crawler:
+    container_name: crawler_crawler
     #restart: always - only in production
     build: ./build/docker/
-    image: scone-crawler:0.0.0
+    image: crawler:0.0.0
     volumes:
       - ./logs:/logs
     environment:

executables/scone-crawler/src/main/docker/Dockerfile → executables/crawler/src/main/docker/Dockerfile

@@ -24,7 +24,7 @@ MAINTAINER Cyface GmbH <mail@cyface.de>
 # Set the working directory to /app
 WORKDIR /app
 
-COPY scone-crawler-all.jar /app
+COPY crawler-all.jar /app
 COPY entrypoint.sh /app
 RUN chmod +x /app/entrypoint.sh
 

executables/scone-crawler/src/main/docker/entrypoint.sh → executables/crawler/src/main/docker/entrypoint.sh

@@ -53,7 +53,7 @@ if [[ -n $NUMBER_OF_CRAWLERS ]]; then
 	NOC_PARAMETER=" -noc $NUMBER_OF_CRAWLERS "
 fi
 
-echo "Running Scone Crawler"
+echo "Running Crawler"
 
 echo "Waiting for Database to start!"
 
@@ -77,4 +77,4 @@ if [ "$COUNTER" -ge 10 ]; then
 fi
 
 echo "Starting Crawler"
-java -jar scone-crawler-all.jar -lt "$LIME_API_TOKEN" "$MBR_PARAMETER" "$MRH_PARAMETER" "$MRC_PARAMETER" "$CN_PARAMETER" "$NOC_PARAMETER" &> /logs/scone-crawler-out.log
+java -jar crawler-all.jar -lt "$LIME_API_TOKEN" "$MBR_PARAMETER" "$MRH_PARAMETER" "$MRC_PARAMETER" "$CN_PARAMETER" "$NOC_PARAMETER" &> /logs/crawler-out.log

executables/scone-processor/build.gradle → executables/processor/build.gradle

@@ -54,5 +54,5 @@ task copyToDockerBuildFolder(type: Copy) {
     into './build/docker/'
     from './src/main/docker/'
     from shadowJar.outputs
-    rename 'scone-processor-(.*)-all.jar','scone-processor-all.jar'
+    rename 'processor-(.*)-all.jar','processor-all.jar'
 }

executables/scone-processor/docker-compose.yml → executables/processor/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
   mongo-data:
-    container_name: scone_mongo
+    container_name: crawler_mongo
     image: mongo:4.4.4
     ports:
       - "127.0.0.1:27018:27017"
@@ -15,17 +15,17 @@ services:
         target: /data/db
 
   postgres:
-    container_name: scone_postgres
+    container_name: crawler_postgres
     image: postgis/postgis:13-3.1-alpine
     ports:
       - "127.0.0.1:5433:5432"
     environment:
       POSTGRES_PASSWORD: 'postgres'
 
-  scone-processor:
-    container_name: scone_processor
+  crawler-processor:
+    container_name: crawler_processor
     build: ./build/docker/
-    image: scone-processor:0.0.0
+    image: processor:0.0.0
     volumes:
       - ./logs:/logs
 

executables/scone-processor/src/main/docker/Dockerfile → executables/processor/src/main/docker/Dockerfile

@@ -24,7 +24,7 @@ MAINTAINER Cyface GmbH <mail@cyface.de>
 # Set the working directory to /app
 WORKDIR /app
 
-COPY scone-processor-all.jar /app
+COPY processor-all.jar /app
 COPY entrypoint.sh /app
 RUN chmod +x /app/entrypoint.sh
 

executables/scone-processor/src/main/docker/entrypoint.sh → executables/processor/src/main/docker/entrypoint.sh

@@ -18,7 +18,7 @@
 #
 # Version 1.0.0
 
-echo "Running Scone Processor"
+echo "Running Processor"
 
 echo "Waiting for Databases to start!"
 
@@ -63,5 +63,5 @@ if [ "$COUNTER" -ge 10 ]; then
 fi
 
 # PROCESSOR
-echo "Starting Scone Processor"
-java -jar scone-processor-all.jar &> /logs/scone-processor-out.log
+echo "Starting Processor"
+java -jar processor-all.jar &> /logs/processor-out.log

settings.gradle

@@ -13,7 +13,7 @@
 include ':libs'
 include ':libs:model'
 include ':executables'
-include ':executables:scone-crawler'
-include ':executables:scone-processor'
+include ':executables:crawler'
+include ':executables:processor'
 
 rootProject.name = 'crawler'