diff --git a/.gitignore b/.gitignore index b97206eaa9037206fb36f521f938d8c355afb4da..7dfd960a066a56242d1f21f747d379b10dc31cee 100644 --- a/.gitignore +++ b/.gitignore @@ -14,10 +14,10 @@ target/ *.ipr # Client -goofy-client/.vscode/ -goofy-client/apps/coverage/ -goofy-client/node/* -goofy-client/temp/* +alfa-client/.vscode/ +alfa-client/apps/coverage/ +alfa-client/node/* +alfa-client/temp/* .attach** .factorypath diff --git a/README.md b/README.md index ba4f7b1aa99980b1f6d9b503f4c9df400867bcdc..8e3bb2fff562cd7d8587a232724b0aad07d56d7b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Versionen -* Frontend: siehe [Client README.md](./goofy-client/README.md) +* Frontend: siehe [Client README.md](./alfa-client/README.md) ## IDE Setup Window > Preferences > Maven > Automatically update Maven projects configuration diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 1557d4b3ce77a0f74bd4a0363a200d8d25093902..d5cfb54b04d1162fa610e580ee6f4ffa91346ef2 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -414,9 +414,9 @@ Void initEnvUserVersions(userVersions) { env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl - env.VORGANG_MANAGER_IMAGE_TAG = userVersions.VorgangManagrImageTag - env.VORGANG_MANAGER_HELM_CHART_VERSION = userVersions.VorgangManagrHelmChartVersion - env.VORGANG_MANAGER_HELM_REPO_URL = userVersions.VorgangManagrHelmRepoUrl + env.VORGANG_MANAGER_IMAGE_TAG = userVersions.VorgangManagerImageTag + env.VORGANG_MANAGER_HELM_CHART_VERSION = userVersions.VorgangManagerHelmChartVersion + env.VORGANG_MANAGER_HELM_REPO_URL = userVersions.VorgangManagerHelmRepoUrl env.USER_MANAGER_IMAGE_TAG = userVersions.UserManagerImageTag env.USER_MANAGER_HELM_CHART_VERSION = userVersions.UserManagerHelmChartVersion env.USER_MANAGER_HELM_REPO_URL = userVersions.UserManagerHelmRepoUrl diff --git a/alfa-server/Dockerfile b/alfa-server/Dockerfile index 4aa7d7e7b1f6afadeb3ef6bf6abfc139af765006..37d7dfa6d1694a89d2c357df0cab54eb7284fefd 100644 --- a/alfa-server/Dockerfile +++ b/alfa-server/Dockerfile @@ -24,7 +24,7 @@ FROM openjdk:16-alpine -COPY /target/goofy-server.jar /opt/goofy.jar +COPY /target/alfa-server.jar /opt/alfa.jar WORKDIR /opt -CMD ["java", "-jar", "goofy.jar"] \ No newline at end of file +CMD ["java", "-jar", "alfa.jar"] \ No newline at end of file diff --git a/release-startdev.sh b/release-startdev.sh index 6109a020becc35cb8b5523acff118d422a964b18..89a0cb7ad075c650489d959a961af8b86749a255 100755 --- a/release-startdev.sh +++ b/release-startdev.sh @@ -16,8 +16,8 @@ echo # projectname/pom.xml:parent,main -> project.parent.version und project.version setzen # PROJECTS="pom.xml:main - goofy-server/pom.xml:parent - goofy-client/pom.xml:parent " + alfa-server/pom.xml:parent + alfa-client/pom.xml:parent " for PROJECT in $PROJECTS; do