You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/12/24 15:18:15 UTC
svn commit: r1052512 - in /activemq/trunk: assembly/src/release/bin/activemq
pom.xml
Author: dejanb
Date: Fri Dec 24 14:18:15 2010
New Revision: 1052512
URL: http://svn.apache.org/viewvc?rev=1052512&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3105 - require JDK 6 and fix an bug for osx
Modified:
activemq/trunk/assembly/src/release/bin/activemq
activemq/trunk/pom.xml
Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1052512&r1=1052511&r2=1052512&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Fri Dec 24 14:18:15 2010
@@ -249,7 +249,7 @@ case "`uname`" in
CYGWIN*) OSTYPE="cygwin" ;;
Darwin*)
OSTYPE="darwin"
- if [ "$JAVACMD" = "auto" ];then
+ if [-z "$JAVA_HOME"] && [ "$JAVACMD" = "auto" ];then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1052512&r1=1052511&r2=1052512&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Dec 24 14:18:15 2010
@@ -1080,8 +1080,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<optimize>true</optimize>
<debug>true</debug>
<showDeprecation>true</showDeprecation>