Skip to content

Commit

Permalink
chore: upgrade version and remove redundant cyclone SBOMs
Browse files Browse the repository at this point in the history
  • Loading branch information
drcgjung committed Oct 18, 2023
1 parent 3fe344c commit f9c7ea3
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 22,798 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.10.2-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.10.5-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 Expand Up @@ -176,7 +176,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.10.2-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.10.5-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 Expand Up @@ -215,7 +215,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.10.2-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.10.5-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
16 changes: 0 additions & 16 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,6 @@ You may recreate an up-to-date DEPENDENCIES file by invoking
./mvnw org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES
```

We provide Software-Bill-Of-Material (SBOM) documents for each KA-RI module for each release:
* [Conforming Agent](conforming/conforming-agent-1.10.2-SNAPSHOT-sbom.json)
* [Provisioning Agent](provisioning/provisioning-agent-1.10.2-SNAPSHOT-sbom.json)
* [Remoting Agent](remoting/remoting-agent-1.10.2-SNAPSHOT-sbom.json)

You may recreate up-to-date SBOMs by invoking

```shell
./mvnw org.cyclonedx:cyclonedx-maven-plugin:makeBom -DoutputName=\${project.artifactId}-\${project.version}-sbom
```

Afterwards, you find the current documents under:
* [Conforming Agent](conforming/target/conforming-agent-1.10.2-SNAPSHOT-sbom.json)
* [Provisioning Agent](provisioning/target/provisioning-agent-1.10.2-SNAPSHOT-sbom.json)
* [Remoting Agent](remoting/target/remoting-agent-1.10.2-SNAPSHOT-sbom.json)

The KA-RI build and runtime platform is relying on:
* [Java Runtime Environment (JRE >=11 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java-Laufzeitumgebung)
* [Java Development Kit (JDK >=11 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java_Development_Kit)
Expand Down
4 changes: 2 additions & 2 deletions charts/conforming-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
sources:
- https://github.com/eclipse-tractusx/knowledge-agents/tree/main/conforming
type: application
appVersion: "1.10.2-SNAPSHOT"
version: 1.10.2-SNAPSHOT
appVersion: "1.10.5-SNAPSHOT"
version: 1.10.5-SNAPSHOT
maintainers:
- name: 'Tractus-X Knowledge Agents Team'
4 changes: 2 additions & 2 deletions charts/conforming-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# conforming-agent

![Version: 1.10.2-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.2-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--SNAPSHOT-informational?style=flat-square)
![Version: 1.10.5-SNAPSHOT](https://img.shields.io/badge/Version-1.10.5--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.5-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.5--SNAPSHOT-informational?style=flat-square)

A Helm chart for the Tractus-X Conforming Agent which is a container to assess the conformity of all other parts of the Agent-Enabled Dataspace.

Expand All @@ -31,7 +31,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/conforming-agent --version 1.10.2-SNAPSHOT
$ helm install my-release eclipse-tractusx/conforming-agent --version 1.10.5-SNAPSHOT
```

## Maintainers
Expand Down
4 changes: 2 additions & 2 deletions charts/provisioning-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
sources:
- https://github.com/eclipse-tractusx/knowledge-agents/tree/main/provisioning
type: application
appVersion: "1.10.2-SNAPSHOT"
version: 1.10.2-SNAPSHOT
appVersion: "1.10.5-SNAPSHOT"
version: 1.10.5-SNAPSHOT
maintainers:
- name: 'Tractus-X Knowledge Agents Team'
4 changes: 2 additions & 2 deletions charts/provisioning-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# provisioning-agent

![Version: 1.10.2-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.2-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--SNAPSHOT-informational?style=flat-square)
![Version: 1.10.5-SNAPSHOT](https://img.shields.io/badge/Version-1.10.5--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.5-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.5--SNAPSHOT-informational?style=flat-square)

A Helm chart for the Tractus-X Provisioning Agent which is a container to Bridge Agent-Enabled Connector and Relational Data Sources.

Expand All @@ -31,7 +31,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/provisioning-agent --version 1.10.2-SNAPSHOT
$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.10.5-SNAPSHOT
```

## Maintainers
Expand Down
4 changes: 2 additions & 2 deletions charts/remoting-agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
sources:
- https://github.com/eclipse-tractusx/knowledge-agents/tree/main/remoting
type: application
appVersion: "1.10.2-SNAPSHOT"
version: 1.10.2-SNAPSHOT
appVersion: "1.10.5-SNAPSHOT"
version: 1.10.5-SNAPSHOT
maintainers:
- name: 'Tractus-X Knowledge Agents Team'
4 changes: 2 additions & 2 deletions charts/remoting-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
-->
# remoting-agent

![Version: 1.10.2-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.2-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--SNAPSHOT-informational?style=flat-square)
![Version: 1.10.5-SNAPSHOT](https://img.shields.io/badge/Version-1.10.5--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.5-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.5--SNAPSHOT-informational?style=flat-square)

A Helm chart for the Tractus-X Remoting Agent which is a container to Bridge Agent-Enabled Connector and REST APIs.

Expand All @@ -30,7 +30,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/remoting-agent --version 1.10.2-SNAPSHOT
$ helm install my-release eclipse-tractusx/remoting-agent --version 1.10.5-SNAPSHOT
```

## Maintainers
Expand Down
14 changes: 7 additions & 7 deletions conforming/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ mvn package
```

This will generate
- a [plugin jar](target/original-conforming-agent-1.10.2-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server.
- a [standalone jar](target/conforming-agent-1.10.2-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish).
- a [plugin jar](target/original-conforming-agent-1.10.5-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server.
- a [standalone jar](target/conforming-agent-1.10.5-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish).

### Run Locally

The [standalone jar](target/conforming-agent-1.10.2-SNAPSHOT.jar) may be started as follows
The [standalone jar](target/conforming-agent-1.10.5-SNAPSHOT.jar) may be started as follows

```console
java -cp target/conforming-agent-1.10.2-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap"
java -cp target/conforming-agent-1.10.5-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap"
```

### Containerizing
Expand All @@ -75,7 +75,7 @@ mvn install -Pwith-docker-image
or invoke the following docker command after a successful package run

```console
docker build -t tractusx/conforming-agent:1.10.2-SNAPSHOT -f src/main/docker/Dockerfile .
docker build -t tractusx/conforming-agent:1.10.5-SNAPSHOT -f src/main/docker/Dockerfile .
```

This will create a docker image based on a minimal java environment for running the Glassfish-based standalone jar.
Expand All @@ -84,7 +84,7 @@ To run the docker image, you could invoke this command

```console
docker run -p 8080:8080 \
tractusx/conforming-agent:1.10.2-SNAPSHOT
tractusx/conforming-agent:1.10.5-SNAPSHOT
````

Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8080/) via
Expand Down Expand Up @@ -141,7 +141,7 @@ It can be added to your umbrella chart.yaml by the following snippet
dependencies:
- name: conforming-agent
repository: https://eclipse-tractusx.github.io/charts/dev
version: 1.10.2-SNAPSHOT
version: 1.10.5-SNAPSHOT
alias: my-conforming-agent
```

Expand Down
Loading

0 comments on commit f9c7ea3

Please sign in to comment.