conflict solve

Author: omursahin

README.md

@@ -76,7 +76,7 @@ They are based on numerical and string-based functions previously used in the li
 We just re-implemented in different languages, and put them behind a web service.
 
 For the RESTful APIs, each API has an endpoint where the OpenAPI/Swagger schemas can be downloaded from.
-For simplicity, all schemas are also available as JSON/YML files under the folder [openapi-swagger](./openapi-swagger).
+For simplicity, all schemas are also available as JSON/YML files under the folder [openapi](openapi).
 
 > **IMPORTANT**: More details (e.g., #LOCs and used databases) on these APIs can be found [in this table](statistics/table_emb.md).
 

build.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/bibliothek__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
      -jar bibliothek-sut.jar \
     --server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/

dockerfiles/bibliothek.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/blogapi__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
      -jar blogapi-sut.jar \
     --server.port=8080 --spring.datasource.url="jdbc:mysql://db:3306/blogapi?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true"

dockerfiles/blogapi.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/catwatch__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -Dserver.port=8080 -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password -jar catwatch-sut.jar \
 

dockerfiles/catwatch.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/commafeed__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -Dquarkus.http.port=8080 -Dquarkus.datasource.db-kind=h2 -Dquarkus.datasource.jdbc.url="jdbc:h2:mem:commafeed;DB_CLOSE_DELAY=-1" -Dquarkus.datasource.username=sa -Dquarkus.datasource.password=sa -jar commafeed-sut.jar \
 

dockerfiles/commafeed.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/cwa-verification__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.datasource.username=sa -Dspring.datasource.password -jar cwa-verification-sut.jar \
     --server.port=8080 --spring.profiles.active=local,external,internal --management.server.port=-1 --server.ssl.enabled=false --cwa-testresult-server.url=http://cwa-testresult-server:8088

dockerfiles/cwa-verification.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/erc20-rest-service__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
      -jar erc20-rest-service-sut.jar \
     --server.port=8080

dockerfiles/erc20-rest-service.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/familie-ba-sak__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience -jar familie-ba-sak-sut.jar \
     --server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:${AUTH_PORT:-8081}/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a

dockerfiles/familie-ba-sak.dockerfile

@@ -5,13 +5,9 @@ COPY ./dist/jacocoagent.jar .
 
 
 
-#ENV TOOL="undefined"
-#ENV RUN="0"
 
 ENTRYPOINT \
     java \
-#    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/features-service__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password -jar features-service-sut.jar \
     --server.port=8080