Repository: camel Updated Branches: refs/heads/jdk8-lambdas b68c5c4a2 -> 8b197255a
CAMEL-9764: Maven build - Fix unruly projects w/ independent maven-bundle-plugin executions. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b197255 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b197255 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b197255 Branch: refs/heads/jdk8-lambdas Commit: 8b197255a85fe28253405e8e6314d7beea3e49a6 Parents: b68c5c4 Author: Raúl Kripalani <ra...@apache.org> Authored: Sat Mar 26 00:48:03 2016 +0000 Committer: Raúl Kripalani <ra...@apache.org> Committed: Sat Mar 26 00:48:03 2016 +0000 ---------------------------------------------------------------------- examples/camel-example-bam/pom.xml | 4 +- examples/camel-example-box-osgi/pom.xml | 26 ++---- examples/camel-example-cdi-properties/pom.xml | 7 +- examples/camel-example-cxf-blueprint/pom.xml | 24 ++---- examples/camel-example-cxf-osgi/pom.xml | 80 ++++++++---------- .../camel-example-netty-http/myapp-one/pom.xml | 34 +++----- .../camel-example-netty-http/myapp-two/pom.xml | 34 +++----- .../shared-netty-http-server/pom.xml | 33 +++----- .../pom.xml | 89 +++++++++----------- .../pom.xml | 32 ++----- .../pom.xml | 34 +++----- 11 files changed, 147 insertions(+), 250 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-bam/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-bam/pom.xml b/examples/camel-example-bam/pom.xml index 8fc2f6e..9a5c1b2 100644 --- a/examples/camel-example-bam/pom.xml +++ b/examples/camel-example-bam/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.bam.model </camel.osgi.import.additional> <!-- to avoid us import bunch other package --> - <camel.osgi.dynamic>*</camel.osgi.dynamic> + <camel.osgi.dynamic>*</camel.osgi.dynamic> </properties> <dependencies> @@ -93,7 +93,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkCount>1</forkCount> - <reuseForks>false</reuseForks> + <reuseForks>false</reuseForks> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-box-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-box-osgi/pom.xml b/examples/camel-example-box-osgi/pom.xml index 0fd6600..703e647 100644 --- a/examples/camel-example-box-osgi/pom.xml +++ b/examples/camel-example-box-osgi/pom.xml @@ -30,6 +30,12 @@ <description>An example which use a Box Endpoint in OSGi</description> <packaging>jar</packaging> + <properties> + <camel.osgi.export.pkg> + org.apache.camel.example* + </camel.osgi.export.pkg> + </properties> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -62,24 +68,4 @@ </dependency> </dependencies> - <build> - <plugins> - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.camel.example*</Export-Package> - <Import-Package> - * - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-cdi-properties/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml index 0ab190b..940f185 100755 --- a/examples/camel-example-cdi-properties/pom.xml +++ b/examples/camel-example-cdi-properties/pom.xml @@ -31,6 +31,12 @@ <description>DeltaSpike configuration properties CDI example</description> <packaging>jar</packaging> + <properties> + <camel.osgi.export.pkg> + org.apache.camel.example.cdi.properties* + </camel.osgi.export.pkg> + </properties> + <dependencies> <!-- CDI API --> @@ -89,7 +95,6 @@ <build> <plugins> - <plugin> <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-cxf-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml index 8d50637..b0dcd2a 100644 --- a/examples/camel-example-cxf-blueprint/pom.xml +++ b/examples/camel-example-cxf-blueprint/pom.xml @@ -30,6 +30,12 @@ <description>An example which use a CXF consumer and the OSGI HTTP Service</description> <packaging>jar</packaging> + <properties> + <camel.osgi.export.pkg> + org.apache.camel.example.reportincident* + </camel.osgi.export.pkg> + </properties> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -96,24 +102,6 @@ </execution> </executions> </plugin> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.camel.example.reportincident*</Export-Package> - <Import-Package> - * - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> </build> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-cxf-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-osgi/pom.xml b/examples/camel-example-cxf-osgi/pom.xml index e5f6677..e423f2c 100644 --- a/examples/camel-example-cxf-osgi/pom.xml +++ b/examples/camel-example-cxf-osgi/pom.xml @@ -30,6 +30,42 @@ <description>An example which use a CXF consumer and the OSGI HTTP Service</description> <packaging>jar</packaging> + <properties> + <camel.osgi.import.pkg> + org.apache.cxf, + org.apache.cxf.binding, + org.apache.cxf.binding.corba, + org.apache.cxf.binding.soap, + org.apache.cxf.binding.soap.spring, + org.apache.cxf.bus, + org.apache.cxf.bus.resource, + org.apache.cxf.bus.spring, + org.apache.cxf.buslifecycle, + org.apache.cxf.catalog, + org.apache.cxf.configuration, + org.apache.cxf.configuration.spring, + org.apache.cxf.endpoint, + org.apache.cxf.headers, + org.apache.cxf.management, + org.apache.cxf.management.jmx, + org.apache.cxf.phase, + org.apache.cxf.resource, + org.apache.cxf.service.factory, + org.apache.cxf.transport, + org.apache.cxf.transport.http, + org.apache.cxf.transport.http.policy, + org.apache.cxf.transport.http_jetty, + org.apache.cxf.transport.jms, + org.apache.cxf.workqueue, + org.apache.cxf.wsdl, + org.apache.cxf.wsdl11, + * + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + org.apache.camel.example.reportincident* + </camel.osgi.export.pkg> + </properties> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -106,50 +142,6 @@ </execution> </executions> </plugin> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.camel.example.reportincident*</Export-Package> - <Import-Package> - org.apache.cxf, - org.apache.cxf.binding, - org.apache.cxf.binding.corba, - org.apache.cxf.binding.soap, - org.apache.cxf.binding.soap.spring, - org.apache.cxf.bus, - org.apache.cxf.bus.resource, - org.apache.cxf.bus.spring, - org.apache.cxf.buslifecycle, - org.apache.cxf.catalog, - org.apache.cxf.configuration, - org.apache.cxf.configuration.spring, - org.apache.cxf.endpoint, - org.apache.cxf.headers, - org.apache.cxf.management, - org.apache.cxf.management.jmx, - org.apache.cxf.phase, - org.apache.cxf.resource, - org.apache.cxf.service.factory, - org.apache.cxf.transport, - org.apache.cxf.transport.http, - org.apache.cxf.transport.http.policy, - org.apache.cxf.transport.http_jetty, - org.apache.cxf.transport.jms, - org.apache.cxf.workqueue, - org.apache.cxf.wsdl, - org.apache.cxf.wsdl11, - * - </Import-Package> - </instructions> - </configuration> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-netty-http/myapp-one/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-netty-http/myapp-one/pom.xml b/examples/camel-example-netty-http/myapp-one/pom.xml index 637fce7..316604e 100644 --- a/examples/camel-example-netty-http/myapp-one/pom.xml +++ b/examples/camel-example-netty-http/myapp-one/pom.xml @@ -27,28 +27,16 @@ <name>Camel :: Example :: Netty HTTP :: My Application One</name> <packaging>jar</packaging> - <build> - <plugins> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Import-Package> - org.apache.camel.component.netty, - org.apache.camel.component.netty.http, - org.osgi.service.blueprint - </Import-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> + <properties> + <camel.osgi.import.pkg> + org.apache.camel.component.netty, + org.apache.camel.component.netty.http, + org.osgi.service.blueprint, + * + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + * + </camel.osgi.export.pkg> + </properties> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-netty-http/myapp-two/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-netty-http/myapp-two/pom.xml b/examples/camel-example-netty-http/myapp-two/pom.xml index 4579f06..c590ae9 100644 --- a/examples/camel-example-netty-http/myapp-two/pom.xml +++ b/examples/camel-example-netty-http/myapp-two/pom.xml @@ -27,28 +27,16 @@ <name>Camel :: Example :: Netty HTTP :: My Application Two</name> <packaging>jar</packaging> - <build> - <plugins> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Import-Package> - org.apache.camel.component.netty, - org.apache.camel.component.netty.http, - org.osgi.service.blueprint - </Import-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> + <properties> + <camel.osgi.import.pkg> + org.apache.camel.component.netty, + org.apache.camel.component.netty.http, + org.osgi.service.blueprint, + * + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + * + </camel.osgi.export.pkg> + </properties> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-netty-http/shared-netty-http-server/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-netty-http/shared-netty-http-server/pom.xml b/examples/camel-example-netty-http/shared-netty-http-server/pom.xml index ce3a88e..1921037 100644 --- a/examples/camel-example-netty-http/shared-netty-http-server/pom.xml +++ b/examples/camel-example-netty-http/shared-netty-http-server/pom.xml @@ -27,28 +27,15 @@ <name>Camel :: Example :: Netty HTTP :: Shared Netty HTTP Server</name> <packaging>jar</packaging> - <build> - <plugins> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Import-Package> - org.apache.camel.component.netty, - org.apache.camel.component.netty.http, - org.osgi.service.blueprint - </Import-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> + <properties> + <camel.osgi.import.pkg> + org.apache.camel.component.netty, + org.apache.camel.component.netty.http, + org.osgi.service.blueprint + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + * + </camel.osgi.export.pkg> + </properties> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-reportincident-wssecurity/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml index a9f0cf9..774b21a 100644 --- a/examples/camel-example-reportincident-wssecurity/pom.xml +++ b/examples/camel-example-reportincident-wssecurity/pom.xml @@ -32,6 +32,43 @@ </description> <packaging>jar</packaging> + <properties> + <camel.osgi.import.pkg> + META-INF.cxf, + org.apache.cxf, + org.apache.cxf.binding, + org.apache.cxf.binding.corba, + org.apache.cxf.binding.soap, + org.apache.cxf.binding.soap.spring, + org.apache.cxf.bus, + org.apache.cxf.bus.resource, + org.apache.cxf.bus.spring, + org.apache.cxf.buslifecycle, + org.apache.cxf.catalog, + org.apache.cxf.configuration, + org.apache.cxf.configuration.spring, + org.apache.cxf.endpoint, + org.apache.cxf.headers, + org.apache.cxf.management, + org.apache.cxf.management.jmx, + org.apache.cxf.phase, + org.apache.cxf.resource, + org.apache.cxf.transport, + org.apache.cxf.transport.http.policy, + org.apache.cxf.transport.http_jetty, + org.apache.cxf.transport.jms, + org.apache.cxf.workqueue, + org.apache.cxf.wsdl, + org.apache.cxf.wsdl11, + org.springframework.beans.factory.config, + org.springframework.mail.javamail, + * + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + org.apache.camel.example.reportincident* + </camel.osgi.export.pkg> + </properties> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -170,56 +207,10 @@ <plugin> <groupId>org.apache.camel</groupId> - <artifactId>camel-maven-plugin</artifactId> - <version>${project.version}</version> + <artifactId>camel-maven-plugin</artifactId> + <version>${project.version}</version> </plugin> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.camel.example.reportincident*</Export-Package> - <Import-Package> - META-INF.cxf, - org.apache.cxf, - org.apache.cxf.binding, - org.apache.cxf.binding.corba, - org.apache.cxf.binding.soap, - org.apache.cxf.binding.soap.spring, - org.apache.cxf.bus, - org.apache.cxf.bus.resource, - org.apache.cxf.bus.spring, - org.apache.cxf.buslifecycle, - org.apache.cxf.catalog, - org.apache.cxf.configuration, - org.apache.cxf.configuration.spring, - org.apache.cxf.endpoint, - org.apache.cxf.headers, - org.apache.cxf.management, - org.apache.cxf.management.jmx, - org.apache.cxf.phase, - org.apache.cxf.resource, - org.apache.cxf.transport, - org.apache.cxf.transport.http.policy, - org.apache.cxf.transport.http_jetty, - org.apache.cxf.transport.jms, - org.apache.cxf.workqueue, - org.apache.cxf.wsdl, - org.apache.cxf.wsdl11, - org.springframework.beans.factory.config, - org.springframework.mail.javamail, - * - </Import-Package> - </instructions> - </configuration> - </plugin> - - </plugins> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-servlet-rest-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml b/examples/camel-example-servlet-rest-blueprint/pom.xml index bcfd317..5c8bf07 100755 --- a/examples/camel-example-servlet-rest-blueprint/pom.xml +++ b/examples/camel-example-servlet-rest-blueprint/pom.xml @@ -30,6 +30,15 @@ <description>An example using Servlet REST with OSGi Blueprint</description> <packaging>jar</packaging> + <properties> + <camel.osgi.import.pkg> + * + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + * + </camel.osgi.export.pkg> + </properties> + <dependencies> <!-- camel --> @@ -77,27 +86,4 @@ </dependency> </dependencies> - <build> - <plugins> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.camel.example.rest*</Export-Package> - <Import-Package> - * - </Import-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8b197255/examples/camel-example-twitter-websocket-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-twitter-websocket-blueprint/pom.xml b/examples/camel-example-twitter-websocket-blueprint/pom.xml index ee34948..b862419 100644 --- a/examples/camel-example-twitter-websocket-blueprint/pom.xml +++ b/examples/camel-example-twitter-websocket-blueprint/pom.xml @@ -30,30 +30,16 @@ <description>An example that pushes new tweets to a web page using web-socket</description> <packaging>jar</packaging> - <!-- there is no maven dependencies needed as the Camel application has no Java code, + <properties> + <camel.osgi.import.pkg> + * + </camel.osgi.import.pkg> + <camel.osgi.export.pkg> + * + </camel.osgi.export.pkg> + </properties> + + <!-- there are no maven dependencies needed as the Camel application has no Java code, and its all defined in the src/main/resources/OSGI-INF/blueprint/camel-twitter.xml file --> - <build> - <plugins> - - <!-- to generate the MANIFEST-FILE of the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <manifestLocation>target/META-INF</manifestLocation> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.apache.camel.example.twitter*</Export-Package> - <Import-Package> - * - </Import-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> - </project>
