[turbine-fulcrum-testcontainer] branch master updated: fix owasp issues by updating dependencies/add exclusion, fix remove scope test for junit vintage to allow junit 4 test execution with surefire, update junit jupiter major version.

[gk]

This is an automated email from the ASF dual-hosted git repository.

gk pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/turbine-fulcrum-testcontainer.git


The following commit(s) were added to refs/heads/master by this push:
     new ae30d6a  fix owasp issues by updating dependencies/add exclusion, fix 
remove scope test for junit vintage to allow junit 4 test execution with 
surefire, update junit jupiter major version.
ae30d6a is described below

commit ae30d6ae26c60338ad700e21ce4ec1b4f13cc553
Author: Georg Kallidis <g...@apache.org>
AuthorDate: Wed Nov 24 16:31:51 2021 +0100

    fix owasp issues by updating dependencies/add exclusion, fix remove scope 
test for junit vintage to allow junit 4 test execution with surefire, update 
junit jupiter major version.
---
 pom.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b44f075..a872984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
     <artifactId>turbine-parent</artifactId>
     <groupId>org.apache.turbine</groupId>
-    <version>9</version>
+    <version>10-SNAPSHOT</version>
     <relativePath></relativePath>
     </parent>
 
@@ -57,6 +57,7 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
       <version>${junit.jupiter.version}</version>
+      <!-- do not set test scope to allow for runngi surefire test with junit 
5  -->
       <!--scope>test</scope -->
     </dependency>
     <!-- use Junit 4 within Junit 5 -->
@@ -64,14 +65,15 @@
         <groupId>org.junit.vintage</groupId>
         <artifactId>junit-vintage-engine</artifactId>
          <version>${junit.jupiter.version}</version>
-        <scope>test</scope>
+         <!-- do not set test scope to allow for runngi surefire test with 
junit 4  -->
+        <!--scope>test</scope-->
     </dependency>
 
     <!-- Needed if testing with YAAFI -->
     <dependency>
         <groupId>org.apache.fulcrum</groupId>
         <artifactId>fulcrum-yaafi</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9-SNAPSHOT</version>
         <optional>true</optional>
     </dependency>
     <dependency>
@@ -91,6 +93,18 @@
         <version>2.2.1</version>
         <type>jar</type>
         <optional>true</optional>
+        <exclusions>
+           <exclusion>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+        <optional>true</optional>
     </dependency>
     <!-- Log4j2 may be better used by default -->
     <dependency>
@@ -148,7 +162,7 @@
     <properties>
         <turbine.site.path>turbine-fulcrum-testcontainer</turbine.site.path>
         
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
-        <junit.jupiter.version>5.7.1</junit.jupiter.version>
+        <junit.jupiter.version>5.8.1</junit.jupiter.version>
         <junit.platform>1.7.1</junit.platform>
     </properties>