From e8d1eb4053fc39bb72514c9ce50dba92b5494c0d Mon Sep 17 00:00:00 2001 From: "Dr. Christoph \"Schorsch\" Jung" Date: Tue, 30 Jul 2024 14:29:20 +0200 Subject: [PATCH] chore: upgrade to non-SNAPSHOT release version --- .github/workflows/build.yml | 4 ++-- DEPENDENCIES | 4 ++-- README.md | 4 ++-- agent-plane/README.md | 4 ++-- agent-plane/agent-plane-protocol/README.md | 2 +- agent-plane/agent-plane-protocol/pom.xml | 2 +- .../agents/edc/service/TestDataspaceSynchronizer.java | 4 ++-- agent-plane/agentplane-azure-vault/README.md | 2 +- agent-plane/agentplane-azure-vault/pom.xml | 2 +- agent-plane/agentplane-hashicorp/README.md | 4 ++-- agent-plane/agentplane-hashicorp/pom.xml | 2 +- agent-plane/pom.xml | 2 +- charts/agent-plane-azure-vault/Chart.yaml | 4 ++-- charts/agent-plane-azure-vault/README.md | 4 ++-- charts/agent-plane-azure-vault/ci/integration-values.yaml | 2 +- charts/agent-plane/Chart.yaml | 4 ++-- charts/agent-plane/README.md | 4 ++-- charts/agent-plane/ci/integration-values.yaml | 2 +- common/README.md | 2 +- common/auth-jwt/README.md | 2 +- common/auth-jwt/pom.xml | 2 +- docs/README.md | 4 ++-- pom.xml | 2 +- upgrade_version.sh | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92faad1..967bfe7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.13.22-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.13.22,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') }} - name: Agent Plane Hashicorp Container Build and push @@ -180,7 +180,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.13.22-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.13.22,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') }} - name: Agent Plane Azure Vault Container Build and push diff --git a/DEPENDENCIES b/DEPENDENCIES index bf5b116..f453a57 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -267,8 +267,8 @@ maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.21, EPL-2.0 OR Apache-2.0, maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.21, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.parsson/parsson/1.1.6, EPL-2.0, approved, ee4j.parsson -maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.13.22-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.13.22-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.13.22, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.13.22, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.7.3, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.edc/core-utils/0.7.3, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.edc/data-plane-migration/0.7.3, Apache-2.0, approved, automotive.tractusx diff --git a/README.md b/README.md index 2f20efb..81af5a3 100644 --- a/README.md +++ b/README.md @@ -120,8 +120,8 @@ kubectl wait --namespace ingress-nginx \ --selector=app.kubernetes.io/component=controller \ --timeout=90s # transfer images -kind load docker-image docker.io/tractusx/agentplane-hashicorp:1.13.22-SNAPSHOT --name ka -kind load docker-image docker.io/tractusx/agentplane-azure-vault:1.13.22-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/agentplane-hashicorp:1.13.22 --name ka +kind load docker-image docker.io/tractusx/agentplane-azure-vault:1.13.22 --name ka # run chart testing ct install --charts charts/agent-plane ct install --charts charts/agent-plane-azure-vault diff --git a/agent-plane/README.md b/agent-plane/README.md index 11fdcd0..248ceeb 100644 --- a/agent-plane/README.md +++ b/agent-plane/README.md @@ -66,10 +66,10 @@ mvn package -Pwith-docker-image Alternatively, after a successful build, you can invoke docker yourself ```console -docker build -t tractusx/agentplane-azure-vault:1.13.22-SNAPSHOT -f agentplane-azure-vault/src/main/docker/Dockerfile . +docker build -t tractusx/agentplane-azure-vault:1.13.22 -f agentplane-azure-vault/src/main/docker/Dockerfile . ``` ```console -docker build -t tractusx/agentplane-hashicorp:1.13.22-SNAPSHOT -f agentplane-hashicorp/src/main/docker/Dockerfile . +docker build -t tractusx/agentplane-hashicorp:1.13.22 -f agentplane-hashicorp/src/main/docker/Dockerfile . ``` diff --git a/agent-plane/agent-plane-protocol/README.md b/agent-plane/agent-plane-protocol/README.md index 83580d5..ed150ed 100644 --- a/agent-plane/agent-plane-protocol/README.md +++ b/agent-plane/agent-plane-protocol/README.md @@ -64,7 +64,7 @@ Add the following dependency to your data-plane artifact pom: org.eclipse.tractusx.agents.edc agent-plane-protocol - 1.13.22-SNAPSHOT + 1.13.22 ``` diff --git a/agent-plane/agent-plane-protocol/pom.xml b/agent-plane/agent-plane-protocol/pom.xml index fcef12c..e265dea 100644 --- a/agent-plane/agent-plane-protocol/pom.xml +++ b/agent-plane/agent-plane-protocol/pom.xml @@ -25,7 +25,7 @@ org.eclipse.tractusx.agents.edc agent-plane - 1.13.22-SNAPSHOT + 1.13.22 ../pom.xml diff --git a/agent-plane/agent-plane-protocol/src/test/java/org/eclipse/tractusx/agents/edc/service/TestDataspaceSynchronizer.java b/agent-plane/agent-plane-protocol/src/test/java/org/eclipse/tractusx/agents/edc/service/TestDataspaceSynchronizer.java index 42228ea..1fe5616 100644 --- a/agent-plane/agent-plane-protocol/src/test/java/org/eclipse/tractusx/agents/edc/service/TestDataspaceSynchronizer.java +++ b/agent-plane/agent-plane-protocol/src/test/java/org/eclipse/tractusx/agents/edc/service/TestDataspaceSynchronizer.java @@ -123,7 +123,7 @@ private static JsonObjectBuilder createOffer() { JsonObjectBuilder offerBuilder = Json.createObjectBuilder() .add("@id", "cx-taxo:GraphAsset?test=ExampleAsset") .add("https://w3id.org/edc/v0.0.1/ns/contenttype", "application/json, application/xml") - .add("https://w3id.org/catenax/ontology/common#version", "1.13.22-SNAPSHOT") + .add("https://w3id.org/catenax/ontology/common#version", "1.13.22") .add("https://w3id.org/catenax/ontology/common#name", "Test Asset") .add("https://w3id.org/catenax/ontology/common#description", "Test Asset for RDF Representation") .add("https://w3id.org/catenax/ontology/common#description@de", "Beispiel Asset für RDF Darstellung") @@ -212,7 +212,7 @@ public void testCatalogDeserialization() { " },\n" + " \"dcat:accessService\": \"ddd4b79e-f785-4e71-9fe5-4a177b3ccf54\"\n" + " },\n" + - " \"edc:version\": \"1.13.22-SNAPSHOT\",\n" + + " \"edc:version\": \"1.13.22\",\n" + " \"http://www.w3.org/2000/01/rdf-schema#isDefinedBy\": \"\",\n" + " \"edc:name\": \"Diagnostic Trouble Code Catalogue Version 2022\",\n" + " \"http://www.w3.org/ns/shacl#shapesGraph\": \"@prefix cx-common: . \\n@prefix : .\\n@prefix cx-diag: .\\n@prefix owl: .\\n@prefix rdf: .\\n@prefix xsd: .\\n@prefix sh: .\\n\\n:OemDTC rdf:type sh:NodeShape ;\\n sh:targetClass cx-diag:DTC ;\\n sh:property [\\n sh:path cx-diag:provisionedBy ;\\n sh:hasValue ;\\n ] ;\\n sh:property [\\n sh:path cx-diag:version ;\\n sh:hasValue \\\"0\\\"^^xsd:long ;\\n ] ;\\n sh:property [\\n sh:path cx-diag:affects ;\\n sh:class :OemDiagnosedParts ;\\n ].\\n\\n:OemDiagnosedParts rdf:type sh:NodeShape ;\\n sh:targetClass cx-diag:DiagnosedPart ;\\n sh:property [\\n sh:path cx-diag:provisionedBy ;\\n sh:hasValue ;\\n ] .\\n\",\n" + diff --git a/agent-plane/agentplane-azure-vault/README.md b/agent-plane/agentplane-azure-vault/README.md index 6c89590..853552f 100644 --- a/agent-plane/agentplane-azure-vault/README.md +++ b/agent-plane/agentplane-azure-vault/README.md @@ -54,7 +54,7 @@ mvn -s ../../../settings.xml install -Pwith-docker-image Alternatively, after a sucessful [build](#building) the docker image of the Agent Plane is created using ```console -docker build -t tractusx//agentplane-azure-vault:1.13.22-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx//agentplane-azure-vault:1.13.22 -f src/main/docker/Dockerfile . ``` To run the docker image, you could invoke this command diff --git a/agent-plane/agentplane-azure-vault/pom.xml b/agent-plane/agentplane-azure-vault/pom.xml index ec155d9..7c63d7d 100644 --- a/agent-plane/agentplane-azure-vault/pom.xml +++ b/agent-plane/agentplane-azure-vault/pom.xml @@ -25,7 +25,7 @@ org.eclipse.tractusx.agents.edc agent-plane - 1.13.22-SNAPSHOT + 1.13.22 ../pom.xml diff --git a/agent-plane/agentplane-hashicorp/README.md b/agent-plane/agentplane-hashicorp/README.md index aeba100..e7e997a 100644 --- a/agent-plane/agentplane-hashicorp/README.md +++ b/agent-plane/agentplane-hashicorp/README.md @@ -54,7 +54,7 @@ mvn -s ../../../settings.xml install -Pwith-docker-image Alternatively, after a sucessful [build](#building) the docker image of the Agent Plane is created using ```console -docker build -t tractusx/agentplane-hashicorp:1.13.22-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/agentplane-hashicorp:1.13.22 -f src/main/docker/Dockerfile . ``` To run the docker image, you could invoke this command @@ -66,7 +66,7 @@ docker run -p 8082:8082 \ -v $(pwd)/resources/dataplane.properties:/app/configuration.properties \ -v $(pwd)/resources/opentelemetry.properties:/app/opentelemetry.properties \ -v $(pwd)/resources/logging.properties:/app/logging.properties \ - tractusx/agentplane-hashicorp:1.13.22-SNAPSHOT + tractusx/agentplane-hashicorp:1.13.22 ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8082/api/agent) via diff --git a/agent-plane/agentplane-hashicorp/pom.xml b/agent-plane/agentplane-hashicorp/pom.xml index 120d12d..79458c9 100644 --- a/agent-plane/agentplane-hashicorp/pom.xml +++ b/agent-plane/agentplane-hashicorp/pom.xml @@ -25,7 +25,7 @@ org.eclipse.tractusx.agents.edc agent-plane - 1.13.22-SNAPSHOT + 1.13.22 ../pom.xml diff --git a/agent-plane/pom.xml b/agent-plane/pom.xml index bc6d679..08227d2 100644 --- a/agent-plane/pom.xml +++ b/agent-plane/pom.xml @@ -28,7 +28,7 @@ org.eclipse.tractusx.agents edc - 1.13.22-SNAPSHOT + 1.13.22 ../pom.xml Tractus-X EDC Agent Plane diff --git a/charts/agent-plane-azure-vault/Chart.yaml b/charts/agent-plane-azure-vault/Chart.yaml index 79cc8ec..4e1f736 100644 --- a/charts/agent-plane-azure-vault/Chart.yaml +++ b/charts/agent-plane-azure-vault/Chart.yaml @@ -41,12 +41,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.13.22-SNAPSHOT +version: 1.13.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.13.22-SNAPSHOT" +appVersion: "1.13.22" home: https://github.com/eclipse-tractusx/knowledge-agents-edc/ sources: - https://github.com/eclipse-tractusx/knowledge-agents-edc/tree/main/charts/agent-connector diff --git a/charts/agent-plane-azure-vault/README.md b/charts/agent-plane-azure-vault/README.md index d8995cf..b337e86 100644 --- a/charts/agent-plane-azure-vault/README.md +++ b/charts/agent-plane-azure-vault/README.md @@ -21,7 +21,7 @@ # agent-plane-azure-vault -![Version: 1.13.22-SNAPSHOT](https://img.shields.io/badge/Version-1.13.22--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.22--SNAPSHOT-informational?style=flat-square) +![Version: 1.13.22](https://img.shields.io/badge/Version-1.13.22--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22](https://img.shields.io/badge/AppVersion-1.13.22--SNAPSHOT-informational?style=flat-square) A Helm chart for an Agent-Enabled Tractus-X Data Plane which registers at a running Control Plane. @@ -59,7 +59,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev -helm install my-release eclipse-tractusx/agent-plane --version 1.13.22-SNAPSHOT +helm install my-release eclipse-tractusx/agent-plane --version 1.13.22 ``` ## Maintainers diff --git a/charts/agent-plane-azure-vault/ci/integration-values.yaml b/charts/agent-plane-azure-vault/ci/integration-values.yaml index d0845c5..ee064f5 100644 --- a/charts/agent-plane-azure-vault/ci/integration-values.yaml +++ b/charts/agent-plane-azure-vault/ci/integration-values.yaml @@ -29,7 +29,7 @@ participant: # image: # repository: ghcr.io/catenax-ng/tx-knowledge-agents-edc/agentplane-azure-vault -# tag: 1.13.22-SNAPSHOT +# tag: 1.13.22 controlplane: endpoints: diff --git a/charts/agent-plane/Chart.yaml b/charts/agent-plane/Chart.yaml index e4e4c1b..bfdae8f 100644 --- a/charts/agent-plane/Chart.yaml +++ b/charts/agent-plane/Chart.yaml @@ -41,12 +41,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.13.22-SNAPSHOT +version: 1.13.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.13.22-SNAPSHOT" +appVersion: "1.13.22" home: https://github.com/eclipse-tractusx/knowledge-agents-edc/ sources: - https://github.com/eclipse-tractusx/knowledge-agents-edc/tree/main/charts/agent-connector diff --git a/charts/agent-plane/README.md b/charts/agent-plane/README.md index d01bbf5..dfc817b 100644 --- a/charts/agent-plane/README.md +++ b/charts/agent-plane/README.md @@ -21,7 +21,7 @@ # agent-plane -![Version: 1.13.22-SNAPSHOT](https://img.shields.io/badge/Version-1.13.22--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.22--SNAPSHOT-informational?style=flat-square) +![Version: 1.13.22](https://img.shields.io/badge/Version-1.13.22--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22](https://img.shields.io/badge/AppVersion-1.13.22--SNAPSHOT-informational?style=flat-square) A Helm chart for an Agent-Enabled Tractus-X Data Plane which registers at a running Control Plane. @@ -59,7 +59,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime: ```shell helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev -helm install my-release eclipse-tractusx/agent-plane --version 1.13.22-SNAPSHOT +helm install my-release eclipse-tractusx/agent-plane --version 1.13.22 ``` ## Maintainers diff --git a/charts/agent-plane/ci/integration-values.yaml b/charts/agent-plane/ci/integration-values.yaml index 36a7dfe..d039aad 100644 --- a/charts/agent-plane/ci/integration-values.yaml +++ b/charts/agent-plane/ci/integration-values.yaml @@ -30,7 +30,7 @@ participant: # image: # repository: ghcr.io/catenax-ng/tx-knowledge-agents-edc/agentplane-hashicorp -# tag: 1.13.22-SNAPSHOT +# tag: 1.13.22 controlplane: endpoints: diff --git a/common/README.md b/common/README.md index 2756be6..cc90372 100644 --- a/common/README.md +++ b/common/README.md @@ -57,7 +57,7 @@ add the following dependency to your maven dependencies (gradle should work anal org.eclipse.tractusx.edc auth-jwt - 1.13.22-SNAPSHOT + 1.13.22 diff --git a/common/auth-jwt/README.md b/common/auth-jwt/README.md index 6f95afd..6e4b635 100644 --- a/common/auth-jwt/README.md +++ b/common/auth-jwt/README.md @@ -37,7 +37,7 @@ Add the following dependency to your EDC artifact pom: org.eclipse.tractusx.agents.edc auth-jwt - 1.13.22-SNAPSHOT + 1.13.22 ``` diff --git a/common/auth-jwt/pom.xml b/common/auth-jwt/pom.xml index 1a3ed8a..1fd9440 100644 --- a/common/auth-jwt/pom.xml +++ b/common/auth-jwt/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx.agents edc - 1.13.22-SNAPSHOT + 1.13.22 ../../pom.xml diff --git a/docs/README.md b/docs/README.md index 29006c0..5220c88 100644 --- a/docs/README.md +++ b/docs/README.md @@ -75,7 +75,7 @@ dependencies: alias: my-connector - name: agent-plane repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.13.22-SNAPSHOT + version: 1.13.22 alias: my-agent ``` @@ -90,7 +90,7 @@ dependencies: alias: my-connector - name: agent-plane-azure-vault repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.13.22-SNAPSHOT + version: 1.13.22 alias: my-agent ``` diff --git a/pom.xml b/pom.xml index 32b161f..00ea48f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.eclipse.tractusx.agents edc - 1.13.22-SNAPSHOT + 1.13.22 pom Tractus-X Knowledge Agents EDC Extensions EDC-Related Artifacts for Federated Procedure Calls diff --git a/upgrade_version.sh b/upgrade_version.sh index 6843fb6..f93bf78 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=1.13.22-SNAPSHOT +OLD_VERSION=1.13.22 echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C