You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/08/06 11:47:45 UTC

[1/2] activemq git commit: Bugfix, ambiguous redirect if unset

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 02d5287af -> ccc2c5fc7


Bugfix, ambiguous redirect if unset

Thanks to Drew Wyatt<dr...@carshop.co.uk>

(cherry picked from commit 6d24f88d16e00fb915a6abd6e8fdcf192c54dfe7)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/797b8ee4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/797b8ee4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/797b8ee4

Branch: refs/heads/activemq-5.15.x
Commit: 797b8ee46fb7d28ca831e7c6e67e58846dc1b527
Parents: 02d5287
Author: Marc Schoechlin <ma...@vico-research.com>
Authored: Thu Jul 19 20:59:19 2018 +0200
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Aug 6 07:38:28 2018 -0400

----------------------------------------------------------------------
 assembly/src/release/bin/activemq | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/797b8ee4/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 0edc908..358204b 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -325,8 +325,12 @@ invokeJar(){
       DOIT_POSTFIX=" - $ACTIVEMQ_USER"
       echo "INFO: changing to user '$ACTIVEMQ_USER' to invoke java"
    fi
+
    # Execute java binary
    if [ -n "$TASK_TODO" ] && [ "$TASK_TODO" != "stop" ];then
+      if [ -z "$ACTIVEMQ_OUT" ]; then
+         ACTIVEMQ_OUT="/dev/null"
+      fi
       $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
               -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
               -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \

[2/2] activemq git commit: [AMQ-7032] Update Shiro to 1.2.6

Posted by cs...@apache.org.
[AMQ-7032] Update Shiro to 1.2.6

(cherry picked from commit ad56ee91387d491c88d9b3977f7a1318a0704fb6)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ccc2c5fc
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ccc2c5fc
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ccc2c5fc

Branch: refs/heads/activemq-5.15.x
Commit: ccc2c5fc713de842375788108b20b34b65c66fdd
Parents: 797b8ee
Author: jgoodyear <ja...@gmail.com>
Authored: Sun Aug 5 11:01:16 2018 -0230
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Aug 6 07:47:31 2018 -0400

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/ccc2c5fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 70d51f9..3da9658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
     <saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
     <scala-plugin-version>3.1.0</scala-plugin-version>
     <scala-version>2.11.0</scala-version>
-    <shiro-version>1.2.4</shiro-version>
+    <shiro-version>1.2.6</shiro-version>
     <scalatest-version>2.1.5</scalatest-version>
     <slf4j-version>1.7.25</slf4j-version>
     <snappy-version>1.1.2</snappy-version>