Author: davsclaus
Date: Fri Feb 25 06:57:42 2011
New Revision: 1074408
URL: http://svn.apache.org/viewvc?rev=1074408&view=rev
Log:
CAMEL-3315: Upgraded to jasypt 1.7
Modified:
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/components/camel-crypto/pom.xml
camel/trunk/components/camel-ftp/pom.xml
camel/trunk/components/camel-jasypt/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Fri Feb 25
06:57:42 2011
@@ -162,13 +162,11 @@
<includes>
<include>log4j:log4j</include>
<include>org.slf4j:slf4j-log4j12</include>
- <!-- commons-XXX is needed when running examples using ANT or
camel-jasypt tooling -->
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
<include>commons-dbcp:commons-dbcp</include>
<include>commons-pool:commons-pool</include>
<include>commons-lang:commons-lang</include>
- <include>commons-codec:commons-codec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
Modified: camel/trunk/components/camel-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/pom.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/pom.xml (original)
+++ camel/trunk/components/camel-crypto/pom.xml Fri Feb 25 06:57:42 2011
@@ -46,6 +46,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>${commons-codec}</version>
</dependency>
<!-- for testing -->
@@ -67,6 +68,7 @@
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
+ <version>${bouncycastle-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-ftp/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/pom.xml (original)
+++ camel/trunk/components/camel-ftp/pom.xml Fri Feb 25 06:57:42 2011
@@ -117,6 +117,7 @@
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
+ <version>${bouncycastle-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-jasypt/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/pom.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/components/camel-jasypt/pom.xml (original)
+++ camel/trunk/components/camel-jasypt/pom.xml Fri Feb 25 06:57:42 2011
@@ -34,6 +34,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.jasypt.*</camel.osgi.export.pkg>
+
<camel.osgi.import.before.defaults>org.jasypt.encryption.*;version="[1.7,2)"</camel.osgi.import.before.defaults>
</properties>
<dependencies>
@@ -50,12 +51,6 @@
<version>${jasypt-version}</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang-version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
@@ -121,7 +116,7 @@
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifest>
<addClasspath>true</addClasspath>
- <classpathPrefix>optional/</classpathPrefix>
+ <classpathPrefix>optional/</classpathPrefix>
<mainClass>org.apache.camel.component.jasypt.Main</mainClass>
</manifest>
</archive>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb 25 06:57:42 2011
@@ -87,7 +87,7 @@
<icu4j-version>4.0.1</icu4j-version>
<jackson-version>1.7.1</jackson-version>
<jain-sip-ri-bundle-version>1.2.154_1</jain-sip-ri-bundle-version>
- <jasypt-version>1.6</jasypt-version>
+ <jasypt-version>1.7</jasypt-version>
<javassist-bundle-version>3.9.0.GA_1</javassist-bundle-version>
<javax-mail-version>1.4.3</javax-mail-version>
<jaxen-version>1.1.1</jaxen-version>
@@ -1123,18 +1123,6 @@
<version>${jetty-version}</version>
</dependency>
- <!-- optional crypto support -->
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec}</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>${bouncycastle-version}</version>
- </dependency>
-
<!-- optional jakarta http core support -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Feb 25 06:57:42 2011
@@ -77,7 +77,7 @@
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
<jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
- <jasypt-bundle-version>1.6_1</jasypt-bundle-version>
+ <jasypt-bundle-version>1.7_2</jasypt-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<javax.el-bundle-version>2.1.0</javax.el-bundle-version>
<jcr-bundle-version>1.0_2</jcr-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Feb 25 06:57:42 2011
@@ -355,8 +355,6 @@
<feature name='camel-jasypt' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jasypt/${pom.version}</bundle>
- <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt-bundle-version}</bundle>
</feature>
<feature name='camel-jaxb' version='${pom.version}'>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java?rev=1074408&r1=1074407&r2=1074408&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
Fri Feb 25 06:57:42 2011
@@ -20,7 +20,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jasypt.JasyptPropertiesParser;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -35,7 +34,6 @@ import static org.ops4j.pax.exam.contain
import static
org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
@RunWith(JUnit4TestRunner.class)
-@Ignore("Does not work on JDK 1.5")
public class JasyptTest extends OSGiIntegrationTestSupport {
@Test
