git commit: CAMEL-7887: Executing of 'mvn clean install -Pvalidate' in camel/platforms/karaf/features is failing
Repository: camel Updated Branches: refs/heads/master 3e77f050d - f1b2010b1 CAMEL-7887: Executing of 'mvn clean install -Pvalidate' in camel/platforms/karaf/features is failing Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1b2010b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1b2010b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1b2010b Branch: refs/heads/master Commit: f1b2010b14ade983cfd69432611a31b2ff19d1f4 Parents: 3e77f05 Author: Christian Mueller cmuel...@apache.org Authored: Thu Oct 30 19:34:40 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Thu Oct 30 19:34:56 2014 +0100 -- parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f1b2010b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 92b27c4..c58fee8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -409,8 +409,7 @@ spring-ldap-version1.3.1.RELEASE/spring-ldap-version spring-ldap-bundle-version1.3.1.RELEASE_2/spring-ldap-bundle-version spring-retry-version1.0.3.RELEASE/spring-retry-version -!-- spring-dm does not support spring 4.x so import-range must be 3.x only until a solution in karaf exists -- -spring-version-range[3.2,4)/spring-version-range +spring-version-range[3.2,4.2)/spring-version-range spring-version${spring4-version}/spring-version spring32-version3.2.11.RELEASE/spring32-version spring40-version4.0.7.RELEASE/spring40-version
git commit: CAMEL-7887: Executing of 'mvn clean install -Pvalidate' in camel/platforms/karaf/features is failing
Repository: camel Updated Branches: refs/heads/master f1b2010b1 - c8e2b3e21 CAMEL-7887: Executing of 'mvn clean install -Pvalidate' in camel/platforms/karaf/features is failing Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8e2b3e2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8e2b3e2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8e2b3e2 Branch: refs/heads/master Commit: c8e2b3e211235db0b85bf76a59fcdabb616b9f7d Parents: f1b2010 Author: Christian Mueller cmuel...@apache.org Authored: Thu Oct 30 19:38:54 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Thu Oct 30 19:38:54 2014 +0100 -- platforms/karaf/features/src/main/resources/features.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c8e2b3e2/platforms/karaf/features/src/main/resources/features.xml -- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index f345107..ac23927 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -16,7 +16,7 @@ limitations under the License. -- features xmlns=http://karaf.apache.org/xmlns/features/v1.0.0; name='camel-${project.version}' - + repositorymvn:org.apache.karaf.assemblies.features/spring/${karaf-version}/xml/features/repository repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository repositorymvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features/repository
git commit: CAMEL-7887: Executing of 'mvn clean install -Pvalidate' in camel/platforms/karaf/features is failing
Repository: camel Updated Branches: refs/heads/master c42c75616 - 3fc8e514f CAMEL-7887: Executing of 'mvn clean install -Pvalidate' in camel/platforms/karaf/features is failing Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3fc8e514 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3fc8e514 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3fc8e514 Branch: refs/heads/master Commit: 3fc8e514f7094aa78193f66029b1e4fe3cd04a85 Parents: c42c756 Author: Christian Mueller cmuel...@apache.org Authored: Wed Oct 29 20:11:51 2014 +0100 Committer: Christian Mueller cmuel...@apache.org Committed: Wed Oct 29 20:11:51 2014 +0100 -- platforms/karaf/features/pom.xml | 7 --- 1 file changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3fc8e514/platforms/karaf/features/pom.xml -- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 42e4bd8..faf1646 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -163,13 +163,6 @@ groupIdorg.apache.karaf.tooling/groupId artifactIdfeatures-maven-plugin/artifactId version${karaf-version}/version -dependencies - dependency -groupIdbiz.aQute/groupId -artifactIdbndlib/artifactId -version1.50.0/version - /dependency -/dependencies configuration file${project.build.directory}/classes/${features.file}/file karafConfig${project.build.directory}/classes/config.properties/karafConfig