https://issues.apache.org/jira/browse/AMQ-3105 - require JDK 6 and fix an bug for osx

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1052512 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/release/bin/activemq

@@ -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
            ;;

pom.xml

@@ -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>