diff --git a/fpi-framework-bom/.gitignore b/bom/.gitignore similarity index 90% rename from fpi-framework-bom/.gitignore rename to bom/.gitignore index f8014ff..21a55a6 100644 --- a/fpi-framework-bom/.gitignore +++ b/bom/.gitignore @@ -1,47 +1,47 @@ -#Maven -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -release.properties -.flattened-pom.xml - -# Eclipse -.project -.classpath -.settings/ -bin/ - -# IntelliJ -.idea -*.ipr -*.iml -*.iws - -# NetBeans -nb-configuration.xml - -# Visual Studio Code -.vscode -.factorypath - -# OSX -.DS_Store - -# Vim -*.swp -*.swo - -# patch -*.orig -*.rej - -# Local environment -.env -/app.yaml - -# Prod Keys -**/*application-prod.yml - -# Versioning plugin -.git-versioned-pom.xml +#Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +release.properties +.flattened-pom.xml + +# Eclipse +.project +.classpath +.settings/ +bin/ + +# IntelliJ +.idea +*.ipr +*.iml +*.iws + +# NetBeans +nb-configuration.xml + +# Visual Studio Code +.vscode +.factorypath + +# OSX +.DS_Store + +# Vim +*.swp +*.swo + +# patch +*.orig +*.rej + +# Local environment +.env +/app.yaml + +# Prod Keys +**/*application-prod.yml + +# Versioning plugin +.git-versioned-pom.xml diff --git a/fpi-framework-bom/.mvn/extensions.xml b/bom/.mvn/extensions.xml similarity index 100% rename from fpi-framework-bom/.mvn/extensions.xml rename to bom/.mvn/extensions.xml diff --git a/fpi-framework-bom/.mvn/maven-git-versioning-extension.xml b/bom/.mvn/maven-git-versioning-extension.xml similarity index 100% rename from fpi-framework-bom/.mvn/maven-git-versioning-extension.xml rename to bom/.mvn/maven-git-versioning-extension.xml diff --git a/fpi-framework-core/.mvn/wrapper/.gitignore b/bom/.mvn/wrapper/.gitignore similarity index 100% rename from fpi-framework-core/.mvn/wrapper/.gitignore rename to bom/.mvn/wrapper/.gitignore diff --git a/fpi-framework-core/.mvn/wrapper/MavenWrapperDownloader.java b/bom/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from fpi-framework-core/.mvn/wrapper/MavenWrapperDownloader.java rename to bom/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/fpi-framework-core/.mvn/wrapper/maven-wrapper.properties b/bom/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from fpi-framework-core/.mvn/wrapper/maven-wrapper.properties rename to bom/.mvn/wrapper/maven-wrapper.properties diff --git a/fpi-framework-core/.mvn/wrapper/settings.xml b/bom/.mvn/wrapper/settings.xml similarity index 100% rename from fpi-framework-core/.mvn/wrapper/settings.xml rename to bom/.mvn/wrapper/settings.xml diff --git a/fpi-framework-core/mvnw b/bom/mvnw similarity index 100% rename from fpi-framework-core/mvnw rename to bom/mvnw diff --git a/fpi-framework-core/mvnw.cmd b/bom/mvnw.cmd similarity index 100% rename from fpi-framework-core/mvnw.cmd rename to bom/mvnw.cmd diff --git a/fpi-framework-bom/pom.xml b/bom/pom.xml similarity index 95% rename from fpi-framework-bom/pom.xml rename to bom/pom.xml index 60c770d..c2955f1 100644 --- a/fpi-framework-bom/pom.xml +++ b/bom/pom.xml @@ -72,6 +72,7 @@ 1.5.3.Final true 3.0.0-M7 + 3.0.0 0.2.0 1.18.24 3.12.0 @@ -168,6 +169,7 @@ + org.apache.maven.plugins maven-compiler-plugin ${compiler-plugin.version} @@ -209,6 +211,7 @@ + org.apache.maven.plugins maven-surefire-plugin ${surefire-plugin.version} @@ -220,6 +223,7 @@ + org.apache.maven.plugins maven-failsafe-plugin ${surefire-plugin.version} @@ -258,6 +262,12 @@ + + org.apache.maven.plugins + maven-deploy-plugin + ${deploy-plugin.version} + + diff --git a/fpi-framework-core/src/main/appengine/app.yaml b/bom/src/main/appengine/app.yaml similarity index 100% rename from fpi-framework-core/src/main/appengine/app.yaml rename to bom/src/main/appengine/app.yaml diff --git a/fpi-framework-core/src/main/docker/Dockerfile.jvm b/bom/src/main/docker/Dockerfile.jvm similarity index 100% rename from fpi-framework-core/src/main/docker/Dockerfile.jvm rename to bom/src/main/docker/Dockerfile.jvm diff --git a/fpi-framework-core/src/main/docker/Dockerfile.legacy-jar b/bom/src/main/docker/Dockerfile.legacy-jar similarity index 100% rename from fpi-framework-core/src/main/docker/Dockerfile.legacy-jar rename to bom/src/main/docker/Dockerfile.legacy-jar diff --git a/fpi-framework-core/src/main/docker/Dockerfile.native b/bom/src/main/docker/Dockerfile.native similarity index 100% rename from fpi-framework-core/src/main/docker/Dockerfile.native rename to bom/src/main/docker/Dockerfile.native diff --git a/fpi-framework-core/src/main/docker/Dockerfile.native-micro b/bom/src/main/docker/Dockerfile.native-micro similarity index 100% rename from fpi-framework-core/src/main/docker/Dockerfile.native-micro rename to bom/src/main/docker/Dockerfile.native-micro diff --git a/fpi-framework-core/.gitignore b/core/.gitignore similarity index 100% rename from fpi-framework-core/.gitignore rename to core/.gitignore diff --git a/fpi-framework-core/.mvn/extensions.xml b/core/.mvn/extensions.xml similarity index 100% rename from fpi-framework-core/.mvn/extensions.xml rename to core/.mvn/extensions.xml diff --git a/fpi-framework-core/.mvn/maven-git-versioning-extension.xml b/core/.mvn/maven-git-versioning-extension.xml similarity index 100% rename from fpi-framework-core/.mvn/maven-git-versioning-extension.xml rename to core/.mvn/maven-git-versioning-extension.xml diff --git a/fpi-framework-pom/.mvn/wrapper/.gitignore b/core/.mvn/wrapper/.gitignore similarity index 100% rename from fpi-framework-pom/.mvn/wrapper/.gitignore rename to core/.mvn/wrapper/.gitignore diff --git a/fpi-framework-pom/.mvn/wrapper/MavenWrapperDownloader.java b/core/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from fpi-framework-pom/.mvn/wrapper/MavenWrapperDownloader.java rename to core/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/fpi-framework-pom/.mvn/wrapper/maven-wrapper.properties b/core/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from fpi-framework-pom/.mvn/wrapper/maven-wrapper.properties rename to core/.mvn/wrapper/maven-wrapper.properties diff --git a/fpi-framework-pom/.mvn/wrapper/settings.xml b/core/.mvn/wrapper/settings.xml similarity index 100% rename from fpi-framework-pom/.mvn/wrapper/settings.xml rename to core/.mvn/wrapper/settings.xml diff --git a/fpi-framework-pom/mvnw b/core/mvnw similarity index 100% rename from fpi-framework-pom/mvnw rename to core/mvnw diff --git a/fpi-framework-pom/mvnw.cmd b/core/mvnw.cmd similarity index 100% rename from fpi-framework-pom/mvnw.cmd rename to core/mvnw.cmd diff --git a/fpi-framework-core/pom.xml b/core/pom.xml similarity index 98% rename from fpi-framework-core/pom.xml rename to core/pom.xml index 0c1a1cc..aadb557 100644 --- a/fpi-framework-core/pom.xml +++ b/core/pom.xml @@ -58,7 +58,7 @@ com.abavilla fpi-framework-bom 0 - ../fpi-framework-bom/pom.xml + ../bom/pom.xml diff --git a/fpi-framework-pom/src/main/appengine/app.yaml b/core/src/main/appengine/app.yaml similarity index 100% rename from fpi-framework-pom/src/main/appengine/app.yaml rename to core/src/main/appengine/app.yaml diff --git a/fpi-framework-pom/src/main/docker/Dockerfile.jvm b/core/src/main/docker/Dockerfile.jvm similarity index 100% rename from fpi-framework-pom/src/main/docker/Dockerfile.jvm rename to core/src/main/docker/Dockerfile.jvm diff --git a/fpi-framework-pom/src/main/docker/Dockerfile.legacy-jar b/core/src/main/docker/Dockerfile.legacy-jar similarity index 100% rename from fpi-framework-pom/src/main/docker/Dockerfile.legacy-jar rename to core/src/main/docker/Dockerfile.legacy-jar diff --git a/fpi-framework-pom/src/main/docker/Dockerfile.native b/core/src/main/docker/Dockerfile.native similarity index 100% rename from fpi-framework-pom/src/main/docker/Dockerfile.native rename to core/src/main/docker/Dockerfile.native diff --git a/fpi-framework-pom/src/main/docker/Dockerfile.native-micro b/core/src/main/docker/Dockerfile.native-micro similarity index 100% rename from fpi-framework-pom/src/main/docker/Dockerfile.native-micro rename to core/src/main/docker/Dockerfile.native-micro diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java b/core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java rename to core/src/main/java/com/abavilla/fpi/fw/FPIApplication.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/BaseReflectionConfig.java b/core/src/main/java/com/abavilla/fpi/fw/config/BaseReflectionConfig.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/BaseReflectionConfig.java rename to core/src/main/java/com/abavilla/fpi/fw/config/BaseReflectionConfig.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java b/core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java rename to core/src/main/java/com/abavilla/fpi/fw/config/ObjectMapperConfig.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/codec/AbsEnumCodec.java b/core/src/main/java/com/abavilla/fpi/fw/config/codec/AbsEnumCodec.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/codec/AbsEnumCodec.java rename to core/src/main/java/com/abavilla/fpi/fw/config/codec/AbsEnumCodec.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/codec/IEnumCodecProvider.java b/core/src/main/java/com/abavilla/fpi/fw/config/codec/IEnumCodecProvider.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/codec/IEnumCodecProvider.java rename to core/src/main/java/com/abavilla/fpi/fw/config/codec/IEnumCodecProvider.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/codec/impl/SampleEnumCodec.java b/core/src/main/java/com/abavilla/fpi/fw/config/codec/impl/SampleEnumCodec.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/config/codec/impl/SampleEnumCodec.java rename to core/src/main/java/com/abavilla/fpi/fw/config/codec/impl/SampleEnumCodec.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java rename to core/src/main/java/com/abavilla/fpi/fw/controller/AbsBaseResource.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java rename to core/src/main/java/com/abavilla/fpi/fw/controller/AbsReadOnlyResource.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java rename to core/src/main/java/com/abavilla/fpi/fw/controller/AbsResource.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java rename to core/src/main/java/com/abavilla/fpi/fw/controller/ICRUDResource.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/IReadOnlyResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/IReadOnlyResource.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/IReadOnlyResource.java rename to core/src/main/java/com/abavilla/fpi/fw/controller/IReadOnlyResource.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/IResource.java b/core/src/main/java/com/abavilla/fpi/fw/controller/IResource.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/controller/IResource.java rename to core/src/main/java/com/abavilla/fpi/fw/controller/IResource.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/AbsDto.java b/core/src/main/java/com/abavilla/fpi/fw/dto/AbsDto.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/AbsDto.java rename to core/src/main/java/com/abavilla/fpi/fw/dto/AbsDto.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/AbsFieldDto.java b/core/src/main/java/com/abavilla/fpi/fw/dto/AbsFieldDto.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/AbsFieldDto.java rename to core/src/main/java/com/abavilla/fpi/fw/dto/AbsFieldDto.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/IDto.java b/core/src/main/java/com/abavilla/fpi/fw/dto/IDto.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/IDto.java rename to core/src/main/java/com/abavilla/fpi/fw/dto/IDto.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/impl/NullDto.java b/core/src/main/java/com/abavilla/fpi/fw/dto/impl/NullDto.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/impl/NullDto.java rename to core/src/main/java/com/abavilla/fpi/fw/dto/impl/NullDto.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/impl/PageDto.java b/core/src/main/java/com/abavilla/fpi/fw/dto/impl/PageDto.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/impl/PageDto.java rename to core/src/main/java/com/abavilla/fpi/fw/dto/impl/PageDto.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/impl/RespDto.java b/core/src/main/java/com/abavilla/fpi/fw/dto/impl/RespDto.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/dto/impl/RespDto.java rename to core/src/main/java/com/abavilla/fpi/fw/dto/impl/RespDto.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java b/core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java rename to core/src/main/java/com/abavilla/fpi/fw/engine/AbsEngine.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/engine/IEngine.java b/core/src/main/java/com/abavilla/fpi/fw/engine/IEngine.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/engine/IEngine.java rename to core/src/main/java/com/abavilla/fpi/fw/engine/IEngine.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/AbsItem.java b/core/src/main/java/com/abavilla/fpi/fw/entity/AbsItem.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/AbsItem.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/AbsItem.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/IField.java b/core/src/main/java/com/abavilla/fpi/fw/entity/IField.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/IField.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/IField.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/IItem.java b/core/src/main/java/com/abavilla/fpi/fw/entity/IItem.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/IItem.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/IItem.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/enums/IBaseEnum.java b/core/src/main/java/com/abavilla/fpi/fw/entity/enums/IBaseEnum.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/enums/IBaseEnum.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/enums/IBaseEnum.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/enums/SampleEnum.java b/core/src/main/java/com/abavilla/fpi/fw/entity/enums/SampleEnum.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/enums/SampleEnum.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/enums/SampleEnum.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/impl/NullItem.java b/core/src/main/java/com/abavilla/fpi/fw/entity/impl/NullItem.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/impl/NullItem.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/impl/NullItem.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoField.java b/core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoField.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoField.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoField.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoItem.java b/core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoItem.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoItem.java rename to core/src/main/java/com/abavilla/fpi/fw/entity/mongo/AbsMongoItem.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/ApiSvcEx.java b/core/src/main/java/com/abavilla/fpi/fw/exceptions/ApiSvcEx.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/ApiSvcEx.java rename to core/src/main/java/com/abavilla/fpi/fw/exceptions/ApiSvcEx.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/AuthApiSvcEx.java b/core/src/main/java/com/abavilla/fpi/fw/exceptions/AuthApiSvcEx.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/AuthApiSvcEx.java rename to core/src/main/java/com/abavilla/fpi/fw/exceptions/AuthApiSvcEx.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/FPISvcEx.java b/core/src/main/java/com/abavilla/fpi/fw/exceptions/FPISvcEx.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/FPISvcEx.java rename to core/src/main/java/com/abavilla/fpi/fw/exceptions/FPISvcEx.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/OptimisticLockEx.java b/core/src/main/java/com/abavilla/fpi/fw/exceptions/OptimisticLockEx.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/OptimisticLockEx.java rename to core/src/main/java/com/abavilla/fpi/fw/exceptions/OptimisticLockEx.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java b/core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java rename to core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/mapper/IDtoToEntityMapper.java b/core/src/main/java/com/abavilla/fpi/fw/mapper/IDtoToEntityMapper.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/mapper/IDtoToEntityMapper.java rename to core/src/main/java/com/abavilla/fpi/fw/mapper/IDtoToEntityMapper.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/mapper/IMapper.java b/core/src/main/java/com/abavilla/fpi/fw/mapper/IMapper.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/mapper/IMapper.java rename to core/src/main/java/com/abavilla/fpi/fw/mapper/IMapper.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/mapper/IMongoItemMapper.java b/core/src/main/java/com/abavilla/fpi/fw/mapper/IMongoItemMapper.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/mapper/IMongoItemMapper.java rename to core/src/main/java/com/abavilla/fpi/fw/mapper/IMongoItemMapper.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java b/core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java rename to core/src/main/java/com/abavilla/fpi/fw/repo/AbsMongoRepo.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/repo/IMongoRepo.java b/core/src/main/java/com/abavilla/fpi/fw/repo/IMongoRepo.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/repo/IMongoRepo.java rename to core/src/main/java/com/abavilla/fpi/fw/repo/IMongoRepo.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java b/core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java rename to core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSecSvc.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSvc.java b/core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSvc.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSvc.java rename to core/src/main/java/com/abavilla/fpi/fw/rest/AbsApiSvc.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/IApi.java b/core/src/main/java/com/abavilla/fpi/fw/rest/IApi.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/IApi.java rename to core/src/main/java/com/abavilla/fpi/fw/rest/IApi.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/IApiKeyConfig.java b/core/src/main/java/com/abavilla/fpi/fw/rest/IApiKeyConfig.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/rest/IApiKeyConfig.java rename to core/src/main/java/com/abavilla/fpi/fw/rest/IApiKeyConfig.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/AbsRepoSvc.java b/core/src/main/java/com/abavilla/fpi/fw/service/AbsRepoSvc.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/AbsRepoSvc.java rename to core/src/main/java/com/abavilla/fpi/fw/service/AbsRepoSvc.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/AbsSvc.java b/core/src/main/java/com/abavilla/fpi/fw/service/AbsSvc.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/AbsSvc.java rename to core/src/main/java/com/abavilla/fpi/fw/service/AbsSvc.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/IProviderSvc.java b/core/src/main/java/com/abavilla/fpi/fw/service/IProviderSvc.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/IProviderSvc.java rename to core/src/main/java/com/abavilla/fpi/fw/service/IProviderSvc.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/ISvc.java b/core/src/main/java/com/abavilla/fpi/fw/service/ISvc.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/service/ISvc.java rename to core/src/main/java/com/abavilla/fpi/fw/service/ISvc.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/DateUtil.java b/core/src/main/java/com/abavilla/fpi/fw/util/DateUtil.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/DateUtil.java rename to core/src/main/java/com/abavilla/fpi/fw/util/DateUtil.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/FWConst.java b/core/src/main/java/com/abavilla/fpi/fw/util/FWConst.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/FWConst.java rename to core/src/main/java/com/abavilla/fpi/fw/util/FWConst.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/HttpUtil.java b/core/src/main/java/com/abavilla/fpi/fw/util/HttpUtil.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/HttpUtil.java rename to core/src/main/java/com/abavilla/fpi/fw/util/HttpUtil.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/MapperUtil.java b/core/src/main/java/com/abavilla/fpi/fw/util/MapperUtil.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/MapperUtil.java rename to core/src/main/java/com/abavilla/fpi/fw/util/MapperUtil.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/SigUtil.java b/core/src/main/java/com/abavilla/fpi/fw/util/SigUtil.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/SigUtil.java rename to core/src/main/java/com/abavilla/fpi/fw/util/SigUtil.java diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/UniUtil.java b/core/src/main/java/com/abavilla/fpi/fw/util/UniUtil.java similarity index 100% rename from fpi-framework-core/src/main/java/com/abavilla/fpi/fw/util/UniUtil.java rename to core/src/main/java/com/abavilla/fpi/fw/util/UniUtil.java diff --git a/pom.xml b/pom.xml index dce61c8..4dfc3e3 100644 --- a/pom.xml +++ b/pom.xml @@ -57,9 +57,9 @@ pom - fpi-framework-bom - fpi-framework-core - fpi-framework-pom + bom + core + pom diff --git a/fpi-framework-pom/.gitignore b/pom/.gitignore similarity index 100% rename from fpi-framework-pom/.gitignore rename to pom/.gitignore diff --git a/fpi-framework-pom/.mvn/extensions.xml b/pom/.mvn/extensions.xml similarity index 100% rename from fpi-framework-pom/.mvn/extensions.xml rename to pom/.mvn/extensions.xml diff --git a/fpi-framework-pom/.mvn/maven-git-versioning-extension.xml b/pom/.mvn/maven-git-versioning-extension.xml similarity index 100% rename from fpi-framework-pom/.mvn/maven-git-versioning-extension.xml rename to pom/.mvn/maven-git-versioning-extension.xml diff --git a/fpi-framework-bom/.mvn/wrapper/.gitignore b/pom/.mvn/wrapper/.gitignore similarity index 94% rename from fpi-framework-bom/.mvn/wrapper/.gitignore rename to pom/.mvn/wrapper/.gitignore index dc5f1f6..e72f5e8 100644 --- a/fpi-framework-bom/.mvn/wrapper/.gitignore +++ b/pom/.mvn/wrapper/.gitignore @@ -1 +1 @@ -maven-wrapper.jar +maven-wrapper.jar diff --git a/fpi-framework-bom/.mvn/wrapper/MavenWrapperDownloader.java b/pom/.mvn/wrapper/MavenWrapperDownloader.java similarity index 97% rename from fpi-framework-bom/.mvn/wrapper/MavenWrapperDownloader.java rename to pom/.mvn/wrapper/MavenWrapperDownloader.java index b43da89..1708393 100644 --- a/fpi-framework-bom/.mvn/wrapper/MavenWrapperDownloader.java +++ b/pom/.mvn/wrapper/MavenWrapperDownloader.java @@ -1,142 +1,142 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader -{ - private static final String WRAPPER_VERSION = "3.1.1"; - - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = - "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION - + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the - * default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main( String args[] ) - { - System.out.println( "- Downloader started" ); - File baseDirectory = new File( args[0] ); - System.out.println( "- Using base directory: " + baseDirectory.getAbsolutePath() ); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File( baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH ); - String url = DEFAULT_DOWNLOAD_URL; - if ( mavenWrapperPropertyFile.exists() ) - { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try - { - mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile ); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream ); - url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, url ); - } - catch ( IOException e ) - { - System.out.println( "- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" ); - } - finally - { - try - { - if ( mavenWrapperPropertyFileInputStream != null ) - { - mavenWrapperPropertyFileInputStream.close(); - } - } - catch ( IOException e ) - { - // Ignore ... - } - } - } - System.out.println( "- Downloading from: " + url ); - - File outputFile = new File( baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH ); - if ( !outputFile.getParentFile().exists() ) - { - if ( !outputFile.getParentFile().mkdirs() ) - { - System.out.println( "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() - + "'" ); - } - } - System.out.println( "- Downloading to: " + outputFile.getAbsolutePath() ); - try - { - downloadFileFromURL( url, outputFile ); - System.out.println( "Done" ); - System.exit( 0 ); - } - catch ( Throwable e ) - { - System.out.println( "- Error downloading" ); - e.printStackTrace(); - System.exit( 1 ); - } - } - - private static void downloadFileFromURL( String urlString, File destination ) - throws Exception - { - if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) - { - String username = System.getenv( "MVNW_USERNAME" ); - char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray(); - Authenticator.setDefault( new Authenticator() - { - @Override - protected PasswordAuthentication getPasswordAuthentication() - { - return new PasswordAuthentication( username, password ); - } - } ); - } - URL website = new URL( urlString ); - ReadableByteChannel rbc; - rbc = Channels.newChannel( website.openStream() ); - FileOutputStream fos = new FileOutputStream( destination ); - fos.getChannel().transferFrom( rbc, 0, Long.MAX_VALUE ); - fos.close(); - rbc.close(); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader +{ + private static final String WRAPPER_VERSION = "3.1.1"; + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION + + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the + * default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main( String args[] ) + { + System.out.println( "- Downloader started" ); + File baseDirectory = new File( args[0] ); + System.out.println( "- Using base directory: " + baseDirectory.getAbsolutePath() ); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File( baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH ); + String url = DEFAULT_DOWNLOAD_URL; + if ( mavenWrapperPropertyFile.exists() ) + { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try + { + mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile ); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream ); + url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, url ); + } + catch ( IOException e ) + { + System.out.println( "- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" ); + } + finally + { + try + { + if ( mavenWrapperPropertyFileInputStream != null ) + { + mavenWrapperPropertyFileInputStream.close(); + } + } + catch ( IOException e ) + { + // Ignore ... + } + } + } + System.out.println( "- Downloading from: " + url ); + + File outputFile = new File( baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH ); + if ( !outputFile.getParentFile().exists() ) + { + if ( !outputFile.getParentFile().mkdirs() ) + { + System.out.println( "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + + "'" ); + } + } + System.out.println( "- Downloading to: " + outputFile.getAbsolutePath() ); + try + { + downloadFileFromURL( url, outputFile ); + System.out.println( "Done" ); + System.exit( 0 ); + } + catch ( Throwable e ) + { + System.out.println( "- Error downloading" ); + e.printStackTrace(); + System.exit( 1 ); + } + } + + private static void downloadFileFromURL( String urlString, File destination ) + throws Exception + { + if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) + { + String username = System.getenv( "MVNW_USERNAME" ); + char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray(); + Authenticator.setDefault( new Authenticator() + { + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication( username, password ); + } + } ); + } + URL website = new URL( urlString ); + ReadableByteChannel rbc; + rbc = Channels.newChannel( website.openStream() ); + FileOutputStream fos = new FileOutputStream( destination ); + fos.getChannel().transferFrom( rbc, 0, Long.MAX_VALUE ); + fos.close(); + rbc.close(); + } + +} diff --git a/fpi-framework-bom/.mvn/wrapper/maven-wrapper.properties b/pom/.mvn/wrapper/maven-wrapper.properties similarity index 98% rename from fpi-framework-bom/.mvn/wrapper/maven-wrapper.properties rename to pom/.mvn/wrapper/maven-wrapper.properties index 8361f76..61a2ef1 100644 --- a/fpi-framework-bom/.mvn/wrapper/maven-wrapper.properties +++ b/pom/.mvn/wrapper/maven-wrapper.properties @@ -1,18 +1,18 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/fpi-framework-bom/.mvn/wrapper/settings.xml b/pom/.mvn/wrapper/settings.xml similarity index 98% rename from fpi-framework-bom/.mvn/wrapper/settings.xml rename to pom/.mvn/wrapper/settings.xml index 10980a5..e0b5f74 100644 --- a/fpi-framework-bom/.mvn/wrapper/settings.xml +++ b/pom/.mvn/wrapper/settings.xml @@ -1,27 +1,27 @@ - - - - - - github - ${GITHUB_USERNAME} - ${GITHUB_TOKEN} - - + + + + + + github + ${GITHUB_USERNAME} + ${GITHUB_TOKEN} + + \ No newline at end of file diff --git a/fpi-framework-pom/README.md b/pom/README.md similarity index 100% rename from fpi-framework-pom/README.md rename to pom/README.md diff --git a/fpi-framework-bom/mvnw b/pom/mvnw similarity index 97% rename from fpi-framework-bom/mvnw rename to pom/mvnw index e2030bd..eaa3d30 100644 --- a/fpi-framework-bom/mvnw +++ b/pom/mvnw @@ -1,316 +1,316 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`\\unset -f command; \\command -v java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/fpi-framework-bom/mvnw.cmd b/pom/mvnw.cmd similarity index 97% rename from fpi-framework-bom/mvnw.cmd rename to pom/mvnw.cmd index 684ddaa..abb7c32 100644 --- a/fpi-framework-bom/mvnw.cmd +++ b/pom/mvnw.cmd @@ -1,188 +1,188 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/fpi-framework-pom/pom.xml b/pom/pom.xml similarity index 99% rename from fpi-framework-pom/pom.xml rename to pom/pom.xml index 98ffe7d..29d1ead 100644 --- a/fpi-framework-pom/pom.xml +++ b/pom/pom.xml @@ -58,7 +58,7 @@ com.abavilla fpi-framework-bom 0 - ../fpi-framework-bom/pom.xml + ../bom/pom.xml diff --git a/fpi-framework-bom/src/main/appengine/app.yaml b/pom/src/main/appengine/app.yaml similarity index 95% rename from fpi-framework-bom/src/main/appengine/app.yaml rename to pom/src/main/appengine/app.yaml index 9d57b01..eba4e1e 100644 --- a/fpi-framework-bom/src/main/appengine/app.yaml +++ b/pom/src/main/appengine/app.yaml @@ -1,16 +1,16 @@ -runtime: custom -env: flex -liveness_check: - path: "/q/health/live" - check_interval_sec: 30 - timeout_sec: 4 - failure_threshold: 2 - success_threshold: 2 - -readiness_check: - path: "/q/health/ready " - check_interval_sec: 5 - timeout_sec: 4 - failure_threshold: 2 - success_threshold: 2 +runtime: custom +env: flex +liveness_check: + path: "/q/health/live" + check_interval_sec: 30 + timeout_sec: 4 + failure_threshold: 2 + success_threshold: 2 + +readiness_check: + path: "/q/health/ready " + check_interval_sec: 5 + timeout_sec: 4 + failure_threshold: 2 + success_threshold: 2 app_start_timeout_sec: 300 \ No newline at end of file diff --git a/fpi-framework-bom/src/main/docker/Dockerfile.jvm b/pom/src/main/docker/Dockerfile.jvm similarity index 98% rename from fpi-framework-bom/src/main/docker/Dockerfile.jvm rename to pom/src/main/docker/Dockerfile.jvm index 1c756d0..63d045e 100644 --- a/fpi-framework-bom/src/main/docker/Dockerfile.jvm +++ b/pom/src/main/docker/Dockerfile.jvm @@ -1,94 +1,94 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode -# -# Before building the container image run: -# -# ./mvnw package -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/code-with-quarkus-jvm . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm -# -# If you want to include the debug port into your docker image -# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 -# -# Then run the container using : -# -# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm -# -# This image uses the `run-java.sh` script to run the application. -# This scripts computes the command line to execute your Java application, and -# includes memory/GC tuning. -# You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") -# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options -# in JAVA_OPTS (example: "-Dsome.property=foo") -# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is -# used to calculate a default maximal heap memory based on a containers restriction. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio -# of the container available memory as set here. The default is `50` which means 50% -# of the available memory is used as an upper boundary. You can skip this mechanism by -# setting this value to `0` in which case no `-Xmx` option is added. -# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This -# is used to calculate a default initial heap memory based on the maximum heap memory. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio -# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` -# is used as the initial heap size. You can skip this mechanism by setting this value -# to `0` in which case no `-Xms` option is added (example: "25") -# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. -# This is used to calculate the maximum value of the initial heap memory. If used in -# a container without any memory constraints for the container then this option has -# no effect. If there is a memory constraint then `-Xms` is limited to the value set -# here. The default is 4096MB which means the calculated value of `-Xms` never will -# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") -# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output -# when things are happening. This option, if set to true, will set -# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). -# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: -# true"). -# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). -# - CONTAINER_CORE_LIMIT: A calculated core limit as described in -# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") -# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). -# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. -# (example: "20") -# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. -# (example: "40") -# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. -# (example: "4") -# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus -# previous GC times. (example: "90") -# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") -# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") -# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should -# contain the necessary JRE command-line options to specify the required GC, which -# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). -# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") -# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") -# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be -# accessed directly. (example: "foo.example.com,bar.example.com") -# -### -FROM registry.access.redhat.com/ubi8/openjdk-11:1.11 - -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' - - -# We make four distinct layers so if there are application changes the library layers can be re-used -COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ -COPY --chown=185 target/quarkus-app/*.jar /deployments/ -COPY --chown=185 target/quarkus-app/app/ /deployments/app/ -COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ - -EXPOSE 8080 -USER 185 -ENV AB_JOLOKIA_OFF="" -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" - +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode +# +# Before building the container image run: +# +# ./mvnw package +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/code-with-quarkus-jvm . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm +# +# If you want to include the debug port into your docker image +# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 +# +# Then run the container using : +# +# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm +# +# This image uses the `run-java.sh` script to run the application. +# This scripts computes the command line to execute your Java application, and +# includes memory/GC tuning. +# You can configure the behavior using the following environment properties: +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options +# in JAVA_OPTS (example: "-Dsome.property=foo") +# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is +# used to calculate a default maximal heap memory based on a containers restriction. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio +# of the container available memory as set here. The default is `50` which means 50% +# of the available memory is used as an upper boundary. You can skip this mechanism by +# setting this value to `0` in which case no `-Xmx` option is added. +# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This +# is used to calculate a default initial heap memory based on the maximum heap memory. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio +# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` +# is used as the initial heap size. You can skip this mechanism by setting this value +# to `0` in which case no `-Xms` option is added (example: "25") +# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. +# This is used to calculate the maximum value of the initial heap memory. If used in +# a container without any memory constraints for the container then this option has +# no effect. If there is a memory constraint then `-Xms` is limited to the value set +# here. The default is 4096MB which means the calculated value of `-Xms` never will +# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") +# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output +# when things are happening. This option, if set to true, will set +# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). +# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: +# true"). +# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). +# - CONTAINER_CORE_LIMIT: A calculated core limit as described in +# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") +# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). +# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. +# (example: "20") +# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. +# (example: "40") +# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. +# (example: "4") +# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus +# previous GC times. (example: "90") +# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") +# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") +# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should +# contain the necessary JRE command-line options to specify the required GC, which +# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). +# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") +# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") +# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be +# accessed directly. (example: "foo.example.com,bar.example.com") +# +### +FROM registry.access.redhat.com/ubi8/openjdk-11:1.11 + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' + + +# We make four distinct layers so if there are application changes the library layers can be re-used +COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ +COPY --chown=185 target/quarkus-app/*.jar /deployments/ +COPY --chown=185 target/quarkus-app/app/ /deployments/app/ +COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ + +EXPOSE 8080 +USER 185 +ENV AB_JOLOKIA_OFF="" +ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" + diff --git a/fpi-framework-bom/src/main/docker/Dockerfile.legacy-jar b/pom/src/main/docker/Dockerfile.legacy-jar similarity index 98% rename from fpi-framework-bom/src/main/docker/Dockerfile.legacy-jar rename to pom/src/main/docker/Dockerfile.legacy-jar index 5c29f36..7169565 100644 --- a/fpi-framework-bom/src/main/docker/Dockerfile.legacy-jar +++ b/pom/src/main/docker/Dockerfile.legacy-jar @@ -1,90 +1,90 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode -# -# Before building the container image run: -# -# ./mvnw package -Dquarkus.package.type=legacy-jar -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/code-with-quarkus-legacy-jar . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-legacy-jar -# -# If you want to include the debug port into your docker image -# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 -# -# Then run the container using : -# -# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-legacy-jar -# -# This image uses the `run-java.sh` script to run the application. -# This scripts computes the command line to execute your Java application, and -# includes memory/GC tuning. -# You can configure the behavior using the following environment properties: -# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") -# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options -# in JAVA_OPTS (example: "-Dsome.property=foo") -# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is -# used to calculate a default maximal heap memory based on a containers restriction. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio -# of the container available memory as set here. The default is `50` which means 50% -# of the available memory is used as an upper boundary. You can skip this mechanism by -# setting this value to `0` in which case no `-Xmx` option is added. -# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This -# is used to calculate a default initial heap memory based on the maximum heap memory. -# If used in a container without any memory constraints for the container then this -# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio -# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` -# is used as the initial heap size. You can skip this mechanism by setting this value -# to `0` in which case no `-Xms` option is added (example: "25") -# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. -# This is used to calculate the maximum value of the initial heap memory. If used in -# a container without any memory constraints for the container then this option has -# no effect. If there is a memory constraint then `-Xms` is limited to the value set -# here. The default is 4096MB which means the calculated value of `-Xms` never will -# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") -# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output -# when things are happening. This option, if set to true, will set -# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). -# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: -# true"). -# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). -# - CONTAINER_CORE_LIMIT: A calculated core limit as described in -# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") -# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). -# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. -# (example: "20") -# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. -# (example: "40") -# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. -# (example: "4") -# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus -# previous GC times. (example: "90") -# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") -# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") -# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should -# contain the necessary JRE command-line options to specify the required GC, which -# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). -# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") -# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") -# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be -# accessed directly. (example: "foo.example.com,bar.example.com") -# -### -FROM registry.access.redhat.com/ubi8/openjdk-11:1.11 - -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' - - -COPY target/lib/* /deployments/lib/ -COPY target/*-runner.jar /deployments/quarkus-run.jar - -EXPOSE 8080 -USER 185 -ENV AB_JOLOKIA_OFF="" -ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode +# +# Before building the container image run: +# +# ./mvnw package -Dquarkus.package.type=legacy-jar +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/code-with-quarkus-legacy-jar . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-legacy-jar +# +# If you want to include the debug port into your docker image +# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 +# +# Then run the container using : +# +# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-legacy-jar +# +# This image uses the `run-java.sh` script to run the application. +# This scripts computes the command line to execute your Java application, and +# includes memory/GC tuning. +# You can configure the behavior using the following environment properties: +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options +# in JAVA_OPTS (example: "-Dsome.property=foo") +# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is +# used to calculate a default maximal heap memory based on a containers restriction. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio +# of the container available memory as set here. The default is `50` which means 50% +# of the available memory is used as an upper boundary. You can skip this mechanism by +# setting this value to `0` in which case no `-Xmx` option is added. +# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This +# is used to calculate a default initial heap memory based on the maximum heap memory. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio +# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` +# is used as the initial heap size. You can skip this mechanism by setting this value +# to `0` in which case no `-Xms` option is added (example: "25") +# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. +# This is used to calculate the maximum value of the initial heap memory. If used in +# a container without any memory constraints for the container then this option has +# no effect. If there is a memory constraint then `-Xms` is limited to the value set +# here. The default is 4096MB which means the calculated value of `-Xms` never will +# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") +# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output +# when things are happening. This option, if set to true, will set +# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). +# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: +# true"). +# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). +# - CONTAINER_CORE_LIMIT: A calculated core limit as described in +# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") +# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). +# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. +# (example: "20") +# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. +# (example: "40") +# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. +# (example: "4") +# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus +# previous GC times. (example: "90") +# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") +# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") +# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should +# contain the necessary JRE command-line options to specify the required GC, which +# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). +# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") +# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") +# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be +# accessed directly. (example: "foo.example.com,bar.example.com") +# +### +FROM registry.access.redhat.com/ubi8/openjdk-11:1.11 + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' + + +COPY target/lib/* /deployments/lib/ +COPY target/*-runner.jar /deployments/quarkus-run.jar + +EXPOSE 8080 +USER 185 +ENV AB_JOLOKIA_OFF="" +ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" diff --git a/fpi-framework-bom/src/main/docker/Dockerfile.native b/pom/src/main/docker/Dockerfile.native similarity index 96% rename from fpi-framework-bom/src/main/docker/Dockerfile.native rename to pom/src/main/docker/Dockerfile.native index db6f234..b932d86 100644 --- a/fpi-framework-bom/src/main/docker/Dockerfile.native +++ b/pom/src/main/docker/Dockerfile.native @@ -1,27 +1,27 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. -# -# Before building the container image run: -# -# ./mvnw package -Pnative -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.native -t quarkus/code-with-quarkus . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus -# -### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 -WORKDIR /work/ -RUN chown 1001 /work \ - && chmod "g+rwX" /work \ - && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application - -EXPOSE 8080 -USER 1001 - -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. +# +# Before building the container image run: +# +# ./mvnw package -Pnative +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.native -t quarkus/code-with-quarkus . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus +# +### +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 +WORKDIR /work/ +RUN chown 1001 /work \ + && chmod "g+rwX" /work \ + && chown 1001:root /work +COPY --chown=1001:root target/*-runner /work/application + +EXPOSE 8080 +USER 1001 + +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/fpi-framework-bom/src/main/docker/Dockerfile.native-micro b/pom/src/main/docker/Dockerfile.native-micro similarity index 96% rename from fpi-framework-bom/src/main/docker/Dockerfile.native-micro rename to pom/src/main/docker/Dockerfile.native-micro index 7acabda..691cfe3 100644 --- a/fpi-framework-bom/src/main/docker/Dockerfile.native-micro +++ b/pom/src/main/docker/Dockerfile.native-micro @@ -1,30 +1,30 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. -# It uses a micro base image, tuned for Quarkus native executables. -# It reduces the size of the resulting container image. -# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image. -# -# Before building the container image run: -# -# ./mvnw package -Pnative -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/code-with-quarkus . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus -# -### -FROM quay.io/quarkus/quarkus-micro-image:1.0 -WORKDIR /work/ -RUN chown 1001 /work \ - && chmod "g+rwX" /work \ - && chown 1001:root /work -COPY --chown=1001:root target/*-runner /work/application - -EXPOSE 8080 -USER 1001 - -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] +#### +# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. +# It uses a micro base image, tuned for Quarkus native executables. +# It reduces the size of the resulting container image. +# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image. +# +# Before building the container image run: +# +# ./mvnw package -Pnative +# +# Then, build the image with: +# +# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/code-with-quarkus . +# +# Then run the container using: +# +# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus +# +### +FROM quay.io/quarkus/quarkus-micro-image:1.0 +WORKDIR /work/ +RUN chown 1001 /work \ + && chmod "g+rwX" /work \ + && chown 1001:root /work +COPY --chown=1001:root target/*-runner /work/application + +EXPOSE 8080 +USER 1001 + +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]