Skip to content

Commit

Permalink
Merge pull request #7790 from lpalashevski/4.3-snapshot
Browse files Browse the repository at this point in the history
4.3 Snapshot
  • Loading branch information
lpalashevski authored Jul 19, 2023
2 parents b083d6c + 4e6ee97 commit 61b3df7
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ plugins {
*/
allprojects {
group = 'org.odpi.egeria'
version = '4.2-SNAPSHOT'
version = '4.3-SNAPSHOT'

// Signing/publish used in parent & child projects
apply plugin: 'maven-publish'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<artifactId>egeria</artifactId>
<groupId>org.odpi.egeria</groupId>
<version>4.2-SNAPSHOT</version>
<version>4.3-SNAPSHOT</version>
</parent>

<name>Add module name here</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-SNAPSHOT)"
"Repository origin id" : "Egeria OMAG Server Platform (version 4.3-SNAPSHOT)"
}
}
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ following:

```
<properties>
<open-metadata.version>4.2-SNAPSHOT</open-metadata.version>
<open-metadata.version>4.3-SNAPSHOT</open-metadata.version>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ storage.backend=berkeleyje
# Default: (no default value)
# Data Type: String
# Mutability: LOCAL
storage.directory=../../../egeria-install/egeria-omag-4.2-SNAPSHOT/data/servers/Metadata_Server/repository/graph/berkeley
storage.directory=../../../egeria-install/egeria-omag-4.3-SNAPSHOT/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
Expand All @@ -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.2-SNAPSHOT/data/servers/Metadata_Server/repository/graph/searchindex
index.search.directory=../../../egeria-install/egeria-omag-4.3-SNAPSHOT/data/servers/Metadata_Server/repository/graph/searchindex
```
----
License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
@OpenAPIDefinition(
info = @Info(
title = "Egeria's Open Metadata and Governance (OMAG) Server Platform",
version = "4.2-SNAPSHOT",
version = "4.3-SNAPSHOT",
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" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
public class OMAGServerPlatformOriginServices
{
final String implementationOrigin = "Egeria OMAG Server Platform (version 4.2-SNAPSHOT)\n";
final String implementationOrigin = "Egeria OMAG Server Platform (version 4.3-SNAPSHOT)\n";

/**
* Return the origin of this server platform implementation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@OpenAPIDefinition(
info = @Info(
title = "Egeria's Spring Boot based UI RESTful web services API",
version = "4.2-SNAPSHOT",
version = "4.3-SNAPSHOT",
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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-SNAPSHOT). This
- All docker builds will currently set the tag (version) to be the same as the maven version (eg. 4.3-SNAPSHOT). 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright Contributors to the Egeria project

FROM docker.io/library/alpine:3.18.0
ARG version=4.2-SNAPSHOT
ARG version=4.3-SNAPSHOT
ARG VCS_REF=unknown
ARG VCS_ORIGIN=unknown
ARG BUILD_TIME=unknown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#FROM registry.access.redhat.com/ubi9/openjdk-17-runtime
FROM registry.access.redhat.com/ubi9/openjdk-17

ARG version=4.2-SNAPSHOT
ARG version=4.3-SNAPSHOT
ARG VCS_REF=unknown
ARG VCS_ORIGIN=unknown
ARG BUILD_TIME=unknown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-SNAPSHOT
ARG version=4.3-SNAPSHOT
# 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
Expand Down Expand Up @@ -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.2-SNAPSHOT
ARG version=4.3-SNAPSHOT
# Replace build parms if needed
ARG buildparms="build -x test -x javadoc"
# Can optionally specify build time so that we tag the image appropriately
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-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.3-SNAPSHOT-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


Expand All @@ -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.2-SNAPSHOT | Version string - must be correct so that the right jar file gets launched. Do not rely on default |
| version | Yes | Yes | 4.3-SNAPSHOT | 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 |
Expand Down Expand Up @@ -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/platform/omag-server-platform-4.2-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/platform/omag-server-platform-4.3-SNAPSHOT.jar
ODPi Egeria
____ __ ___ ___ ______ _____ ____ _ _ ___
/ __ \ / |/ // | / ____/ / ___/ ___ ____ _ __ ___ ____ / _ \ / / __ / / / _ /__ ____ _ _
Expand Down Expand Up @@ -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.2-SNAPSHOT`
`FROM odpi/egeria:4.3-SNAPSHOT`

Then add in the files you need, as well as customize the LOADER_PATH variable ie
`COPY myextralib.jar /deployments/platform/lib`
Expand Down

0 comments on commit 61b3df7

Please sign in to comment.