Merge branch 'develop'

korpling · Nov 26, 2024 · f6e11fb · f6e11fb
2 parents 5b2f2c7 + 1f38834
commit f6e11fb
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ jobs:
     name: Deploy as P2 repository
     # Only run Job on tagged commits that start with "v"
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,12 +4,12 @@ on: push
 jobs:
   test_java8:
     name: Execute all automated tests on Java 8
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-java8-${{ hashFiles('**/pom.xml') }}
@@ -21,12 +21,12 @@ jobs:
         run: mvn install
   test_java11:
     name: Execute all automated tests on Java 11
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-java11-${{ hashFiles('**/pom.xml') }}
@@ -35,4 +35,4 @@ jobs:
       - name: Set JAVA_HOME to included JDK 11
         run: echo JAVA_HOME=$JAVA_HOME_11_X64 >> $GITHUB_ENV
       - name: Run Maven install (includes tests)
-        run: mvn install
+        run: mvn install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Update some dependencies for better compatibility with newer Java versions
+- Update logging implementation to fix security issues and compatibility with newer Eclipse releases 
 
 ## [3.6.0] - 2021-03-01
 

diff --git a/NOTICE b/NOTICE
@@ -27,6 +27,7 @@ This project includes:
   Aether Transport HTTP under Eclipse Public License, Version 1.0
   Aether Transport Wagon under Eclipse Public License, Version 1.0
   Aether Utilities under Eclipse Public License, Version 1.0
+  Apache Commons IO under Apache-2.0
   Apache Commons Lang under Apache License, Version 2.0
   Apache HttpClient under Apache License
   Apache HttpClient Cache under Apache License
@@ -41,7 +42,6 @@ This project includes:
   Common Eclipse Runtime under Eclipse Public License - v 1.0
   Commons Codec under The Apache Software License, Version 2.0
   Commons Compiler under New BSD License
-  Commons IO under The Apache Software License, Version 2.0
   Commons Logging under The Apache Software License, Version 2.0
   Core Runtime under Eclipse Public License - v 1.0
   Declarative Services under Eclipse Public License

diff --git a/pepper-doc/NOTICE b/pepper-doc/NOTICE
@@ -18,11 +18,11 @@ carefully, which should be located in the corresponding jar-files
 inside the folders plugins or lib.
 
 This project includes:
+  Apache Commons IO under Apache-2.0
   Apache Commons Lang under Apache License, Version 2.0
   AssertJ fluent assertions under Apache License, Version 2.0
   carrot-osgi-anno-scr-core under The BSD License
   carrot-osgi-anno-scr-make under The BSD License
-  Commons IO under The Apache Software License, Version 2.0
   Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
   Hamcrest Core under New BSD License
   Java Architecture for XML Binding under CDDL 1.1 or GPL2 w/ CPE

diff --git a/pepper-doc/pom.xml b/pepper-doc/pom.xml
@@ -9,7 +9,7 @@
 		<groupId>org.corpus-tools</groupId>
 		<artifactId>pepper</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>3.6.1</version>
+		<version>3.7.0</version>
 	</parent>
 
 	<properties>

diff --git a/pepper-framework/NOTICE b/pepper-framework/NOTICE
@@ -18,11 +18,11 @@ carefully, which should be located in the corresponding jar-files
 inside the folders plugins or lib.
 
 This project includes:
+  Apache Commons IO under Apache-2.0
   Apache Commons Lang under Apache License, Version 2.0
   AssertJ fluent assertions under Apache License, Version 2.0
   carrot-osgi-anno-scr-core under The BSD License
   carrot-osgi-anno-scr-make under The BSD License
-  Commons IO under The Apache Software License, Version 2.0
   Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
   Hamcrest Core under New BSD License
   Java Architecture for XML Binding under CDDL 1.1 or GPL2 w/ CPE

diff --git a/pepper-framework/pom.xml b/pepper-framework/pom.xml
@@ -7,7 +7,7 @@
 
 		<groupId>org.corpus-tools</groupId>
 		<artifactId>pepper</artifactId>
-		<version>3.6.1</version>
+		<version>3.7.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<description>This project contains the core of Pepper.</description>

diff --git a/pepper-lib/NOTICE b/pepper-lib/NOTICE
@@ -27,6 +27,7 @@ This project includes:
   Aether Transport HTTP under Eclipse Public License, Version 1.0
   Aether Transport Wagon under Eclipse Public License, Version 1.0
   Aether Utilities under Eclipse Public License, Version 1.0
+  Apache Commons IO under Apache-2.0
   Apache Commons Lang under Apache License, Version 2.0
   Apache HttpClient under Apache License
   Apache HttpClient Cache under Apache License
@@ -41,7 +42,6 @@ This project includes:
   Common Eclipse Runtime under Eclipse Public License - v 1.0
   Commons Codec under The Apache Software License, Version 2.0
   Commons Compiler under New BSD License
-  Commons IO under The Apache Software License, Version 2.0
   Commons Logging under The Apache Software License, Version 2.0
   Core Runtime under Eclipse Public License - v 1.0
   Declarative Services under Eclipse Public License

diff --git a/pepper-lib/pom.xml b/pepper-lib/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.corpus-tools</groupId>
 		<artifactId>pepper</artifactId>
-		<version>3.6.1</version>
+		<version>3.7.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<dependencies>
@@ -32,17 +32,17 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.0.13</version>
+			<version>1.3.14</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.0.13</version>
+			<version>1.3.14</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>

diff --git a/pepper-newModule/pom.xml b/pepper-newModule/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.corpus-tools</groupId>
 		<artifactId>pepper-parentModule</artifactId>
-		<version>3.6.1</version>
+		<version>3.7.0</version>
 		<relativePath>../pepper-parentModule/pom.xml</relativePath>
 	</parent>
 	<artifactId>pepper-newModule</artifactId>

diff --git a/pepper-parentModule/NOTICE b/pepper-parentModule/NOTICE
@@ -18,11 +18,11 @@ carefully, which should be located in the corresponding jar-files
 inside the folders plugins or lib.
 
 This project includes:
+  Apache Commons IO under Apache-2.0
   Apache Commons Lang under Apache License, Version 2.0
   AssertJ fluent assertions under Apache License, Version 2.0
   carrot-osgi-anno-scr-core under The BSD License
   carrot-osgi-anno-scr-make under The BSD License
-  Commons IO under The Apache Software License, Version 2.0
   Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
   Hamcrest Core under New BSD License
   Java Architecture for XML Binding under CDDL 1.1 or GPL2 w/ CPE

diff --git a/pepper-parentModule/pom.xml b/pepper-parentModule/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.corpus-tools</groupId>
 		<artifactId>pepper</artifactId>
-		<version>3.6.1</version>
+		<version>3.7.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.corpus-tools</groupId>
 	<artifactId>pepper</artifactId>
-	<version>3.6.1</version>
+	<version>3.7.0</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>pepper-framework</module>
@@ -104,7 +104,7 @@
 		<!-- versions of dependencies -->
 		<salt.version>3.4.2</salt.version>
 		<commons-lang3.version>3.4</commons-lang3.version>
-		<slf4j.version>1.7.5</slf4j.version>
+		<slf4j.version>2.0.16</slf4j.version>
 		<junit.version>4.13.1</junit.version>
 		<assertj.version>2.4.1</assertj.version>
 		<mockito.version>1.10.19</mockito.version>
@@ -116,7 +116,7 @@
 		<org.codehaus.janino.version>2.7.8</org.codehaus.janino.version>
 		<org.eclipse.aether.version>1.0.2.v20150114</org.eclipse.aether.version>
 		<org.eclipse.osgi.services.version>3.4.0.v20140312-2051</org.eclipse.osgi.services.version>
-		<commons.io.version>2.4</commons.io.version>
+		<commons.io.version>2.18.0</commons.io.version>
 		<!-- versions of plugins -->
 		<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
 		<maven-resources-plugin.version>2.7</maven-resources-plugin.version>