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 2017/01/20 21:51:51 UTC
servicemix git commit: [SM-3225] Examples compile error
Repository: servicemix
Updated Branches:
refs/heads/master 74bf68c9b -> c49b9f734
[SM-3225] Examples compile error
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c49b9f73
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c49b9f73
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c49b9f73
Branch: refs/heads/master
Commit: c49b9f734f259ee88cf636de881b780e80e7f507
Parents: 74bf68c
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 20 22:51:03 2017 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 20 22:51:03 2017 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix-examples/pom.xml | 15 +-
.../src/main/filtered-resources/pom.xml | 202 +++++++++++++++++++
.../main/filtered-resources/examples/pom.xml | 202 -------------------
3 files changed, 214 insertions(+), 205 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c49b9f73/assemblies/apache-servicemix-examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix-examples/pom.xml b/assemblies/apache-servicemix-examples/pom.xml
index 5d7f666..d78155b 100644
--- a/assemblies/apache-servicemix-examples/pom.xml
+++ b/assemblies/apache-servicemix-examples/pom.xml
@@ -21,9 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>assemblies</artifactId>
- <groupId>org.apache.servicemix.assemblies</groupId>
+ <groupId>org.apache.servicemix.parent</groupId>
+ <artifactId>features-parent</artifactId>
<version>7.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/features-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -43,6 +44,7 @@
<exclude>**/.settings/**</exclude>
<exclude>**/*.iws</exclude>
<exclude>**/*.iwl</exclude>
+ <exclude>pom.xml</exclude>
</excludes>
</resource>
<resource>
@@ -52,8 +54,15 @@
<include>**/README.txt</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c49b9f73/assemblies/apache-servicemix-examples/src/main/filtered-resources/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix-examples/src/main/filtered-resources/pom.xml b/assemblies/apache-servicemix-examples/src/main/filtered-resources/pom.xml
new file mode 100644
index 0000000..778ef74
--- /dev/null
+++ b/assemblies/apache-servicemix-examples/src/main/filtered-resources/pom.xml
@@ -0,0 +1,202 @@
+<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/maven-v4_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>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>examples</artifactId>
+ <packaging>pom</packaging>
+ <version>${project.version}</version>
+ <name>Apache ServiceMix :: Examples</name>
+ <properties>
+ <akka.version>${akka.version}</akka.version>
+ <cxf.version>${cxf.version}</cxf.version>
+ <drools.version>${drools.version}</drools.version>
+ <drools6.version>${drools6.version}</drools6.version>
+ <jaxb.api.version>${jaxb.api.version}</jaxb.api.version>
+ <karaf.version>${karaf.version}</karaf.version>
+ <scala.version>${scala.version}</scala.version>
+ <slf4j.version>${slf4j.version}</slf4j.version>
+ <swagger.version>${swagger.version}</swagger.version>
+ <xerces.version>${xerces.version}</xerces.version>
+
+ <cxf.codegen-plugin.version>${cxf.codegen-plugin.version}</cxf.codegen-plugin.version>
+ <exec-maven-plugin.version>${exec-maven-plugin.version}</exec-maven-plugin.version>
+ <maven-scala-plugin.version>${maven-scala-plugin.version}</maven-scala-plugin.version>
+ </properties>
+ <!-- Managed dependencies -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${camel.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.wsn</groupId>
+ <artifactId>cxf-services-wsn-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-camel</artifactId>
+ <version>${activiti.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo-ws-metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ <version>${commons-httpclient.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-jaxrs_2.11</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>${maven-scala-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.codegen-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>activemq</module>
+ <module>activiti</module>
+ <module>akka</module>
+ <module>camel</module>
+ <module>cxf</module>
+ <module>drools</module>
+ <module>karaf</module>
+ </modules>
+
+ <repositories>
+ <!-- Required to build the examples in a SNAPSHOT assembly -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c49b9f73/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml b/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml
deleted file mode 100644
index 778ef74..0000000
--- a/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<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/maven-v4_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>
-
- <groupId>org.apache.servicemix.examples</groupId>
- <artifactId>examples</artifactId>
- <packaging>pom</packaging>
- <version>${project.version}</version>
- <name>Apache ServiceMix :: Examples</name>
- <properties>
- <akka.version>${akka.version}</akka.version>
- <cxf.version>${cxf.version}</cxf.version>
- <drools.version>${drools.version}</drools.version>
- <drools6.version>${drools6.version}</drools6.version>
- <jaxb.api.version>${jaxb.api.version}</jaxb.api.version>
- <karaf.version>${karaf.version}</karaf.version>
- <scala.version>${scala.version}</scala.version>
- <slf4j.version>${slf4j.version}</slf4j.version>
- <swagger.version>${swagger.version}</swagger.version>
- <xerces.version>${xerces.version}</xerces.version>
-
- <cxf.codegen-plugin.version>${cxf.codegen-plugin.version}</cxf.codegen-plugin.version>
- <exec-maven-plugin.version>${exec-maven-plugin.version}</exec-maven-plugin.version>
- <maven-scala-plugin.version>${maven-scala-plugin.version}</maven-scala-plugin.version>
- </properties>
- <!-- Managed dependencies -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camel.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>${karaf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.services.wsn</groupId>
- <artifactId>cxf-services-wsn-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-camel</artifactId>
- <version>${activiti.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>${geronimo-ws-metadata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons-httpclient.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.11</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>${maven-scala-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.codegen-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>activemq</module>
- <module>activiti</module>
- <module>akka</module>
- <module>camel</module>
- <module>cxf</module>
- <module>drools</module>
- <module>karaf</module>
- </modules>
-
- <repositories>
- <!-- Required to build the examples in a SNAPSHOT assembly -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
-</project>