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/05/17 19:28:04 UTC
servicemix git commit: [SM-2991] ServiceMix doesn't start in offline
environment
Repository: servicemix
Updated Branches:
refs/heads/master 41624c785 -> d265e45fa
[SM-2991] ServiceMix doesn't start in offline environment
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d265e45f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d265e45f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d265e45f
Branch: refs/heads/master
Commit: d265e45fa4c4ba86f72ce700270a2fd46eeeb34a
Parents: 41624c7
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue May 17 21:27:24 2016 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue May 17 21:27:24 2016 +0200
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 21 ++++----
assemblies/features/pom.xml | 1 -
assemblies/features/servicemix-internal/pom.xml | 57 --------------------
.../src/main/feature/feature.xml | 40 --------------
4 files changed, 10 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d265e45f/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index 6b6c308..528fe53 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -95,14 +95,6 @@
<!-- Apache ServiceMix -->
<dependency>
<groupId>org.apache.servicemix.features</groupId>
- <artifactId>servicemix-internal</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.features</groupId>
<artifactId>servicemix-features</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
@@ -235,10 +227,17 @@
<feature>camel-blueprint</feature>
<feature>war</feature>
<feature>camel-xstream</feature>
- <!-- To ensure the overriden bundles exist in 'system' -->
- <feature>override-joda-time</feature>
- <feature>override-fasterxml-jackson-core</feature>
</bootFeatures>
+ <installedBundles>
+ <!-- To ensure the overriden bundles exist in 'system' -->
+ <bundle>mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
+ <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>
+ <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version}</bundle>
+ </installedBundles>
<libraries>
<library>xerces-${xerces.version}.jar;url:="wrap:mvn:xerces/xercesImpl/${xerces.version}$Export-Package=org.apache.*;version=${xerces.version}";type:=endorsed;export:=true;delegate:=true</library>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d265e45f/assemblies/features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml
index 1ef853d..c7ee7cf 100644
--- a/assemblies/features/pom.xml
+++ b/assemblies/features/pom.xml
@@ -33,7 +33,6 @@
<name>Apache ServiceMix :: Assemblies :: Features</name>
<modules>
- <module>servicemix-internal</module>
<module>servicemix-features</module>
<module>servicemix-kie</module>
<module>servicemix-examples</module>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d265e45f/assemblies/features/servicemix-internal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-internal/pom.xml b/assemblies/features/servicemix-internal/pom.xml
deleted file mode 100644
index 83eece1..0000000
--- a/assemblies/features/servicemix-internal/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>features</artifactId>
- <groupId>org.apache.servicemix.assemblies.features</groupId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
-
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>servicemix-internal</artifactId>
- <packaging>feature</packaging>
- <name>Apache ServiceMix :: Assemblies :: Features :: ServiceMix Internal</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>features-generate-descriptor</goal>
- </goals>
- <configuration>
- <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d265e45f/assemblies/features/servicemix-internal/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-internal/src/main/feature/feature.xml b/assemblies/features/servicemix-internal/src/main/feature/feature.xml
deleted file mode 100644
index b3f8dff..0000000
--- a/assemblies/features/servicemix-internal/src/main/feature/feature.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<features name="servicemix-internal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
-
- <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
- <repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository>
- <repository>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</repository>
- <repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository>
- <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
-
- <!-- workaround for SM-2469 -->
- <feature name="override-joda-time" hidden="true">
- <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>