Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrong target #2

Merged
merged 2 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.14.24-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
Expand Down
56 changes: 28 additions & 28 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ maven/mavencentral/com.digitalpetri.fsm/strict-machine/0.6, Apache-2.0, approved
maven/mavencentral/com.digitalpetri.netty/netty-channel-fsm/0.8, Apache-2.0, approved, #6168
maven/mavencentral/com.ethlo.time/itu/1.8.0, Apache-2.0, approved, #12927
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.0, Apache-2.0, approved, #13672
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.0, , approved, #13665
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.0, Apache-2.0 AND MIT, approved, #13665
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.0, Apache-2.0, approved, #13671
maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.16.1, Apache-2.0, approved, #12438
maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.3, Apache-2.0, approved, #15207
Expand All @@ -27,7 +27,7 @@ maven/mavencentral/com.google.guava/failureaccess/1.0.2, Apache-2.0, approved, C
maven/mavencentral/com.google.guava/guava/33.1.0-jre, Apache-2.0 AND CC0-1.0, approved, #13675
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
maven/mavencentral/com.google.j2objc/j2objc-annotations/3.0.0, Apache-2.0, approved, #13676
maven/mavencentral/com.google.protobuf/protobuf-java/4.26.1, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/com.google.protobuf/protobuf-java/3.25.5, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.networknt/json-schema-validator/1.3.3, Apache-2.0 AND Unicode-TOU, approved, #13037
maven/mavencentral/com.squareup.okhttp3/mockwebserver/4.12.0, Apache-2.0, approved, clearlydefined
Expand Down Expand Up @@ -103,9 +103,9 @@ maven/mavencentral/org.apache.poi/poi/5.2.5, Apache-2.0 AND (Apache-2.0 AND BSD-
maven/mavencentral/org.apache.thrift/libthrift/0.19.0, Apache-2.0, approved, #15687
maven/mavencentral/org.apache.xmlbeans/xmlbeans/5.2.0, Apache-2.0, approved, #11782
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595
maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78, MIT, approved, #14434
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78, MIT AND CC0-1.0, approved, #14433
maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.78, MIT, approved, #14435
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
maven/mavencentral/org.codehaus.janino/commons-compiler/3.1.11, BSD-3-Clause, approved, #13293
maven/mavencentral/org.codehaus.janino/janino/3.1.11, BSD-3-Clause, approved, #13292
Expand Down Expand Up @@ -133,24 +133,24 @@ maven/mavencentral/org.eclipse.milo/stack-core/0.6.12, EPL-2.0, approved, iot.mi
maven/mavencentral/org.eclipse.milo/stack-server/0.6.12, EPL-2.0, approved, iot.milo
maven/mavencentral/org.eclipse.paho/org.eclipse.paho.client.mqttv3/1.2.5, EPL-1.0 OR BSD-3-Clause, approved, iot.paho
maven/mavencentral/org.eclipse.parsson/parsson/1.1.5, EPL-2.0, approved, ee4j.parsson
maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-annotation/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-exception/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-io/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-iterator/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-text/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-transaction/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-util/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-xml/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-vocabulary/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-model/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-query/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-model/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-annotation/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-exception/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-io/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-iterator/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-text/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-transaction/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-util/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-xml/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-vocabulary/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-model/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-query/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-model/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j
maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.glassfish.jaxb/txw2/4.0.5, BSD-3-Clause, approved, ee4j.jaxb-impl
Expand All @@ -162,11 +162,11 @@ maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.8.21, Apache-2.0, a
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.8.21, Apache-2.0, approved, #8919
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.8.21, Apache-2.0, approved, #8865
maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.2, EPL-2.0, approved, #9714
maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.2, EPL-2.0, approved, #9711
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.2, EPL-2.0, approved, #15250
maven/mavencentral/org.junit.platform/junit-platform-commons/1.10.2, EPL-2.0, approved, #9715
maven/mavencentral/org.junit.platform/junit-platform-engine/1.10.2, EPL-2.0, approved, #9709
maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.3, EPL-2.0, approved, #9714
maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.3, EPL-2.0, approved, #9711
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.3, EPL-2.0, approved, #15250
maven/mavencentral/org.junit.platform/junit-platform-commons/1.10.3, EPL-2.0, approved, #9715
maven/mavencentral/org.junit.platform/junit-platform-engine/1.10.3, EPL-2.0, approved, #9709
maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713
maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776
maven/mavencentral/org.reflections/reflections/0.10.2, Apache-2.0 AND WTFPL, approved, clearlydefined
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.23-SNAPSHOT --name ka
kind load docker-image docker.io/tractusx/aas-bridge:1.14.24-SNAPSHOT --name ka
# run container test
ct install --charts charts/aas-bridge
```
Expand Down
4 changes: 2 additions & 2 deletions charts/aas-bridge/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.23-SNAPSHOT"
version: 1.14.23-SNAPSHOT
appVersion: "1.14.24-SNAPSHOT"
version: 1.14.24-SNAPSHOT
maintainers:
- name: 'Tractus-X Knowledge Agents Team'
4 changes: 2 additions & 2 deletions charts/aas-bridge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# aas-bridge

![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)
![Version: 1.14.24-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.24-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.

Expand All @@ -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.14.23-SNAPSHOT
$ helm install my-release eclipse-tractusx/aas-bridge --version 1.14.24-SNAPSHOT
```

## Maintainers
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.tractusx.agents</groupId>
<artifactId>aas</artifactId>
<version>1.14.23-SNAPSHOT</version>
<version>1.14.24-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tractus-X Knowledge Agents AAS Bridges</name>
<description>Provides Implementations for Bridging Knowledge Agents and AAS</description>
Expand All @@ -39,10 +39,10 @@
<maven.compiler.target>17</maven.compiler.target>
<skipTests>false</skipTests>

<junit.version>5.10.3</junit.version>
<junit.version>5.11.0</junit.version>
<mockito.version>5.14.1</mockito.version>
<okhttp.version>4.12.0</okhttp.version>
<rdf4j.version>4.3.8</rdf4j.version>
<rdf4j.version>4.3.14</rdf4j.version>
<faaast.version>1.0.1</faaast.version>
<protobuf.version>3.25.5</protobuf.version>
<bouncycastle.version>1.78</bouncycastle.version>
Expand Down
4 changes: 2 additions & 2 deletions sparql-aas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.23-SNAPSHOT -f src/main/docker/Dockerfile .
docker build -t tractusx/aas-bridge:1.14.24-SNAPSHOT -f src/main/docker/Dockerfile .
```

To run the docker image against a local knowledge graph, you could invoke this command
Expand All @@ -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.14.23-SNAPSHOT
tractusx/aas-bridge:1.14.24-SNAPSHOT
````

Afterwards, you should be able to access the [local AAS endpoint](https://localhost:8443/) via REST
Expand Down
2 changes: 1 addition & 1 deletion sparql-aas/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.eclipse.tractusx.agents</groupId>
<artifactId>aas</artifactId>
<version>1.14.23-SNAPSHOT</version>
<version>1.14.24-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion upgrade_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# SPDX-License-Identifier: Apache-2.0

OLD_VERSION=1.14.23-SNAPSHOT
OLD_VERSION=1.14.24-SNAPSHOT
echo Upgrading from $OLD_VERSION to $1
PATTERN=s/$OLD_VERSION/$1/g
LC_ALL=C
Expand Down
Loading