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 2015/04/24 11:56:37 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5744 -
jasypt-spring31
Repository: activemq
Updated Branches:
refs/heads/master 610ff0634 -> b8698953f
https://issues.apache.org/jira/browse/AMQ-5744 - jasypt-spring31
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b8698953
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b8698953
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b8698953
Branch: refs/heads/master
Commit: b8698953f35e91a14abf7a428a6929312f4b9099
Parents: 610ff06
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Fri Apr 24 11:56:14 2015 +0200
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Fri Apr 24 11:56:26 2015 +0200
----------------------------------------------------------------------
activemq-karaf/src/main/resources/features-core.xml | 1 +
activemq-unit-tests/pom.xml | 2 +-
assembly/pom.xml | 2 +-
assembly/src/main/descriptors/common-bin.xml | 2 +-
assembly/src/release/examples/conf/activemq-security.xml | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b8698953/activemq-karaf/src/main/resources/features-core.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 6b77107..c578e15 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -49,6 +49,7 @@
<bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/1.9.2_1</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
http://git-wip-us.apache.org/repos/asf/activemq/blob/b8698953/activemq-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 1db6dc9..3ca9b1a 100755
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -218,7 +218,7 @@
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
- <artifactId>jasypt-spring3</artifactId>
+ <artifactId>jasypt-spring31</artifactId>
<version>${jasypt-version}</version>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/b8698953/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ce2ec38..dcbe733 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -374,7 +374,7 @@
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
- <artifactId>jasypt-spring3</artifactId>
+ <artifactId>jasypt-spring31</artifactId>
<version>${jasypt-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/b8698953/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 6359837..dd9f71d 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -197,7 +197,7 @@
<include>org.apache.velocity:velocity</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
<include>org.jasypt:jasypt</include>
- <include>org.jasypt:jasypt-spring3</include>
+ <include>org.jasypt:jasypt-spring31</include>
<include>javax.jmdns:jmdns</include>
<include>org.apache.qpid:proton-jms</include>
<include>org.apache.qpid:proton-j</include>
http://git-wip-us.apache.org/repos/asf/activemq/blob/b8698953/assembly/src/release/examples/conf/activemq-security.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/conf/activemq-security.xml b/assembly/src/release/examples/conf/activemq-security.xml
index 284a16a..1fb1422 100644
--- a/assembly/src/release/examples/conf/activemq-security.xml
+++ b/assembly/src/release/examples/conf/activemq-security.xml
@@ -48,7 +48,7 @@
<property name="config" ref="environmentVariablesConfiguration" />
</bean>
- <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer">
+ <bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<constructor-arg ref="configurationEncryptor" />
<property name="location" value="file:${activemq.conf}/credentials-enc.properties"/>
</bean>
@@ -125,6 +125,6 @@
</broker>
<!-- Use Web applications and Camel in secured broker environment -->
- <import resource="jetty.xml"/>
+ <import resource="jetty-demo.xml"/>
</beans>