You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/08/11 17:37:51 UTC
[maven-site-plugin] branch test-deps-update updated (94d95c2d -> 3998aef6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch test-deps-update
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
discard 94d95c2d Update log4j and junit in tests to avoid security reports
new 3998aef6 Update log4j and junit in tests to avoid security reports
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (94d95c2d)
\
N -- N -- N refs/heads/test-deps-update (3998aef6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/it/projects/MSITE-506/pom.xml | 6 +++---
.../projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
[maven-site-plugin] 01/01: Update log4j and junit in tests to avoid security reports
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch test-deps-update
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 3998aef65ad8776844debc881faa35006bef3054
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Aug 11 18:49:52 2023 +0200
Update log4j and junit in tests to avoid security reports
---
src/it/projects/MSITE-497/apps/app/pom.xml | 13 +++++++++----
.../apps/app/src/main/java/org/apache/maven/App.java | 5 +++--
src/it/projects/MSITE-506/pom.xml | 6 +++---
.../MSITE-506/src/test/java/mavenjavadoc/AppTest.java | 10 ++++++----
src/it/projects/MSITE-665/pom.xml | 2 +-
src/it/projects/failure/pom.xml | 2 +-
src/it/projects/full-reporting/pom.xml | 2 +-
src/it/projects/full-reporting/verify.groovy | 4 ++--
src/it/projects/it-plugin-test/pom.xml | 2 +-
src/it/projects/new-configuration/pom.xml | 2 +-
src/it/projects/no-version/pom.xml | 2 +-
src/it/projects/surefire-report/pom.xml | 2 +-
12 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/it/projects/MSITE-497/apps/app/pom.xml b/src/it/projects/MSITE-497/apps/app/pom.xml
index a8a17815..beea7264 100644
--- a/src/it/projects/MSITE-497/apps/app/pom.xml
+++ b/src/it/projects/MSITE-497/apps/app/pom.xml
@@ -32,14 +32,19 @@ under the License.
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.20.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java b/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java
index 0a9ac177..35e45046 100644
--- a/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java
+++ b/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java
@@ -19,13 +19,14 @@ package org.apache.maven;
* under the License.
*/
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class App
{
public static void main( String[] args )
{
- Logger mylogger = Logger.getLogger("MyLogger");
+ Logger mylogger = LogManager.getLogger("MyLogger");
mylogger.info( "Hello World!" );
}
}
diff --git a/src/it/projects/MSITE-506/pom.xml b/src/it/projects/MSITE-506/pom.xml
index 7bf94632..290a3806 100644
--- a/src/it/projects/MSITE-506/pom.xml
+++ b/src/it/projects/MSITE-506/pom.xml
@@ -34,9 +34,9 @@ under the License.
</properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java b/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java
index a35a2a28..b6ad7ecd 100644
--- a/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java
+++ b/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java
@@ -20,14 +20,15 @@ package mavenjavadoc;
*/
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test for simple App.
*/
-public class AppTest
- extends TestCase
+public class AppTest
{
/**
* Create the test case
@@ -50,7 +51,8 @@ public class AppTest
/**
* Rigourous Test :-)
*/
- public void testApp()
+ @Test
+ void testApp()
{
assertTrue( true );
}
diff --git a/src/it/projects/MSITE-665/pom.xml b/src/it/projects/MSITE-665/pom.xml
index ef0b457e..23fefa54 100644
--- a/src/it/projects/MSITE-665/pom.xml
+++ b/src/it/projects/MSITE-665/pom.xml
@@ -60,7 +60,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/failure/pom.xml b/src/it/projects/failure/pom.xml
index b0008d45..a75d4cb4 100644
--- a/src/it/projects/failure/pom.xml
+++ b/src/it/projects/failure/pom.xml
@@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml
index 314bcfcf..59bc69f4 100644
--- a/src/it/projects/full-reporting/pom.xml
+++ b/src/it/projects/full-reporting/pom.xml
@@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/full-reporting/verify.groovy b/src/it/projects/full-reporting/verify.groovy
index 7c08f59f..deaa154e 100644
--- a/src/it/projects/full-reporting/verify.groovy
+++ b/src/it/projects/full-reporting/verify.groovy
@@ -42,7 +42,7 @@ assert new File( sitedir, 'team.html' ).exists();
assert new File( sitedir, 'dependencies.html' ).exists();
content = new File( sitedir, 'dependencies.html' ).text;
-assert content.contains( 'junit:junit:jar:3.8.2' );
+assert content.contains( 'junit:junit:jar:4.13.2' );
// check reports order
String[] reports = [ 'index', // <report>index</report>
@@ -92,4 +92,4 @@ for ( String report : reports )
previousReportLink = link;
}
-return true;
\ No newline at end of file
+return true;
diff --git a/src/it/projects/it-plugin-test/pom.xml b/src/it/projects/it-plugin-test/pom.xml
index 21792270..d141345e 100644
--- a/src/it/projects/it-plugin-test/pom.xml
+++ b/src/it/projects/it-plugin-test/pom.xml
@@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/new-configuration/pom.xml b/src/it/projects/new-configuration/pom.xml
index 5984903f..f9f1583b 100644
--- a/src/it/projects/new-configuration/pom.xml
+++ b/src/it/projects/new-configuration/pom.xml
@@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/no-version/pom.xml b/src/it/projects/no-version/pom.xml
index 3ecb5a13..26f1e209 100644
--- a/src/it/projects/no-version/pom.xml
+++ b/src/it/projects/no-version/pom.xml
@@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/surefire-report/pom.xml b/src/it/projects/surefire-report/pom.xml
index 50c6ff3a..9818efc0 100644
--- a/src/it/projects/surefire-report/pom.xml
+++ b/src/it/projects/surefire-report/pom.xml
@@ -35,7 +35,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>