From c03864352ed5b680bddd8fdf38873516e2d22a0d Mon Sep 17 00:00:00 2001 From: Ljupcho Palashevski Date: Mon, 29 May 2023 09:50:03 +0200 Subject: [PATCH] Set Egeria version to 4.1 Signed-off-by: Ljupcho Palashevski --- build.gradle | 2 +- .../License-Example-Files/License_for_POM_Files.xml | 2 +- .../test-cases/platform-origin-test-case.md | 2 +- .../docs/README.md | 2 +- .../docs/overview-of-the-graph-repository-connector.md | 4 ++-- .../adminservices/server/OMAGServerOriginServices.java | 2 +- .../server/OMAGServerPlatformOriginServices.java | 2 +- .../serverchassis/springboot/OMAGServerPlatform.java | 2 +- .../uichassis/springboot/EgeriaUIPlatform.java | 2 +- .../open-metadata-deployment/docker/README.md | 2 +- .../open-metadata-deployment/docker/configure/Dockerfile | 2 +- .../open-metadata-deployment/docker/egeria/Dockerfile | 2 +- .../docker/egeria/Dockerfile.selfbuild | 4 ++-- .../open-metadata-deployment/docker/egeria/README.md | 8 ++++---- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 0a97f487a18..7cd8004933c 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ plugins { */ allprojects { group = 'org.odpi.egeria' - version = '4.1-SNAPSHOT' + version = '4.1' // Signing/publish used in parent & child projects apply plugin: 'maven-publish' diff --git a/developer-resources/License-Example-Files/License_for_POM_Files.xml b/developer-resources/License-Example-Files/License_for_POM_Files.xml index 3b9628e13f8..e8e53ec4c9d 100644 --- a/developer-resources/License-Example-Files/License_for_POM_Files.xml +++ b/developer-resources/License-Example-Files/License_for_POM_Files.xml @@ -10,7 +10,7 @@ egeria org.odpi.egeria - 4.1-SNAPSHOT + 4.1 Add module name here diff --git a/open-metadata-conformance-suite/docs/platform-workbench/test-cases/platform-origin-test-case.md b/open-metadata-conformance-suite/docs/platform-workbench/test-cases/platform-origin-test-case.md index b8e46cb2dec..1766d350180 100644 --- a/open-metadata-conformance-suite/docs/platform-workbench/test-cases/platform-origin-test-case.md +++ b/open-metadata-conformance-suite/docs/platform-workbench/test-cases/platform-origin-test-case.md @@ -37,7 +37,7 @@ open metadata services are activated. "successfulAssertions" : [ "Origin descriptor retrieved from platform." ], "unsuccessfulAssertions" : [ ], "discoveredProperties" : { - "Repository origin id" : "Egeria OMAG Server Platform (version 4.1-SNAPSHOT)" + "Repository origin id" : "Egeria OMAG Server Platform (version 4.1)" } } ``` diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/docs/README.md b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/docs/README.md index 138fd6af85a..39a06eab95c 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/docs/README.md +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/docs/README.md @@ -43,7 +43,7 @@ following: ``` - 4.1-SNAPSHOT + 4.1 diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/docs/overview-of-the-graph-repository-connector.md b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/docs/overview-of-the-graph-repository-connector.md index f2f5b0857c9..1c73ed63113 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/docs/overview-of-the-graph-repository-connector.md +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/docs/overview-of-the-graph-repository-connector.md @@ -546,7 +546,7 @@ storage.backend=berkeleyje # Default: (no default value) # Data Type: String # Mutability: LOCAL -storage.directory=../../../egeria-install/egeria-omag-4.1-SNAPSHOT/data/servers/Metadata_Server/repository/graph/berkeley +storage.directory=../../../egeria-install/egeria-omag-4.1/data/servers/Metadata_Server/repository/graph/berkeley # The indexing backend used to extend and optimize JanusGraph's query # functionality. This setting is optional. JanusGraph can use multiple @@ -573,7 +573,7 @@ index.search.backend=lucene # Default: (no default value) # Data Type: String # Mutability: MASKABLE -index.search.directory=../../../egeria-install/egeria-omag-4.1-SNAPSHOT/data/servers/Metadata_Server/repository/graph/searchindex +index.search.directory=../../../egeria-install/egeria-omag-4.1/data/servers/Metadata_Server/repository/graph/searchindex ``` ---- License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/), diff --git a/open-metadata-implementation/admin-services/admin-services-server/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerOriginServices.java b/open-metadata-implementation/admin-services/admin-services-server/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerOriginServices.java index d5279ea0e94..3202ca78574 100644 --- a/open-metadata-implementation/admin-services/admin-services-server/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerOriginServices.java +++ b/open-metadata-implementation/admin-services/admin-services-server/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerOriginServices.java @@ -8,7 +8,7 @@ */ public class OMAGServerOriginServices { - final String implementationOrigin = "Egeria OMAG Server Platform (version 4.1-SNAPSHOT)\n"; + final String implementationOrigin = "Egeria OMAG Server Platform (version 4.1)\n"; /** * Return the origin of this server implementation. diff --git a/open-metadata-implementation/platform-services/platform-services-server/src/main/java/org/odpi/openmetadata/platformservices/server/OMAGServerPlatformOriginServices.java b/open-metadata-implementation/platform-services/platform-services-server/src/main/java/org/odpi/openmetadata/platformservices/server/OMAGServerPlatformOriginServices.java index 5cd3fc0177d..f5339a3abbb 100644 --- a/open-metadata-implementation/platform-services/platform-services-server/src/main/java/org/odpi/openmetadata/platformservices/server/OMAGServerPlatformOriginServices.java +++ b/open-metadata-implementation/platform-services/platform-services-server/src/main/java/org/odpi/openmetadata/platformservices/server/OMAGServerPlatformOriginServices.java @@ -8,7 +8,7 @@ */ public class OMAGServerPlatformOriginServices { - final String implementationOrigin = "Egeria OMAG Server Platform (version 4.1-SNAPSHOT)\n"; + final String implementationOrigin = "Egeria OMAG Server Platform (version 4.1)\n"; /** * Return the origin of this server platform implementation. diff --git a/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java b/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java index 62a86d74627..4f43ce72435 100644 --- a/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java +++ b/open-metadata-implementation/server-chassis/server-chassis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServerPlatform.java @@ -41,7 +41,7 @@ @OpenAPIDefinition( info = @Info( title = "Egeria's Open Metadata and Governance (OMAG) Server Platform", - version = "4.1-SNAPSHOT", + version = "4.1", description = "The OMAG Server Platform provides a runtime process and platform for Open Metadata and Governance (OMAG) Services.\n" + "\n" + "The OMAG services are configured and activated in OMAG Servers using the Administration Services.\n" + diff --git a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java index 876e68bc682..fb6794fc559 100644 --- a/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java +++ b/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/src/main/java/org/odpi/openmetadata/userinterface/uichassis/springboot/EgeriaUIPlatform.java @@ -28,7 +28,7 @@ @OpenAPIDefinition( info = @Info( title = "Egeria's Spring Boot based UI RESTful web services API", - version = "4.1-SNAPSHOT", + version = "4.1", description = "", license = @License(name = "Apache-2.0 License", url = "https://www.apache.org/licenses/LICENSE-2.0"), contact = @Contact(url = "https://egeria-project.org", name = "Egeria Project", diff --git a/open-metadata-resources/open-metadata-deployment/docker/README.md b/open-metadata-resources/open-metadata-deployment/docker/README.md index 1b71cb631dc..fc48a336dd8 100644 --- a/open-metadata-resources/open-metadata-deployment/docker/README.md +++ b/open-metadata-resources/open-metadata-deployment/docker/README.md @@ -34,7 +34,7 @@ In this example: ## Limitations -- All docker builds will currently set the tag (version) to be the same as the maven version (eg. 4.1-SNAPSHOT). This +- All docker builds will currently set the tag (version) to be the same as the maven version (eg. 4.1). This means that when testing it is imperative to always force-pull fresh images, or an old version may be used. For example, when using kubernetes ensure `imagePullPolicy = 'Always'`. Previously every single change was versioned, but this led to significant overhead in storage as well as constant changes in the source code just to do a rebuild. diff --git a/open-metadata-resources/open-metadata-deployment/docker/configure/Dockerfile b/open-metadata-resources/open-metadata-deployment/docker/configure/Dockerfile index a080bf6f1d7..c157087779e 100644 --- a/open-metadata-resources/open-metadata-deployment/docker/configure/Dockerfile +++ b/open-metadata-resources/open-metadata-deployment/docker/configure/Dockerfile @@ -2,7 +2,7 @@ # Copyright Contributors to the Egeria project FROM docker.io/library/alpine:3.18.0 -ARG version=4.1-SNAPSHOT +ARG version=4.1 ARG VCS_REF=unknown ARG VCS_ORIGIN=unknown ARG BUILD_TIME=unknown diff --git a/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile b/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile index 769c56c3ca3..88e5269abe9 100644 --- a/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile +++ b/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile @@ -17,7 +17,7 @@ #FROM registry.access.redhat.com/ubi9/openjdk-17-runtime FROM registry.access.redhat.com/ubi9/openjdk-17 -ARG version=4.1-SNAPSHOT +ARG version=4.1 ARG VCS_REF=unknown ARG VCS_ORIGIN=unknown ARG BUILD_TIME=unknown diff --git a/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile.selfbuild b/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile.selfbuild index aa2304fb4a2..0356dfeb1ec 100644 --- a/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile.selfbuild +++ b/open-metadata-resources/open-metadata-deployment/docker/egeria/Dockerfile.selfbuild @@ -30,7 +30,7 @@ ARG srcref=main # Defaults to egeria repo - but could be a different fork if needed ARG srcurl=https://github.com/odpi/egeria # this should not be needed, and must match the source, but we'll use for now -ARG version=4.1-SNAPSHOT +ARG version=4.1 # Replace build parms if needed ARG buildparms="build -x test -x javadoc --no-build-cache" # Can optionally specify build time so that we tag the image appropriately @@ -61,7 +61,7 @@ ARG srcref=main # Defaults to egeria repo - but could be a different fork if needed ARG srcurl=https://github.com/odpi/egeria # this should not be needed, and must match the source, but we'll use for now -ARG version=4.1-SNAPSHOT +ARG version=4.1 # Replace build parms if needed ARG buildparms="build -x test -x javadoc" # Can optionally specify build time so that we tag the image appropriately diff --git a/open-metadata-resources/open-metadata-deployment/docker/egeria/README.md b/open-metadata-resources/open-metadata-deployment/docker/egeria/README.md index ee1dc6ccaf8..ab22e1e84da 100644 --- a/open-metadata-resources/open-metadata-deployment/docker/egeria/README.md +++ b/open-metadata-resources/open-metadata-deployment/docker/egeria/README.md @@ -35,7 +35,7 @@ This is the Dockerfile we use to publish the official images. It works by utiliz To use this * Run a full egeria build with `./gradlew build` from the project root - * Run `mkdir -p open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly && cp -r open-metadata-distribution/open-metadata-assemblies/build/unpacked/egeria-4.1-SNAPSHOT-distribution.tar.gz/. open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly` - replacing the version label as appropriate + * Run `mkdir -p open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly && cp -r open-metadata-distribution/open-metadata-assemblies/build/unpacked/egeria-4.1-distribution.tar.gz/. open-metadata-resources/open-metadata-deployment/docker/egeria/build/assembly` - replacing the version label as appropriate * Run `docker build -t egeria:myversion -f Dockerfile .` in this directory to create the image @@ -54,7 +54,7 @@ The following additional arguments are allowed |--|---------|--|--|--| | runimg | No | Yes | registry.access.redhat.com/ubi9/openjdk-17 | Container image used for building egeria | | buildimg | No |Yes | registry.access.redhat.com/ubi9/openjdk-17 | Container image used for runtime ie launching egeria | -| version | Yes | Yes | 4.1-SNAPSHOT | Version string - must be correct so that the right jar file gets launched. Do not rely on default | +| version | Yes | Yes | 4.1 | Version string - must be correct so that the right jar file gets launched. Do not rely on default | | srcurl | No | Yes | https://github.com/odpi/egeria | Specifies url of github repo to clone | | srcref | No | Yes | main | Specifies branch, or tag of code within the repo | buildparms | No | Yes | build -x test -x javadoc | Gradle invocation to build egeria | @@ -167,7 +167,7 @@ With that in place we can now run our docker image, this time making use of the $ docker run -p 9443:9443 -v source=egeria-data,target=/deployments/data odpi/egeria:latest /usr/local/s2i/run: line 15: /opt/jboss/container/maven/default//scl-enable-maven: No such file or directory Starting the Java application using /opt/jboss/container/java/run/run-java.sh ... -INFO exec java -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=100m -XX:+ExitOnOutOfMemoryError -XX:MaxMetaspaceSize=1g -cp "." -jar /deployments/server/server-chassis-spring-4.1-SNAPSHOT.jar +INFO exec java -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=100m -XX:+ExitOnOutOfMemoryError -XX:MaxMetaspaceSize=1g -cp "." -jar /deployments/server/server-chassis-spring-4.1.jar ODPi Egeria ____ __ ___ ___ ______ _____ ____ _ _ ___ / __ \ / |/ // | / ____/ / ___/ ___ ____ _ __ ___ ____ / _ \ / / __ / / / _ /__ ____ _ _ @@ -236,7 +236,7 @@ you may need to create another job to retrieve the required libraries or content #### Adding to the image through a docker build Use the egeria image as a base, for example begin your custom Dockerfile with -`FROM odpi/egeria:4.1-SNAPSHOT` +`FROM odpi/egeria:4.1` Then add in the files you need, as well as customize the LOADER_PATH variable ie `COPY myextralib.jar /deployments/server/lib`