Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5744 - jasypt-spring31

This commit is contained in:
Dejan Bosanac 2015-04-24 11:56:14 +02:00
parent 610ff0634f
commit b8698953f3
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-karaf/src/main/resources/features-core.xml
View File

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

2
activemq-unit-tests/pom.xml
View File

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

2
assembly/pom.xml
View File

@ -374,7 +374,7 @@
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt-spring3</artifactId>
<artifactId>jasypt-spring31</artifactId>
<version>${jasypt-version}</version>
</dependency>
<dependency>

2
assembly/src/main/descriptors/common-bin.xml
View File

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

4
assembly/src/release/examples/conf/activemq-security.xml
View File

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