You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/02/01 00:59:50 UTC
[2/2] servicemix git commit: M-2824: Missing dependencies in system
folder
M-2824: Missing dependencies in system folder
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/e65c51e3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e65c51e3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e65c51e3
Branch: refs/heads/servicemix-5.x
Commit: e65c51e38e22ff07ce673eac8d27a982dd44e8f7
Parents: 868412c
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Feb 1 00:52:03 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Feb 1 00:52:03 2016 +0100
----------------------------------------------------------------------
assembly/pom.xml | 4 +++-
.../etc/org.apache.karaf.features.cfg | 1 -
assembly/src/main/filtered-resources/features.xml | 5 +++++
assembly/src/main/filtered-resources/internal.xml | 14 ++++++++------
4 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/e65c51e3/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7c763a0..4ac9740 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -154,7 +154,6 @@
<descriptor>file:${project.build.outputDirectory}/examples.xml</descriptor>
</descriptors>
<features>
- <feature>joda-time</feature>
<feature>cxf</feature>
<feature>obr</feature>
<feature>config</feature>
@@ -170,6 +169,9 @@
<feature>camel-blueprint</feature>
<feature>war</feature>
<feature>jaxrs-api</feature>
+ <!-- To ensure the overriden bundles exist in 'system' -->
+ <feature>override-joda-time</feature>
+ <feature>override-fasterxml-jackson-core</feature>
</features>
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
<repository>${project.build.directory}/features-repo</repository>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/e65c51e3/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 2e157f0..4da0c14 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -29,7 +29,6 @@ featuresRepositories=\
mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,\
mvn:org.apache.karaf.assemblies.features/spring/${karaf.version}/xml/features,\
mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,\
- mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,\
mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,\
mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,\
mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,\
http://git-wip-us.apache.org/repos/asf/servicemix/blob/e65c51e3/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 67fb349..3f2cabb 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -135,4 +135,9 @@
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.scriptconsole/${felix.webconsole.plugins.scriptconsole.version}</bundle>
</feature>
+ <!-- workaround before SM-2179 get addressed on CXF side-->
+ <feature name="jaxrs-api">
+ <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}</bundle>
+ </feature>
+
</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/e65c51e3/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index c4c6418..49ca9e6 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -21,14 +21,16 @@
<repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
- <!-- workaround before SM-2179 get addressed on CXF side-->
- <feature name="jaxrs-api">
- <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}</bundle>
- </feature>
-
<!-- workaround for SM-2469 -->
- <feature name="joda-time">
+ <feature name="override-joda-time">
<bundle start-level='10'>mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
</feature>
+ <!-- workaround for SM-2824 -->
+ <feature name="override-fasterxml-jackson-core" hidden="true">
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
+ </feature>
+
</features>