You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2006/12/05 16:50:18 UTC
svn commit: r482692 - in /portals/pluto/trunk: pluto-container/pom.xml
pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java
pom.xml
Author: esm
Date: Tue Dec 5 07:50:17 2006
New Revision: 482692
URL: http://svn.apache.org/viewvc?view=rev&rev=482692
Log:
Fix java 1.4 build.
Modified:
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?view=diff&rev=482692&r1=482691&r2=482692
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Tue Dec 5 07:50:17 2006
@@ -77,11 +77,17 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!-- EasyMock
+ 2.2, 2.0 requires Java 5
+ 1.2_Java1.3 requires Java 1.3
+ use groupId "easymock" for version 1.2_Java1.3 -->
+ <!--
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.2</version>
</dependency>
+ -->
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java?view=diff&rev=482692&r1=482691&r2=482692
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java Tue Dec 5 07:50:17 2006
@@ -4,7 +4,9 @@
import javax.servlet.ServletContext;
-import org.easymock.EasyMock;
+/* Java 5 req'd
+ import org.easymock.EasyMock;
+*/
import java.net.MalformedURLException;
import java.net.URL;
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?view=diff&rev=482692&r1=482691&r2=482692
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue Dec 5 07:50:17 2006
@@ -244,7 +244,7 @@
<plexus.version>1.0.4</plexus.version>
<maven.version>2.0</maven.version>
<ant.version>1.6.5</ant.version>
- <junit.version>4.0</junit.version>
+ <junit.version>3.8</junit.version>
<jmock.version>1.0.1</jmock.version>
</properties>