You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by rf...@apache.org on 2010/02/05 18:59:17 UTC
svn commit: r907021 - in /lenya/branches/BRANCH_2_1_X: INSTALL-SRC.txt
configure.sh src/targets/properties-build.xml
Author: rfrovarp
Date: Fri Feb 5 17:59:17 2010
New Revision: 907021
URL: http://svn.apache.org/viewvc?rev=907021&view=rev
Log:
Update references to Java 1.6. INSTALL-SRC.txt will require further modifications to be brought current.
Modified:
lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt
lenya/branches/BRANCH_2_1_X/configure.sh
lenya/branches/BRANCH_2_1_X/src/targets/properties-build.xml
Modified: lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt?rev=907021&r1=907020&r2=907021&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt (original)
+++ lenya/branches/BRANCH_2_1_X/INSTALL-SRC.txt Fri Feb 5 17:59:17 2010
@@ -19,15 +19,8 @@
* Java 2 Platform, Standard Edition
- Recommended version: JDK 1.5 (used by most developers). Java 1.4.2 or later should also
- work, and people are using Java 1.6 successfully in day-to-day operation.
- Get the JDK at http://java.sun.com/javase/downloads/index_jdk5.jsp.
-
- WARNING: There have been numerous reports of spurious VM crashes with Java versions from
- 1.5.0-07 to 1.5.0-11 both on Windows and Linux. Make sure you are using the latest available Java
- 5 package for your operating system (-13 as of this writing).
- If you encounter such crashes with more current revisions, please re-open
- http://issues.apache.org/bugzilla/show_bug.cgi?id=42493 .
+ Required version: JDK 1.6
+ Get the JDK at http://java.sun.com
* Apache Cocoon
Apache Cocoon is included in the Lenya distribution. In the SVN version of Lenya, Cocoon is
@@ -207,4 +200,4 @@
In the lenya-2.0.x directory, do
./build.sh test (to run the junit tests, requires a successful build), and
./build.sh modules.test.canoo (to run the canoo web tests, requires a running servlet engine).
-
\ No newline at end of file
+
Modified: lenya/branches/BRANCH_2_1_X/configure.sh
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/configure.sh?rev=907021&r1=907020&r2=907021&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/configure.sh (original)
+++ lenya/branches/BRANCH_2_1_X/configure.sh Fri Feb 5 17:59:17 2010
@@ -27,9 +27,8 @@
JAVA_HOME="$JAVA_HOME"
if [ "$JAVA_HOME" = "" ];then
echo "ERROR: No JAVA_HOME set yet!"
- echo " Have you installed JDK 1.4.2 or higher?"
+ echo " Have you installed JDK 1.6.0 or higher?"
echo ""
- echo "NOTE: Apache Lenya does not work properly with JDK 1.5!"
exit 1
fi
Modified: lenya/branches/BRANCH_2_1_X/src/targets/properties-build.xml
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/targets/properties-build.xml?rev=907021&r1=907020&r2=907021&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/targets/properties-build.xml (original)
+++ lenya/branches/BRANCH_2_1_X/src/targets/properties-build.xml Fri Feb 5 17:59:17 2010
@@ -60,16 +60,18 @@
<equals arg1="1.1" arg2="${ant.java.version}"/>
<equals arg1="1.2" arg2="${ant.java.version}"/>
<equals arg1="1.3" arg2="${ant.java.version}"/>
+ <equals arg1="1.4" arg2="${ant.java.version}"/>
+ <equals arg1="1.5" arg2="${ant.java.version}"/>
</or>
</not>
</condition>
- <fail unless="target.vm">Please use a JVM 1.4 or superior to compile lenya ${version}</fail>
+ <fail unless="target.vm">Please use a JVM 1.6 or superior to compile lenya ${version}</fail>
<!--
The minimal supported Java version. The class files we ship with Lenya (e.g., build tasks)
are compiled for this version.
-->
- <property name="target.vm.minimal" value="1.4"/>
+ <property name="target.vm.minimal" value="1.6"/>
<property name="packages" value="*.*"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org