More osgi trouble, what a XXXXXXXX the bundle-plugin is.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea4c8ce4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea4c8ce4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea4c8ce4 Branch: refs/heads/osgi-trouble Commit: ea4c8ce4e6229275fca0227c03a33508427b78ef Parents: 9cfb028 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 23 16:52:13 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 23 16:52:13 2016 +0100 ---------------------------------------------------------------------- camel-core/pom.xml | 82 ++++++++++++++++++++++++++++++++++++++++++++++--- parent/pom.xml | 6 ++-- 2 files changed, 80 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ea4c8ce4/camel-core/pom.xml ---------------------------------------------------------------------- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 096f725..a307411 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -29,17 +29,89 @@ <artifactId>camel-core</artifactId> <packaging>bundle</packaging> <name>Camel :: Core</name> - <description>The Core Camel Java DSL based router</description> + <description>Apache Camel core module</description> <properties> <camel.osgi.export.pkg> - !org.apache.camel.tools.*, - org.apache.camel.*;-noimport:=true + org.apache.camel.api.management, + org.apache.camel.api.management.mbean, + org.apache.camel.builder, + org.apache.camel.builder.xml, + org.apache.camel.component, + org.apache.camel.component.bean, + org.apache.camel.component.beanclass, + org.apache.camel.component.binding, + org.apache.camel.component.browse, + org.apache.camel.component.controlbus, + org.apache.camel.component.dataformat, + org.apache.camel.component.dataset, + org.apache.camel.component.direct, + org.apache.camel.component.directvm, + org.apache.camel.component.file, + org.apache.camel.component.file.strategy, + org.apache.camel.component.language, + org.apache.camel.component.log, + org.apache.camel.component.mock, + org.apache.camel.component.properties, + org.apache.camel.component.ref, + org.apache.camel.component.rest, + org.apache.camel.component.scheduler, + org.apache.camel.component.seda, + org.apache.camel.component.stub, + org.apache.camel.component.test, + org.apache.camel.component.timer, + org.apache.camel.component.validator, + org.apache.camel.component.vm, + org.apache.camel.component.xslt, + org.apache.camel.converter, + org.apache.camel.converter.jaxp, + org.apache.camel.converter.stream, + org.apache.camel.impl, + org.apache.camel.impl.converter, + org.apache.camel.impl.osgi, + org.apache.camel.impl.osgi.tracker, + org.apache.camel.impl.scan, + org.apache.camel.language, + org.apache.camel.language.bean, + org.apache.camel.language.constant, + org.apache.camel.language.header, + org.apache.camel.language.property, + org.apache.camel.language.ref, + org.apache.camel.language.simple, + org.apache.camel.language.tokenizer, + org.apache.camel.language.xpath, + org.apache.camel.main, + org.apache.camel.management, + org.apache.camel.management.event, + org.apache.camel.management.mbean, + org.apache.camel.model, + org.apache.camel.model.config, + org.apache.camel.model.dataformat, + org.apache.camel.model.language, + org.apache.camel.model.loadbalancer, + org.apache.camel.model.rest, + org.apache.camel.processor, + org.apache.camel.processor.aggregate, + org.apache.camel.processor.binding, + org.apache.camel.processor.exceptionpolicy, + org.apache.camel.processor.idempotent, + org.apache.camel.processor.interceptor, + org.apache.camel.processor.loadbalancer, + org.apache.camel.processor.resequencer, + org.apache.camel.processor.validation, + org.apache.camel.spi, + org.apache.camel.support, + org.apache.camel.util, + org.apache.camel.util.component, + org.apache.camel.util.concurrent, + org.apache.camel.util.jndi, + org.apache.camel.util.jsse, + org.apache.camel.util.toolbox </camel.osgi.export.pkg> <camel.osgi.import> org.apache.camel.tools.*;resolution:=optional, !org.apache.camel.*, - !com.googlecode.concurrentlinkedhashmap, + !com.github.benmanes.caffeine.cache, ${camel.osgi.import.defaults}, org.springframework.transaction;resolution:=optional, org.apache.camel.spring.spi;resolution:=optional, @@ -214,7 +286,7 @@ </pluginManagement> <plugins> - <!-- shade concurrent hashmap for faster Camel and spi-annotations as needed by everybody --> + <!-- shade caffeine cache for faster Camel and spi-annotations as needed by everybody --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/ea4c8ce4/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c6785ab..248d01e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -377,8 +377,8 @@ <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> + <!-- maven-bundle-plugin 3.0.1 has problem building camel-core --> + <maven-bundle-plugin-version>3.0.1</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 @@ -3176,7 +3176,7 @@ <versionRange>${maven-bundle-plugin-version}</versionRange> <goals> <goal>cleanVersions</goal> - <goal>package</goal> + <goal>verify</goal> </goals> </pluginExecutionFilter> <action>
