svn commit: r1818036 - in /turbine/core/trunk: pom.xml src/java/org/apache/turbine/services/security/DefaultSecurityService.java

[gk...@apache.org]

Author: gk
Date: Wed Dec 13 15:38:20 2017
New Revision: 1818036

URL: http://svn.apache.org/viewvc?rev=1818036&view=rev
Log:
- bugfix init role by name
- update OWASP plugin, may be optional, but required for release

Modified:
    turbine/core/trunk/pom.xml
    turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java

Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1818036&r1=1818035&r2=1818036&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Wed Dec 13 15:38:20 2017
@@ -506,22 +506,23 @@
     <plugins>
       <!-- run optionally, use not as reporting plugin, as it exposes file paths to artifacts
         mvn org.owasp:dependency-check-maven:check
-        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
+        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
       -->
       <plugin>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-maven</artifactId>
-        <version>2.1.1</version>
+        <version>3.0.2</version>
         <executions>
-            <execution>
+           <execution>
                 <goals>
                     <goal>check</goal>
                 </goals>
             </execution>
         </executions>
-        <!--configuration>
-           <suppressionFiles>true</suppressionFiles>
-        </configuration-->
+        <configuration>
+           <!--skip>true</skip-->
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -1050,6 +1051,13 @@
       <id>apache-release</id>
       <build>
         <plugins>
+           <plugin>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <configuration>
+               <skip>false</skip>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1818036&r1=1818035&r2=1818036&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java Wed Dec 13 15:38:20 2017
@@ -316,7 +316,7 @@ public class DefaultSecurityService
         R role;
         try
         {
-            role = roleManager.getRoleInstance();
+            role = roleManager.getRoleInstance(roleName);
         }
         catch (Exception e)
         {
@@ -907,7 +907,7 @@ public class DefaultSecurityService
     /**
      * Revokes all permissions from a Role.
      *
-     * This method is user when deleting a Role.
+     * This method is used when deleting a Role.
      *
      * @param role the Role
      * @throws DataBackendException if there was an error accessing the data