Repository: camel Updated Branches: refs/heads/jdk8-lambdas [created] 5a60b6e0d
http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 688d662..52d3323 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -381,14 +381,15 @@ <maven-archetype-plugin-version>2.0</maven-archetype-plugin-version> <maven-archetype-packaging-version>2.0</maven-archetype-packaging-version> <maven-bundle-version>${maven-bundle-plugin-version}</maven-bundle-version> - <!-- problems by upgrading to maven-bundle-plugin 2.4.0 --> - <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version> + <!-- Staying in 2.x because 3.x causes trouble. --> + <maven-bundle-plugin-version>2.5.4</maven-bundle-plugin-version> <maven-checkstyle-plugin-version>2.16</maven-checkstyle-plugin-version> <!-- AtomicException.java causes a problem with Checksyle > 6.6 due to https://github.com/checkstyle/checkstyle/issues/1903 --> <maven-checkstyle-version>6.6</maven-checkstyle-version> <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version> + <maven-jar-plugin-version>2.6</maven-jar-plugin-version> <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> <maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version> <maven-remote-resources-plugin-version>1.4</maven-remote-resources-plugin-version> @@ -2825,6 +2826,16 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin-version}</version> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> <version>${scala-maven-plugin-version}</version> @@ -3191,6 +3202,7 @@ <goals> <goal>cleanVersions</goal> <goal>package</goal> + <goal>manifest</goal> </goals> </pluginExecutionFilter> <action> @@ -3227,7 +3239,7 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>${maven-bundle-plugin-version}</version> - <extensions>true</extensions> + <extensions>false</extensions> <configuration> <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies> <instructions> @@ -3262,6 +3274,13 @@ </versions> </configuration> </execution> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> </executions> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/catalog-lucene/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/catalog-lucene/pom.xml b/platforms/catalog-lucene/pom.xml index e9edcf3..f4abee5 100644 --- a/platforms/catalog-lucene/pom.xml +++ b/platforms/catalog-lucene/pom.xml @@ -25,7 +25,7 @@ </parent> <artifactId>camel-catalog-lucene</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Platforms :: Catalog :: Lucene</name> <description>Camel Catalog Lucene</description> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/catalog/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml index 02beb31a..a2e869c 100644 --- a/platforms/catalog/pom.xml +++ b/platforms/catalog/pom.xml @@ -25,7 +25,7 @@ </parent> <artifactId>camel-catalog</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Platforms :: Catalog</name> <description>Camel Catalog</description> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/commands/commands-core/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml index ad00498..fb8f942 100644 --- a/platforms/commands/commands-core/pom.xml +++ b/platforms/commands/commands-core/pom.xml @@ -26,7 +26,7 @@ </parent> <artifactId>camel-commands-core</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Platforms :: Commands :: Core</name> <description>Core Camel Commands</description> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/commands/commands-jolokia/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/pom.xml b/platforms/commands/commands-jolokia/pom.xml index e68db67..debc15b 100644 --- a/platforms/commands/commands-jolokia/pom.xml +++ b/platforms/commands/commands-jolokia/pom.xml @@ -26,7 +26,7 @@ </parent> <artifactId>camel-commands-jolokia</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Platforms :: Commands :: Jolokia</name> <description>Camel Commands using Jolokia</description> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/karaf/commands-catalog/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands-catalog/pom.xml b/platforms/karaf/commands-catalog/pom.xml index cbbf589..e2aa32f 100644 --- a/platforms/karaf/commands-catalog/pom.xml +++ b/platforms/karaf/commands-catalog/pom.xml @@ -27,7 +27,7 @@ <groupId>org.apache.camel.karaf</groupId> <artifactId>camel-karaf-commands-catalog</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog</name> <properties> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/karaf/commands/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml index 36377f5..871bcd9 100644 --- a/platforms/karaf/commands/pom.xml +++ b/platforms/karaf/commands/pom.xml @@ -27,7 +27,7 @@ <groupId>org.apache.camel.karaf</groupId> <artifactId>camel-karaf-commands</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Platforms :: Apache Karaf :: Commands</name> <properties> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/platforms/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/pom.xml b/platforms/pom.xml index 418eb44..5f69c84 100644 --- a/platforms/pom.xml +++ b/platforms/pom.xml @@ -37,4 +37,15 @@ <module>commands</module> <module>karaf</module> </modules> + + <build> + <plugins> + <!-- Invoke the maven-jar-plugin from the parent POM. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/pom.xml b/tests/pom.xml index f31b8b4..cef782f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -42,6 +42,16 @@ <module>camel-typeconverterscan-test</module> </modules> + <build> + <plugins> + <!-- Invoke the maven-jar-plugin from the parent POM. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + </plugins> + </build> + <profiles> <!-- includes these modules when doing the release --> <profile> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tests/test-bundles/mock-javamail_1.7/pom.xml ---------------------------------------------------------------------- diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml index 641dd6e..b75699e 100644 --- a/tests/test-bundles/mock-javamail_1.7/pom.xml +++ b/tests/test-bundles/mock-javamail_1.7/pom.xml @@ -27,7 +27,7 @@ <groupId>org.apache.camel.tests</groupId> <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel :: Integration Tests :: Test Bundles: ${pkgArtifactId}-${pkgVersion}</name> <description> This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar. http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/apt/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml index fe06b97..68a9996 100644 --- a/tooling/apt/pom.xml +++ b/tooling/apt/pom.xml @@ -60,9 +60,14 @@ </dependency> </dependencies> - <build> <plugins> + <!-- Invoke the maven-jar-plugin from the parent POM. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml index a552eeb..b1d0c88 100644 --- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml +++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml @@ -26,7 +26,7 @@ </parent> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Camel ${name} Component</name> <description>Camel Component for ${name}</description> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml index 55ab8cf..15f71a3 100644 --- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>Camel Blueprint Route</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml index cb57110..520302c 100644 --- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>Camel ${name} Component</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml index f85a8dc..c7f5d52 100644 --- a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>A Camel CXF Blueprint Route</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml index 924e214..63be453 100644 --- a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>A Camel CXF Blueprint Route</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml index 2fea3f5..f956cca 100644 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>Camel ${name} Data format</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml index a2e5310..bea2cf2 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml @@ -22,7 +22,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>Camel SCR route</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml index 56cdf48..8063266 100644 --- a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <version>${version}</version> <name>A Camel Spring-DM Route</name> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/camel-manual/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/camel-manual/pom.xml b/tooling/camel-manual/pom.xml index 47e5650..f567db1 100644 --- a/tooling/camel-manual/pom.xml +++ b/tooling/camel-manual/pom.xml @@ -84,6 +84,12 @@ </plugins> </pluginManagement> <plugins> + <!-- Invoke the maven-jar-plugin from the parent POM. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/maven/camel-package-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 4393469..06f3ea4 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -98,4 +98,23 @@ </dependency> </dependencies> + <!-- Disable the maven-jar-plugin defined in the parent pom.xml. --> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <phase>never</phase> + <configuration> + <finalName>___</finalName> + <classifier>___</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/maven/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index f78982e..28b7d58 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -37,4 +37,30 @@ <module>camel-api-component-maven-plugin</module> </modules> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>bundle-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <configuration> + <archive combine.self="override"> + <manifestFile/> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/camel/blob/5aff9223/tooling/spi-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml index 6baeb6c..cfaf05a 100644 --- a/tooling/spi-annotations/pom.xml +++ b/tooling/spi-annotations/pom.xml @@ -37,4 +37,14 @@ <dependencies> </dependencies> + <build> + <plugins> + <!-- Invoke the maven-jar-plugin from the parent POM. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + </plugins> + </build> + </project>
