Merge pull request #242 from Engineering-Research-and-Development/develop

1.14.5 Release

Author: IgorBalog-Eng

.github/workflows/ECC.yml

@@ -3,8 +3,6 @@ name: Build Ecc and run GH Action
 on:
   push:
     branches: [ "feature/*", "hotfix/*", "develop", "master"]
-# pull_request:
-#   branches: [ "develop" ]
 
 jobs:
   build:
@@ -18,13 +16,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
+          cache: maven
+
+      - name: Install maven dependencies
+        run: ./ci/mavenDependency.sh      
+
       - name: Build with Maven
         run: mvn clean package
+
       - name: Run Creating Docker Image from ECC repo
         run: ./ci/deploy.sh
 

.github/workflows/docker-publish.yml

@@ -21,7 +21,8 @@ jobs:
       with:
         java-version: '11'
         distribution: 'temurin'
-        cache: maven
+    - name: Install maven dependencies
+      run: ./ci/mavenDependency.sh      
     - name: Build with Maven
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven_release.yml

@@ -21,7 +21,6 @@ jobs:
       with:
         java-version: '11'
         distribution: 'temurin'
-        cache: maven
     - name: Initialize mandatory git config
       run: |
         git config user.name "GitHub Actions"
@@ -31,7 +30,10 @@ jobs:
       uses: webfactory/ssh-agent@v0.7.0
       with:
         ssh-private-key: ${{ secrets.SSH_KEY }}
-        
+    
+    - name: Install maven dependencies
+      run: ./ci/mavenDependency.sh      
+       
     - name: Release with Maven
       env:
         GITHUB_USERNAME: ${{ github.actor }}

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.14.5] - 2023-10-30
+
+### Changed
+
+ - CertificationCheck now uses Cosign to verify if running version is signed
+
+### Added
+
+ - new property application.selfdescription.defaultEndpoint - used for custom URI where connector self-description is exposed
+
 ## [1.14.4] - 2023-10-05
 
 ### Changed

Dockerfile

@@ -6,12 +6,12 @@ FROM eclipse-temurin:11-jre-alpine
 # Add Maintainer Info
 LABEL maintainer="gabriele.deluca@eng.it"
 
-RUN apk add --no-cache wget openssl curl
+RUN apk add --no-cache wget openssl curl cosign
 #RUN  apt-get update \
 #  && apt-get install -y wget \
 #  && rm -rf /var/lib/apt/lists/
 
-RUN mkdir -p /home/nobody/data/sd && mkdir -p /home/nobody/data/log/ecc
+RUN mkdir -p /home/nobody/data/sd && mkdir -p /home/nobody/data/log/ecc && mkdir -p /.sigstore
 
 
 WORKDIR /home/nobody
@@ -22,7 +22,7 @@ COPY target/dependency-jars /home/nobody/app/dependency-jars
 # Add the application's jar to the container
 ADD target/application.jar /home/nobody/app/application.jar
 
-RUN chown -R nobody:nogroup /home/nobody
+RUN chown -R nobody:nogroup /home/nobody && chown -R nobody:nogroup /.sigstore 
 
 USER 65534
 

ci/.m2/de/fhg/aisec/ids/ids-api/2.1.0/ids-api-2.1.0.jar

@@ -0,0 +1 @@
+a1e55da7993f3094898283d37f650358ce4d92ac

ci/.m2/de/fhg/aisec/ids/ids-api/2.1.0/ids-api-2.1.0.jar.sha1

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>de.fhg.aisec.ids</groupId>
+  <artifactId>ids-api</artifactId>
+  <version>2.1.0</version>
+  <name>IDSCP Protocol Library</name>
+  <description>Contains the WebSocket-based Industrial Data Space Communication Protocol (IDSCP)</description>
+  <url>https://github.com/industrial-data-space/trusted-connector</url>
+  <licenses>
+    <license>
+      <name>The Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Michael Lux</name>
+      <email>michael.lux@aisec.fraunhofer.de</email>
+      <organization>Fraunhofer AISEC</organization>
+      <organizationUrl>aisec.fraunhofer.de</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com:industrial-data-space/trusted-connector.git</connection>
+    <developerConnection>scm:git:ssh://github.com:industrial-data-space/trusted-connector.git</developerConnection>
+    <url>https://github.com/industrial-data-space/trusted-connector</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.6.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>2.6.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>3.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.10.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.checkerframework</groupId>
+      <artifactId>checker-qual</artifactId>
+      <version>2.5.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.fraunhofer.iais.eis.ids.infomodel</groupId>
+      <artifactId>java</artifactId>
+      <version>3.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

ci/.m2/de/fhg/aisec/ids/ids-api/2.1.0/ids-api-2.1.0.pom

@@ -0,0 +1 @@
+5b27077c3a993cc1b21eaf9f18df859eaccd1556