From c7653a763b43edf43684881c445ba3d8965d169e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 22 Feb 2021 05:18:50 +0000 Subject: [PATCH 1/5] Bump pax-logging-log4j1 from 2.0.6 to 2.0.7 in /cnf Bumps [pax-logging-log4j1](https://github.com/ops4j/org.ops4j.pax.logging) from 2.0.6 to 2.0.7. - [Release notes](https://github.com/ops4j/org.ops4j.pax.logging/releases) - [Changelog](https://github.com/ops4j/org.ops4j.pax.logging/blob/master/RELEASE-NOTES.html) - [Commits](https://github.com/ops4j/org.ops4j.pax.logging/compare/logging-2.0.6...logging-2.0.7) Signed-off-by: dependabot-preview[bot] --- cnf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/pom.xml b/cnf/pom.xml index 34624740030..01e5c81aa5c 100644 --- a/cnf/pom.xml +++ b/cnf/pom.xml @@ -216,7 +216,7 @@ org.ops4j.pax.logging pax-logging-log4j1 - 2.0.6 + 2.0.7 org.osgi From b1f9dc6bc2b652b8200ec39575f3389d4536937a Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Wed, 24 Feb 2021 15:01:29 +0100 Subject: [PATCH 2/5] Update bndrun --- io.openems.backend.application/BackendApp.bndrun | 4 ++-- io.openems.edge.application/EdgeApp.bndrun | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun index 028c0041dea..fb9f5551332 100644 --- a/io.openems.backend.application/BackendApp.bndrun +++ b/io.openems.backend.application/BackendApp.bndrun @@ -72,8 +72,8 @@ org.apache.servicemix.bundles.ws-commons-util;version='[1.0.2,1.0.3)',\ org.apache.servicemix.bundles.xmlrpc-client;version='[3.1.3,3.1.4)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.6,2.0.7)',\ - org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.6,2.0.7)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.7,2.0.8)',\ + org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.7,2.0.8)',\ org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\ org.osgi.util.function;version='[1.1.0,1.1.1)',\ org.osgi.util.promise;version='[1.1.1,1.1.2)',\ diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun index ddae1ca8880..1ddcb473cfd 100644 --- a/io.openems.edge.application/EdgeApp.bndrun +++ b/io.openems.edge.application/EdgeApp.bndrun @@ -300,8 +300,8 @@ org.jsr-305;version='[3.0.2,3.0.3)',\ org.openmuc.jmbus;version='[3.3.0,3.3.1)',\ org.openmuc.jrxtx;version='[1.0.1,1.0.2)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.6,2.0.7)',\ - org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.6,2.0.7)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.7,2.0.8)',\ + org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.7,2.0.8)',\ org.osgi.util.function;version='[1.1.0,1.1.1)',\ org.osgi.util.promise;version='[1.1.1,1.1.2)',\ rrd4j;version='[3.8.0,3.8.1)' \ No newline at end of file From 78e72105f3465529d54f4001d99fddaba7d1ab4a Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Wed, 24 Feb 2021 20:01:24 +0100 Subject: [PATCH 3/5] Test: disable cache --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1be5e311ce..4a6dd513566 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,14 +20,6 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: ${{ runner.os }}-gradle- - - name: Setup Cache for Java/Maven - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Setup Node.js uses: actions/setup-node@v1 with: From f8ffbfec6c87cfee54d6760600875ff471c694f7 Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Wed, 24 Feb 2021 20:09:11 +0100 Subject: [PATCH 4/5] Test: disable cache --- .github/workflows/build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a6dd513566..6fc94b7b253 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,15 +11,6 @@ jobs: with: java-version: '8' - - name: Setup Cache for Java/Gradle - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-gradle- - - name: Setup Node.js uses: actions/setup-node@v1 with: From 1d4212dc53a2b1a18ebcbcd20f59bea52fc7c418 Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Wed, 24 Feb 2021 20:23:24 +0100 Subject: [PATCH 5/5] Reser + update pax-logging-api --- .github/workflows/build.yml | 17 +++++++++++++++++ cnf/pom.xml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6fc94b7b253..a1be5e311ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,23 @@ jobs: with: java-version: '8' + - name: Setup Cache for Java/Gradle + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle- + + - name: Setup Cache for Java/Maven + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Setup Node.js uses: actions/setup-node@v1 with: diff --git a/cnf/pom.xml b/cnf/pom.xml index 01e5c81aa5c..357ff26369a 100644 --- a/cnf/pom.xml +++ b/cnf/pom.xml @@ -211,7 +211,7 @@ org.ops4j.pax.logging pax-logging-api - 2.0.6 + 2.0.7 org.ops4j.pax.logging