Just in case we decide to proceed, here is the patch.
I have successfully built a jar here with this patch applied.
Scott
Index: S:/eclipse-workspace/turbine-2_3/pom.xml
===================================================================
--- S:/eclipse-workspace/turbine-2_3/pom.xml (revision 647191)
+++ S:/eclipse-workspace/turbine-2_3/pom.xml (working copy)
@@ -630,7 +630,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -642,9 +642,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-email</groupId>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -651,7 +651,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -658,7 +658,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -672,7 +672,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -679,7 +679,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -777,7 +777,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.15</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -784,7 +784,7 @@
<dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Index: S:/eclipse-workspace/turbine-2_3/project.xml
===================================================================
--- S:/eclipse-workspace/turbine-2_3/project.xml (revision 647191)
+++ S:/eclipse-workspace/turbine-2_3/project.xml (working copy)
@@ -461,7 +461,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<url>http://commons.apache.org/configuration/</url>
<type>jar</type>
<properties>
@@ -479,9 +479,9 @@
</properties>
</dependency>
<dependency>
- <groupId>commons-email</groupId>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<url>http://commons.apache.org/email/</url>
<type>jar</type>
<properties>
@@ -491,7 +491,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
<url>http://commons.apache.org/fileupload/</url>
<type>jar</type>
<properties>
@@ -501,7 +501,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
<url>http://commons.apache.org/io/</url>
<type>jar</type>
<properties>
@@ -521,7 +521,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<url>http://commons.apache.org/logging/</url>
<type>jar</type>
<properties>
@@ -531,7 +531,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<url>http://commons.apache.org/pool/</url>
<type>jar</type>
<properties>
@@ -655,7 +655,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.15</version>
<url>http://logging.apache.org/log4j/</url>
<type>jar</type>
<properties>
@@ -665,7 +665,7 @@
<dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<url>http://java.sun.com/products/servlet/</url>
<type>jar</type>
<properties>
Index:
S:/eclipse-workspace/turbine-2_3/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
===================================================================
---
S:/eclipse-workspace/turbine-2_3/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
(revision 647191)
+++
S:/eclipse-workspace/turbine-2_3/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
(working copy)
@@ -237,10 +237,10 @@
* @param surl A String.
* @param name A String.
* @return A String with the cid of the embedded file.
- * @exception VelocityEmailException
+ * @exception EmailException
* @see HtmlEmail#embed(URL surl, String name) embed.
*/
- public String embed(String surl, String name) throws
VelocityEmailException
+ public String embed(String surl, String name) throws EmailException
{
String cid = "";
try
Jürgen Hoffmann wrote:
I have no problem updating those deps as well. Any objections?
Kind regards
Juergen
-----Ursprüngliche Nachricht-----
Von: Scott Eade [mailto:[EMAIL PROTECTED]
Gesendet: Freitag, 11. April 2008 14:58
An: [email protected]
Betreff: Re: svn commit: r647109 - in
/turbine/core/branches/TURBINE_2_3_BRANCH: pom.xml project.properties
project.xml
[EMAIL PROTECTED] wrote:
Author: hoffmann
Date: Fri Apr 11 03:53:39 2008
New Revision: 647109
URL: http://svn.apache.org/viewvc?rev=647109&view=rev
Log:
updated the dependencies so we can automatically download them from
download.java.net/maven
Modified:
turbine/core/branches/TURBINE_2_3_BRANCH/pom.xml
turbine/core/branches/TURBINE_2_3_BRANCH/project.properties
turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/pom.xml?rev=647109&r1=647108&r2=647109&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/pom.xml (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/pom.xml Fri Apr 11 03:53:39 2008
@@ -732,14 +740,14 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.0.2</version>
+ <version>1.1.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.3.3</version>
+ <version>1.4.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
URL:
http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml?rev=647109&r1=647108&r2=647109&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/project.xml (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/project.xml Fri Apr 11 03:53:39
2008
@@ -601,15 +611,15 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.0.2</version>
- <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
+ <version>1.1.1</version>
+ <url>http://download.java.net/maven/1/javax.activation/jars</url>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.3.3</version>
- <url>http://java.sun.com/products/javamail/</url>
+ <version>1.4.1</version>
+ <url>http://download.java.net/maven/1/javax.mail/jars</url>
<type>jar</type>
</dependency>
<dependency>
We move to these because we are are now requiring a minimum of J2SE
1.4. I know your intention is to do this so that we can avoid the
manual downloads, but if we are going to update these, why not also do:
* commons-email-1.1 (requires a very small change to VelocityHtmlEmail,
see: http://markmail.org/message/tihvveprdobvves7)
* commons-configuration-1.5
* commons-fileupload-1.2.1
* commons-io-1.4
* commons-logging-1.1.1
* commons-pool-1.4
* log4j-1.2.15
* servletaip-2.4
Seems like a waste not to take this opportunity to push these to the
latest available releases (that support J2SE 1.4), probably a bit late
in the process now though.
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
