Author: gk Date: Wed Jan 24 10:40:57 2018 New Revision: 1822093 URL: http://svn.apache.org/viewvc?rev=1822093&view=rev Log: - dep version updates - updates commons-codec to 1.11, commons-beanutils to 1.9.3, mockito-core to 2.13.0 - hints and infos
Modified: turbine/core/trunk/pom.xml turbine/core/trunk/src/changes/changes.xml turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Modified: turbine/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1822093&r1=1822092&r2=1822093&view=diff ============================================================================== --- turbine/core/trunk/pom.xml (original) +++ turbine/core/trunk/pom.xml Wed Jan 24 10:40:57 2018 @@ -825,8 +825,21 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.10</version> + <version>1.11</version> </dependency> + <!-- + TODO after 4.0.x releae: + + update to <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.1</version> + and + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>2.2</version + + may otherwise switch to other framework ? + --> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -845,8 +858,13 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.5</version><!-- v2.6 requires Java 1.7 --> </dependency> + <!-- TODO requires Java 1.7 : + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.7</version> + --> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -860,7 +878,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> </dependency> <dependency> <groupId>ecs</groupId> @@ -1022,6 +1040,12 @@ <artifactId>log4j</artifactId> <version>1.2.17</version> </dependency> + <!-- TODO after 4.0.x releases update to + + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-engine-core</artifactId> + <version>2.0</version> + --> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> @@ -1049,7 +1073,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.0.2-beta</version> + <version>2.13.0</version> <scope>test</scope> </dependency> <dependency> Modified: turbine/core/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1822093&r1=1822092&r2=1822093&view=diff ============================================================================== --- turbine/core/trunk/src/changes/changes.xml (original) +++ turbine/core/trunk/src/changes/changes.xml Wed Jan 24 10:40:57 2018 @@ -25,6 +25,10 @@ <body> <release version="4.0.1" date="in Subversion"> + <action type="update" dev="gk"> + New security method replaceRole, + Updated dependency versions: commons-codec to 1.11, commons-beanutils to 1.9.3, mockito-core to 2.13.0. + </action> <action type="fix" dev="gk" due-to="Jeffery Painter"> Each call in Turbine managers to the user delegate with a user object parameter now gets the wrapped user (the userDelegate). </action> Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1822093&r1=1822092&r2=1822093&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Wed Jan 24 10:40:57 2018 @@ -455,6 +455,8 @@ public class DefaultTurbineRunData /** * Sets the access control list. + * + * To delete ACL from session use key {@link TurbineConstants#ACL_SESSION_KEY}. Invalidate session, if session persist. * * @param acl an access control list. */