Author: tv
Date: Sat Aug 9 16:27:45 2014
New Revision: 1616986
URL: http://svn.apache.org/r1616986
Log:
Update dependencies
- servlet-api to 2.5 (Tomcat 6.0)
- commons-codec to 1.8
- commons-configuration to 1.9
- commons-email to 1.3
- fulcrum-parser to 1.0.3
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/changes/changes.xml
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1616986&r1=1616985&r2=1616986&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Sat Aug 9 16:27:45 2014
@@ -630,38 +630,20 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.3.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.8</version>
<type>jar</type>
</dependency>
<dependency>
@@ -673,13 +655,13 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<type>jar</type>
</dependency>
<dependency>
@@ -734,7 +716,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<type>jar</type>
</dependency>
<dependency>
Modified: turbine/core/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1616986&r1=1616985&r2=1616986&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Sat Aug 9 16:27:45 2014
@@ -26,6 +26,14 @@
<body>
<release version="4.0-M2" date="in Subversion">
<action type="update" dev="tv">
+ Update dependencies
+ - servlet-api to 2.5 (Tomcat 6.0)
+ - commons-codec to 1.8
+ - commons-configuration to 1.9
+ - commons-email to 1.3
+ - fulcrum-parser to 1.0.3
+ </action>
+ <action type="update" dev="tv">
Update Turbine Parent POM to version 3
</action>
<action type="add" dev="tv">
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java?rev=1616986&r1=1616985&r2=1616986&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
Sat Aug 9 16:27:45 2014
@@ -75,7 +75,9 @@ public class ScheduledJobLoader
* @param data Turbine information.
* @param name Name of object that will execute the job.
* @exception Exception a generic exception.
+ * @deprecated
*/
+ @Deprecated
@Override
public void exec(RunData data, String name)
throws Exception
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java?rev=1616986&r1=1616985&r2=1616986&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
Sat Aug 9 16:27:45 2014
@@ -72,7 +72,7 @@ import org.apache.turbine.services.Turbi
* @author <a href="mailto:[email protected]";>Henning P. Schmiedehausen</a>
* @version $Id$
*/
-@SuppressWarnings("deprecation")
+@Deprecated
public class TurbineAvalonComponentService
extends TurbineBaseService
implements AvalonComponentService, Initializable, Disposable
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java?rev=1616986&r1=1616985&r2=1616986&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Sat Aug 9 16:27:45 2014
@@ -257,9 +257,11 @@ public class TurbineRunDataService
}
data = (TurbineRunData) pool.getInstance(runDataClazz);
- ParameterParser pp = (ParameterParser)
parserService.getParser(parameterParserClazz);
+ @SuppressWarnings("unchecked") // ok
+ ParameterParser pp =
parserService.getParser((Class<ParameterParser>)parameterParserClazz);
data.setParameterParser(pp);
- CookieParser cp = (CookieParser)
parserService.getParser(cookieParserClazz);
+ @SuppressWarnings("unchecked") // ok
+ CookieParser cp =
parserService.getParser((Class<CookieParser>)cookieParserClazz);
data.setCookieParser(cp);
Locale locale = req.getLocale();
