You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/11/22 14:01:45 UTC

[camel] branch master updated (5a574a3 -> 6dd789e)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 5a574a3  Make CassandraComponent extend DefaultComponent
     new 4d01da7  "CAMEL-12018:camel-shiro - Upgrade to 1.4.0"
     new 6dd789e  CAMEL-12018:camel-shiro - Upgrade to 1.4.0 - Fix karaf feature

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components/camel-shiro/pom.xml                           | 5 +++++
 parent/pom.xml                                           | 3 ++-
 platforms/karaf/features/src/main/resources/features.xml | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].

[camel] 02/02: CAMEL-12018:camel-shiro - Upgrade to 1.4.0 - Fix karaf feature

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 6dd789ea01ad88f008abc15abeec6498c230a940
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 22 15:01:16 2017 +0100

    CAMEL-12018:camel-shiro - Upgrade to 1.4.0 - Fix karaf feature
---
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/parent/pom.xml b/parent/pom.xml
index afeb324..717f8a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -142,6 +142,7 @@
     <commons-compress-version>1.15</commons-compress-version>
     <commons-configuration-version>1.9</commons-configuration-version>
     <commons-configuration-bundle-version>1.9_1</commons-configuration-bundle-version>
+    <commons-configuration2-version>2.2</commons-configuration2-version>
     <commons-csv-version>1.5</commons-csv-version>
     <commons-cli-version>1.3.1</commons-cli-version>
     <commons-daemon-version>1.0.15</commons-daemon-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index dbd56f6..696a941 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1925,6 +1925,8 @@
   <feature name='camel-shiro' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.commons/commons-configuration2/${commons-configuration2-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.shiro/shiro-core/${shiro-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-shiro/${project.version}</bundle>
   </feature>

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.

[camel] 01/02: "CAMEL-12018:camel-shiro - Upgrade to 1.4.0"

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4d01da7917df028b6a3283b3ebad0b50b2ac41e0
Author: Ramu <kk...@redhat.com>
AuthorDate: Wed Nov 22 19:01:32 2017 +0530

    "CAMEL-12018:camel-shiro - Upgrade to 1.4.0"
---
 components/camel-shiro/pom.xml | 5 +++++
 parent/pom.xml                 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml
index b36174b..889c74e 100644
--- a/components/camel-shiro/pom.xml
+++ b/components/camel-shiro/pom.xml
@@ -76,6 +76,11 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+	        <groupId>commons-logging</groupId>
+	        <artifactId>commons-logging</artifactId>
+	        <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index fc7f3f0..afeb324 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -612,7 +612,7 @@
     <servicemix-specs-version>2.9.0</servicemix-specs-version>
     <servlet-api-3.0-version>1.0</servlet-api-3.0-version>
     <servlet-version-range>[3,4)</servlet-version-range>
-    <shiro-version>1.3.2</shiro-version>
+    <shiro-version>1.4.0</shiro-version>
     <shrinkwrap-descriptors-version>2.0.0-alpha-10</shrinkwrap-descriptors-version>
     <shrinkwrap-resolver-version>2.2.4</shrinkwrap-resolver-version>
     <shrinkwrap-version>1.2.3</shrinkwrap-version>

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.