svn commit: r1836947 - in /turbine/core/trunk: pom.xml src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java

[gk]

Author: gk
Date: Sat Jul 28 20:35:56 2018
New Revision: 1836947

URL: http://svn.apache.org/viewvc?rev=1836947&view=rev
Log:
- fix testfailure
- change make dependency check optional

Modified:
    turbine/core/trunk/pom.xml
    
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java

Modified: turbine/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1836947&r1=1836946&r2=1836947&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Sat Jul 28 20:35:56 2018
@@ -504,15 +504,19 @@
     </testResources>
 
     <plugins>
-      <!-- run optionally, use not as reporting plugin, as it exposes file 
paths to artifacts
-        mvn org.owasp:dependency-check-maven:check
+      <!-- run optionally, use not as reporting plugin, as it exposes file 
paths to artifacts and
         check each possible vulnerability carefully, find more info about how 
to read, false positives et al. here: 
-        
https://jeremylong.github.io/DependencyCheck/dependency-check-maven/plugin-info.html
+        
https://jeremylong.github.io/DependencyCheck/dependency-check-maven/plugin-info.html
 or
+        https://github.com/jeremylong/DependencyCheck
+        CLI mvn phase
+        $>mvn verify -Ddependency.check.skip=false
+        or to invoke goal only:
+        $>mvn org.owasp:dependency-check-maven:check 
-Ddependency.check.skip=false
       -->
       <plugin>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-maven</artifactId>
-        <version>3.0.2</version>
+        <version>3.3.0</version><!-- requires mvn version > 3.3! For older 
version try to check v 3.2.1 or 3.1.2 -->
         <executions>
            <execution>
                 <goals>
@@ -521,9 +525,11 @@
             </execution>
         </executions>
         <configuration>
-           <!--skip>true</skip-->
+           <skip>${dependency.check.skip}</skip>
            <!-- suppress false positive -->
-           
<suppressionFiles>${project.basedir}/suppression-owasp-fp.xml</suppressionFiles>
+           <suppressionFiles>
+            
<suppressionFile>${project.basedir}/suppression-owasp-fp.xml</suppressionFile>
+            </suppressionFiles>
         </configuration>
       </plugin>
       <plugin>
@@ -1146,6 +1152,7 @@
     <fulcrum.intake>1.2.3</fulcrum.intake>
     <fulcrum.security>1.1.2</fulcrum.security>
     <slf4j.version>1.7.25</slf4j.version>
+    <dependency.check.skip>true</dependency.check.skip>
   </properties>
 
 </project>

Modified: 
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java?rev=1836947&r1=1836946&r2=1836947&view=diff
==============================================================================
--- 
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
 (original)
+++ 
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
 Sat Jul 28 20:35:56 2018
@@ -57,11 +57,12 @@ public class VelocityActionWithServiceIn
     public void doPerform(PipelineData pipelineData, Context context) throws 
Exception
     {
         log.debug("Calling doPerform(PipelineData)");
-               assertNotNull("runDataService object was Null.", 
runDataService);
+        assertNotNull("runDataService object was Null.", runDataService);
         log.debug("Injected service is " + runDataService.getName());
         assertNotNull("runDataService2 object was Null.", runDataService2);
         log.debug("Injected service is " + runDataService2.getName());
         assertNotNull("factory object was Null.", factory);
         log.debug("Injected service is " + factory.getClass());
+        context.put("mykey","x");
     }
 }