From 22a869fd25de36ac438ebee2a9a3ecd818a1df96 Mon Sep 17 00:00:00 2001 From: "Dr. Christoph \"Schorsch\" Jung" Date: Tue, 30 Jul 2024 14:42:07 +0200 Subject: [PATCH 1/2] fix: reference to an outdated curl package in the build container --- sparql-aas/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sparql-aas/src/main/docker/Dockerfile b/sparql-aas/src/main/docker/Dockerfile index cab7fff..240cf23 100644 --- a/sparql-aas/src/main/docker/Dockerfile +++ b/sparql-aas/src/main/docker/Dockerfile @@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in HEALTHCHECK NONE -RUN apk update && apk add curl=8.5.0-r0 --no-cache +RUN apk update && apk add curl=8.9.0-r0 --no-cache RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar FROM eclipse-temurin:22_36-jre-alpine From db6faeb21e8fa0dda7f25631e87ab606dbe56eca Mon Sep 17 00:00:00 2001 From: "Dr. Christoph \"Schorsch\" Jung" Date: Tue, 30 Jul 2024 15:11:23 +0200 Subject: [PATCH 2/2] fix: need to upgrade version for the next increment anyway. --- .github/workflows/build.yml | 2 +- README.md | 2 +- charts/aas-bridge/Chart.yaml | 4 ++-- charts/aas-bridge/README.md | 4 ++-- pom.xml | 2 +- sparql-aas/README.md | 4 ++-- sparql-aas/pom.xml | 2 +- upgrade_version.sh | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ee18c4..ee706aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.13.7-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # build in any case, but push only main and version tag settings diff --git a/README.md b/README.md index a097218..63b3443 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ kubectl wait --namespace ingress-nginx \ --selector=app.kubernetes.io/component=controller \ --timeout=90s # transfer images -kind load docker-image docker.io/tractusx/aas-bridge:1.13.7-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/aas-bridge:1.14.23-SNAPSHOT --name ka # run container test ct install --charts charts/aas-bridge ``` diff --git a/charts/aas-bridge/Chart.yaml b/charts/aas-bridge/Chart.yaml index 9f03efd..3e415de 100644 --- a/charts/aas-bridge/Chart.yaml +++ b/charts/aas-bridge/Chart.yaml @@ -30,7 +30,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge/ sources: - https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge/tree/main/sparql-aas type: application -appVersion: "1.13.7-SNAPSHOT" -version: 1.13.7-SNAPSHOT +appVersion: "1.14.23-SNAPSHOT" +version: 1.14.23-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/aas-bridge/README.md b/charts/aas-bridge/README.md index b898a6a..c755dd3 100644 --- a/charts/aas-bridge/README.md +++ b/charts/aas-bridge/README.md @@ -21,7 +21,7 @@ # aas-bridge -![Version: 1.13.7-SNAPSHOT](https://img.shields.io/badge/Version-0.13.6--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.7-SNAPSHOT](https://img.shields.io/badge/AppVersion-0.13.6--SNAPSHOT-informational?style=flat-square) +![Version: 1.14.23-SNAPSHOT](https://img.shields.io/badge/Version-0.13.6--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.14.23-SNAPSHOT](https://img.shields.io/badge/AppVersion-0.13.6--SNAPSHOT-informational?style=flat-square) A Helm chart for the Tractus-X Knowledge Agents AAS Bridge which is a container to provide an AAS server/registry on top of a knowledge graph/SPARQL landscape. @@ -32,7 +32,7 @@ This chart has no prerequisites. ## TL;DR ```shell $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev -$ helm install my-release eclipse-tractusx/aas-bridge --version 1.13.7-SNAPSHOT +$ helm install my-release eclipse-tractusx/aas-bridge --version 1.14.23-SNAPSHOT ``` ## Maintainers diff --git a/pom.xml b/pom.xml index 0988484..95dbb96 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.eclipse.tractusx.agents aas - 1.13.7-SNAPSHOT + 1.14.23-SNAPSHOT pom Tractus-X Knowledge Agents AAS Bridges Provides Implementations for Bridging Knowledge Agents and AAS diff --git a/sparql-aas/README.md b/sparql-aas/README.md index 0a9ef6c..3557048 100644 --- a/sparql-aas/README.md +++ b/sparql-aas/README.md @@ -87,7 +87,7 @@ mvn -s ../../../settings.xml install -Pwith-docker-image Alternatively, after a sucessful [build](#building) the docker image of the Sparql-To-AAS bridge is created using ```console -docker build -t tractusx/aas-bridge:1.13.7-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/aas-bridge:1.14.23-SNAPSHOT -f src/main/docker/Dockerfile . ``` To run the docker image against a local knowledge graph, you could invoke this command @@ -97,7 +97,7 @@ docker run -p 8443:8443 \ -v $(pwd)/resources:/app/resources \ -e "PROVIDER_SPARQL_ENDPOINT=http://oem-provider-agent:8082/sparql" \ -e "PROVIDER_CREDENTIAL_BASIC=Basic Zm9vOg==" \ - tractusx/aas-bridge:1.13.7-SNAPSHOT + tractusx/aas-bridge:1.14.23-SNAPSHOT ```` Afterwards, you should be able to access the [local AAS endpoint](https://localhost:8443/) via REST diff --git a/sparql-aas/pom.xml b/sparql-aas/pom.xml index 25142f9..c0f6164 100644 --- a/sparql-aas/pom.xml +++ b/sparql-aas/pom.xml @@ -25,7 +25,7 @@ org.eclipse.tractusx.agents aas - 1.13.7-SNAPSHOT + 1.14.23-SNAPSHOT ../pom.xml diff --git a/upgrade_version.sh b/upgrade_version.sh index 2adc3df..83eadae 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=1.13.7-SNAPSHOT +OLD_VERSION=1.14.23-SNAPSHOT echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C