This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2137385820c70129c2d611edb97605af562f69fd Author: Benoit Tellier <[email protected]> AuthorDate: Wed Aug 14 13:09:11 2019 +0700 JAMES-2857 Remove bundle and felix plugin from build Bundle and felix maven bundle product are being use to expose OSGI modules, that we are no longer supporting (disabled build). Note that some module have bundle definition, and some other don't, which is a major inconsistency in our maven build structure I am willing to rationnalize. Moreover this has a performance impact upon build (~1 minute on 8 cores) --- mailbox/api/pom.xml | 2 +- mailbox/caching/pom.xml | 2 +- mailbox/jpa/pom.xml | 2 +- mailbox/lucene/pom.xml | 2 +- mailbox/maildir/pom.xml | 2 +- mailbox/memory/pom.xml | 2 +- mailbox/pom.xml | 5 ----- mailbox/spring/pom.xml | 2 +- mailbox/store/pom.xml | 2 +- mailbox/zoo-seq-provider/pom.xml | 2 +- mailet/ai/pom.xml | 2 +- mailet/api/pom.xml | 2 +- mailet/base/pom.xml | 12 +---------- mailet/crypto/pom.xml | 11 +--------- mailet/pom.xml | 5 ----- mailet/standard/pom.xml | 2 +- mailet/test/pom.xml | 12 +---------- mpt/antlib/pom.xml | 1 + mpt/core/pom.xml | 1 + mpt/mavenplugin/pom.xml | 23 -------------------- mpt/pom.xml | 1 + pom.xml | 25 ---------------------- protocols/api/pom.xml | 2 +- protocols/imap/pom.xml | 2 +- protocols/lmtp/pom.xml | 2 +- protocols/managesieve/pom.xml | 2 +- protocols/netty/pom.xml | 2 +- protocols/pom.xml | 10 --------- protocols/pop3/pom.xml | 2 +- protocols/smtp/pom.xml | 2 +- server/app/pom.xml | 7 +----- server/container/cli-integration/pom.xml | 10 --------- server/container/cli/pom.xml | 5 ----- server/container/core/pom.xml | 7 +----- server/container/filesystem-api/pom.xml | 7 +----- server/container/guice/cassandra-guice/pom.xml | 5 ----- .../container/guice/cassandra-ldap-guice/pom.xml | 5 ----- .../guice/cassandra-rabbitmq-guice/pom.xml | 5 ----- .../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 5 ----- server/container/guice/configuration/pom.xml | 11 ---------- server/container/guice/guice-common/pom.xml | 11 ---------- server/container/guice/jmx/pom.xml | 11 ---------- server/container/guice/jpa-common-guice/pom.xml | 11 ---------- server/container/guice/jpa-guice/pom.xml | 5 ----- server/container/guice/jpa-smtp-mariadb/pom.xml | 5 ----- server/container/guice/jpa-smtp/pom.xml | 5 ----- server/container/guice/mailbox/pom.xml | 11 ---------- server/container/guice/mailet/pom.xml | 11 ---------- server/container/guice/memory-guice/pom.xml | 6 ------ server/container/guice/onami/pom.xml | 11 ---------- server/container/guice/protocols/imap/pom.xml | 11 ---------- server/container/guice/protocols/jmap/pom.xml | 11 ---------- server/container/guice/protocols/lmtp/pom.xml | 11 ---------- .../container/guice/protocols/managedsieve/pom.xml | 11 ---------- server/container/guice/protocols/netty/pom.xml | 11 ---------- server/container/guice/protocols/pop/pom.xml | 11 ---------- server/container/guice/protocols/smtp/pom.xml | 11 ---------- .../guice/protocols/webadmin-cassandra/pom.xml | 11 ---------- .../guice/protocols/webadmin-data/pom.xml | 11 ---------- .../guice/protocols/webadmin-mailbox/pom.xml | 11 ---------- .../guice/protocols/webadmin-mailqueue/pom.xml | 11 ---------- .../protocols/webadmin-mailrepository/pom.xml | 11 ---------- .../guice/protocols/webadmin-swagger/pom.xml | 11 ---------- server/container/guice/protocols/webadmin/pom.xml | 11 ---------- server/container/lifecycle-api/pom.xml | 13 +---------- server/container/mailbox-adapter/pom.xml | 12 +---------- server/container/mailbox-jmx/pom.xml | 13 +---------- .../container/metrics/metrics-es-reporter/pom.xml | 9 -------- server/container/spring/pom.xml | 6 +----- server/container/util/pom.xml | 11 +--------- server/data/data-api/pom.xml | 7 +----- server/data/data-cassandra/pom.xml | 4 ---- server/data/data-file/pom.xml | 7 +----- server/data/data-jdbc/pom.xml | 13 +---------- server/data/data-jmap-cassandra/pom.xml | 4 ---- server/data/data-jpa/pom.xml | 7 +----- server/data/data-ldap/pom.xml | 13 +---------- server/data/data-library/pom.xml | 7 +----- server/data/data-memory/pom.xml | 7 +----- server/dns-service/dnsservice-api/pom.xml | 7 +----- server/dns-service/dnsservice-dnsjava/pom.xml | 12 +---------- server/dns-service/dnsservice-library/pom.xml | 12 +---------- server/dns-service/dnsservice-test/pom.xml | 7 +----- server/karaf/integration/pom.xml | 2 ++ server/mailet/integration-testing/pom.xml | 2 +- server/mailet/mailetcontainer-api/pom.xml | 7 +----- server/mailet/mailetcontainer-camel/pom.xml | 11 +--------- server/mailet/mailets/pom.xml | 6 +----- server/mailrepository/mailrepository-api/pom.xml | 7 +----- .../mailrepository-cassandra/pom.xml | 5 ----- .../mailrepository/mailrepository-memory/pom.xml | 5 ----- server/pom.xml | 19 ---------------- server/protocols/fetchmail/pom.xml | 12 +---------- server/protocols/protocols-imap4/pom.xml | 11 +--------- server/protocols/protocols-library/pom.xml | 6 +----- server/protocols/protocols-lmtp/pom.xml | 11 +--------- server/protocols/protocols-pop3/pom.xml | 11 +--------- server/protocols/protocols-smtp/pom.xml | 11 +--------- server/queue/queue-activemq/pom.xml | 12 +---------- server/queue/queue-api/pom.xml | 6 +----- server/queue/queue-file/pom.xml | 6 +----- server/queue/queue-jms/pom.xml | 11 +--------- server/queue/queue-rabbitmq/pom.xml | 2 +- 103 files changed, 62 insertions(+), 724 deletions(-) diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml index a06a665..f8bb5c1 100644 --- a/mailbox/api/pom.xml +++ b/mailbox/api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: API</name> <dependencies> diff --git a/mailbox/caching/pom.xml b/mailbox/caching/pom.xml index 622b9da..589e2e6 100644 --- a/mailbox/caching/pom.xml +++ b/mailbox/caching/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-caching</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: Caching</name> <description>JAMES-2703 This maven module is deprecated and will be removed straight after upcoming James 3.4.0 release, unless it finds a maintainer. diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml index 9f4f1a5..71786ab 100644 --- a/mailbox/jpa/pom.xml +++ b/mailbox/jpa/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-jpa</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: JPA</name> <dependencies> diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml index 01eb334..357e6e2 100644 --- a/mailbox/lucene/pom.xml +++ b/mailbox/lucene/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-lucene</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: Lucene Index</name> <dependencies> diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml index 6e19ad4..a5c206b 100644 --- a/mailbox/maildir/pom.xml +++ b/mailbox/maildir/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-maildir</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: Maildir</name> <dependencies> diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml index 2fd892b..1351c3c 100644 --- a/mailbox/memory/pom.xml +++ b/mailbox/memory/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-memory</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: In Memory</name> <dependencies> diff --git a/mailbox/pom.xml b/mailbox/pom.xml index e107038..74912dd 100644 --- a/mailbox/pom.xml +++ b/mailbox/pom.xml @@ -110,11 +110,6 @@ </descriptorRefs> </configuration> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml index 391ee10..eb77af4 100644 --- a/mailbox/spring/pom.xml +++ b/mailbox/spring/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-spring</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: Spring</name> <dependencies> diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml index 8938577..685a79d 100644 --- a/mailbox/store/pom.xml +++ b/mailbox/store/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-james-mailbox-store</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: Store Framework</name> <dependencies> diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml index b7a4848..b9ec996 100644 --- a/mailbox/zoo-seq-provider/pom.xml +++ b/mailbox/zoo-seq-provider/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>zookeeper-sequence-provider</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailbox :: Zookeeper Sequence Provider</name> <description>High performance distribuited sequence provider based on ZooKeepr</description> diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml index 4b3b95d..12f99a4 100644 --- a/mailet/ai/pom.xml +++ b/mailet/ai/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-mailet-ai</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: AI Mailets</name> <description>Collects mail processors making use of artificial intelligence (AI) methods.</description> diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml index 6f0fbe3..8b34286 100644 --- a/mailet/api/pom.xml +++ b/mailet/api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-mailet-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Mailet API</name> <description>The Apache Mailet API is a flexible specification for mail processing agents.</description> diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml index 1501426..70a6e5e 100644 --- a/mailet/base/pom.xml +++ b/mailet/base/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-mailet-base</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Basic Mailet Toolkit</name> <description>Apache James Basic Mailet Toolkit is a collection of utilities and lightweight framework @@ -123,16 +123,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package>org.apache.mailet.base.*</Export-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>${james.groupId}</groupId> <artifactId>maven-mailetdocs-plugin</artifactId> </plugin> diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml index 8c0a75d..f473040 100644 --- a/mailet/crypto/pom.xml +++ b/mailet/crypto/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-mailet-crypto</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Crypto Mailets</name> <description>Apache James Cryptographic Mailets is a collection of mailets which use cryptography. @@ -67,15 +67,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.apache.james.mailet.crypto.*</Export-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>${james.groupId}</groupId> <artifactId>maven-mailetdocs-plugin</artifactId> </plugin> diff --git a/mailet/pom.xml b/mailet/pom.xml index bf0b8af..e34f290 100644 --- a/mailet/pom.xml +++ b/mailet/pom.xml @@ -76,11 +76,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <inherited>true</inherited> diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml index c541163..715a45d 100644 --- a/mailet/standard/pom.xml +++ b/mailet/standard/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-mailet-standard</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Standard Mailets</name> <description>Apache James Standard Mailets is a rich collection of general purpose mailets diff --git a/mailet/test/pom.xml b/mailet/test/pom.xml index 2331907..de263a3 100644 --- a/mailet/test/pom.xml +++ b/mailet/test/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>apache-mailet-test</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Test helpers for Mailet</name> <description>Apache James Mailet Test is a collection of utilities to help testing mailets.</description> @@ -125,16 +125,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package>org.apache.mailet.base.*</Export-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>${james.groupId}</groupId> <artifactId>maven-mailetdocs-plugin</artifactId> </plugin> diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml index 819918d..0a4ab9a 100644 --- a/mpt/antlib/pom.xml +++ b/mpt/antlib/pom.xml @@ -131,6 +131,7 @@ to the library requiring no extra coding.</description> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <version>${felix.plugin.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml index 31e2c0f..9488edd 100644 --- a/mpt/core/pom.xml +++ b/mpt/core/pom.xml @@ -109,6 +109,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <version>${felix.plugin.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml index 8ec67c4..8d74542 100644 --- a/mpt/mavenplugin/pom.xml +++ b/mpt/mavenplugin/pom.xml @@ -87,29 +87,6 @@ to the library requiring no extra coding.</description> --> </configuration> </plugin> - <!-- - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>1.4.3</version> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package>org.apache.james.mpt.maven</Export-Package> - <Embed-Dependency>*;scope=runtime</Embed-Dependency> - </instructions> - </configuration> - </plugin> - --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> diff --git a/mpt/pom.xml b/mpt/pom.xml index 49f5d13..f9d4511 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -52,6 +52,7 @@ </issueManagement> <properties> + <felix.plugin.version>3.3.0</felix.plugin.version> <commons-lang.version>2.6</commons-lang.version> <derby.version>10.14.2.0</derby.version> <guice.version>4.0</guice.version> diff --git a/pom.xml b/pom.xml index babfb69..762f9fd 100644 --- a/pom.xml +++ b/pom.xml @@ -614,7 +614,6 @@ <org.osgi.core.version>5.0.0</org.osgi.core.version> <cucumber.version>2.4.0</cucumber.version> - <felix.version>4.0.3</felix.version> <pax-logging-api.version>1.6.4</pax-logging-api.version> <jackson.version>2.9.9</jackson.version> <feign.version>10.3.0</feign.version> @@ -2256,11 +2255,6 @@ <version>1.0.3</version> </dependency> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${felix.version}</version> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> <version>${apache.httpcomponents.version}</version> @@ -2681,12 +2675,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>3.3.0</version> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.8</version> @@ -3095,19 +3083,6 @@ <ignore /> </action> </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <versionRange>[2.3.4,)</versionRange> - <goals> - <goal>manifest</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml index 7f70336..36c031f 100644 --- a/protocols/api/pom.xml +++ b/protocols/api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: API</name> diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml index 8ba931e..89cb165 100644 --- a/protocols/imap/pom.xml +++ b/protocols/imap/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-imap</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: IMAP</name> diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml index 492a25f..b418dcf 100644 --- a/protocols/lmtp/pom.xml +++ b/protocols/lmtp/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-lmtp</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: LMTP</name> diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml index af8adf7..738b17d 100644 --- a/protocols/managesieve/pom.xml +++ b/protocols/managesieve/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-managesieve</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: ManageSieve</name> diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml index ac7f4b3..47de473 100644 --- a/protocols/netty/pom.xml +++ b/protocols/netty/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-netty</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: Netty Implementation</name> diff --git a/protocols/pom.xml b/protocols/pom.xml index 13591ad..a45b098 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -45,14 +45,4 @@ <module>smtp</module> </modules> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml index 90bfb3c..5b3fc8e 100644 --- a/protocols/pop3/pom.xml +++ b/protocols/pop3/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-pop3</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: POP3</name> diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml index a997e2b..ca72715 100644 --- a/protocols/smtp/pom.xml +++ b/protocols/smtp/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>protocols-smtp</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Protocols :: SMTP</name> diff --git a/server/app/pom.xml b/server/app/pom.xml index 72c537e..b783991 100644 --- a/server/app/pom.xml +++ b/server/app/pom.xml @@ -29,7 +29,7 @@ </parent> <artifactId>james-server-app</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: App</name> <description>An advanced email server / Spring version</description> @@ -495,11 +495,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>2.0.0</version> diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml index 7f64b2f..9b59d42 100644 --- a/server/container/cli-integration/pom.xml +++ b/server/container/cli-integration/pom.xml @@ -90,14 +90,4 @@ <artifactId>mockito-core</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml index 4a8636e..10c9bfc 100644 --- a/server/container/cli/pom.xml +++ b/server/container/cli/pom.xml @@ -92,11 +92,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index 90734f8..0524c52 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-core</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Core</name> @@ -133,11 +133,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index 831c87c..ac80dc0 100644 --- a/server/container/filesystem-api/pom.xml +++ b/server/container/filesystem-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-filesystem-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Filesystem API</name> @@ -76,11 +76,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index b2b03ef..90c823b 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -345,11 +345,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index baca2cc..55a29ee 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -184,11 +184,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml index b089391..043cb73 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml @@ -190,11 +190,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index e038f94..22f01e2 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -125,11 +125,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml index ac09511..5faf426 100644 --- a/server/container/guice/configuration/pom.xml +++ b/server/container/guice/configuration/pom.xml @@ -59,15 +59,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 685085b..010480d 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -199,15 +199,4 @@ <artifactId>slf4j-api</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml index 2d3df1b..dddbffe 100644 --- a/server/container/guice/jmx/pom.xml +++ b/server/container/guice/jmx/pom.xml @@ -109,15 +109,4 @@ <artifactId>slf4j-api</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml index 5372b1e..ff210e0 100644 --- a/server/container/guice/jpa-common-guice/pom.xml +++ b/server/container/guice/jpa-common-guice/pom.xml @@ -62,15 +62,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index 37dcf60..5e6ea7b 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -232,11 +232,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/container/guice/jpa-smtp-mariadb/pom.xml index ffb9af6..5064220 100644 --- a/server/container/guice/jpa-smtp-mariadb/pom.xml +++ b/server/container/guice/jpa-smtp-mariadb/pom.xml @@ -124,11 +124,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 1d1133b..114a94c 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -157,11 +157,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml index 4897f64..22d7be9 100644 --- a/server/container/guice/mailbox/pom.xml +++ b/server/container/guice/mailbox/pom.xml @@ -81,15 +81,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml index 4cd2a76..f14b200 100644 --- a/server/container/guice/mailet/pom.xml +++ b/server/container/guice/mailet/pom.xml @@ -99,15 +99,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 057a9b6..d31bc45 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -224,12 +224,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml index 3a5e0a7..d6d4639 100644 --- a/server/container/guice/onami/pom.xml +++ b/server/container/guice/onami/pom.xml @@ -53,15 +53,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml index 090928d..c791f52 100644 --- a/server/container/guice/protocols/imap/pom.xml +++ b/server/container/guice/protocols/imap/pom.xml @@ -53,15 +53,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml index eff914c..8de06ab 100644 --- a/server/container/guice/protocols/jmap/pom.xml +++ b/server/container/guice/protocols/jmap/pom.xml @@ -100,15 +100,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml index 1ff07e9..664f8b9 100644 --- a/server/container/guice/protocols/lmtp/pom.xml +++ b/server/container/guice/protocols/lmtp/pom.xml @@ -49,15 +49,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml index 2360794..db7b2d8 100644 --- a/server/container/guice/protocols/managedsieve/pom.xml +++ b/server/container/guice/protocols/managedsieve/pom.xml @@ -57,15 +57,4 @@ <artifactId>protocols-managesieve</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml index 4c652b3..e422dc6 100644 --- a/server/container/guice/protocols/netty/pom.xml +++ b/server/container/guice/protocols/netty/pom.xml @@ -49,15 +49,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml index 1530db4..4448604 100644 --- a/server/container/guice/protocols/pop/pom.xml +++ b/server/container/guice/protocols/pop/pom.xml @@ -49,15 +49,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml index 105cc20..f165044 100644 --- a/server/container/guice/protocols/smtp/pom.xml +++ b/server/container/guice/protocols/smtp/pom.xml @@ -49,15 +49,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml index f35bfbb..2ec9dd4 100644 --- a/server/container/guice/protocols/webadmin-cassandra/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml @@ -53,15 +53,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml index f37f23b..f58cb69 100644 --- a/server/container/guice/protocols/webadmin-data/pom.xml +++ b/server/container/guice/protocols/webadmin-data/pom.xml @@ -53,15 +53,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml index dce475b..b723daa 100644 --- a/server/container/guice/protocols/webadmin-mailbox/pom.xml +++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml @@ -53,15 +53,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml index cfde159..9c631c2 100644 --- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml +++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml @@ -55,15 +55,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/webadmin-mailrepository/pom.xml b/server/container/guice/protocols/webadmin-mailrepository/pom.xml index 59b1f45..99e26ad 100644 --- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml +++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml @@ -55,15 +55,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml index 8713b6f..5862782 100644 --- a/server/container/guice/protocols/webadmin-swagger/pom.xml +++ b/server/container/guice/protocols/webadmin-swagger/pom.xml @@ -53,15 +53,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml index 75c184d..411eb10 100644 --- a/server/container/guice/protocols/webadmin/pom.xml +++ b/server/container/guice/protocols/webadmin/pom.xml @@ -49,15 +49,4 @@ <artifactId>guice-multibindings</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml index 831bdc5..48fbbff 100644 --- a/server/container/lifecycle-api/pom.xml +++ b/server/container/lifecycle-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-lifecycle-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Lifecycle API</name> @@ -68,15 +68,4 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml index c879f30..a9ca4e9 100644 --- a/server/container/mailbox-adapter/pom.xml +++ b/server/container/mailbox-adapter/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailbox-adapter</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mailbox Adapter</name> @@ -88,14 +88,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/mailbox-jmx/pom.xml b/server/container/mailbox-jmx/pom.xml index 83b0291..69f36c7 100644 --- a/server/container/mailbox-jmx/pom.xml +++ b/server/container/mailbox-jmx/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailbox-jmx</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mailbox :: JMX</name> @@ -89,15 +89,4 @@ <artifactId>slf4j-api</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml index 05cd9d7..056a67f 100644 --- a/server/container/metrics/metrics-es-reporter/pom.xml +++ b/server/container/metrics/metrics-es-reporter/pom.xml @@ -110,13 +110,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index ad42534..86fe8ef 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-spring</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Container Spring</name> @@ -203,10 +203,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index e14c5f1..1c8e1b0 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-util</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Common Utilities</name> @@ -125,13 +125,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml index 7cc10b0..0fbacf0 100644 --- a/server/data/data-api/pom.xml +++ b/server/data/data-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: API</name> @@ -93,11 +93,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> </project> diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index f8cd585..1077ae6 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -164,10 +164,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml index 93161b7..9df1ea5 100644 --- a/server/data/data-file/pom.xml +++ b/server/data/data-file/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-file</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: File Persistence</name> @@ -162,11 +162,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml index 71aee61..1efa231 100644 --- a/server/data/data-jdbc/pom.xml +++ b/server/data/data-jdbc/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-jdbc</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: JDBC Persistence</name> @@ -167,15 +167,4 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index 8f89606..4f6e371 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -121,10 +121,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index fa90b54..a545092 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-jpa</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: JPA Persistence</name> @@ -191,11 +191,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml index f515cc4..2dea0f4 100644 --- a/server/data/data-ldap/pom.xml +++ b/server/data/data-ldap/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-ldap</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: LDAP Implementation</name> @@ -107,15 +107,4 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index 90df7d4..de0ba47 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-library</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: Library</name> @@ -164,11 +164,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index da9fbd3..3869cc7 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-data-memory</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Data :: MEMORY</name> @@ -128,11 +128,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> </project> diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml index ee56a4d..f5fd3d7 100644 --- a/server/dns-service/dnsservice-api/pom.xml +++ b/server/dns-service/dnsservice-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-dnsservice-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: DNS Service :: API</name> @@ -63,11 +63,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml index 83aa0e7..9d42319 100644 --- a/server/dns-service/dnsservice-dnsjava/pom.xml +++ b/server/dns-service/dnsservice-dnsjava/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-dnsservice-dnsjava</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: DNS Service :: Implementation</name> @@ -104,14 +104,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml index d3eab2b..5d99a27 100644 --- a/server/dns-service/dnsservice-library/pom.xml +++ b/server/dns-service/dnsservice-library/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-dnsservice-library</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: DNS Service :: Library</name> @@ -70,14 +70,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/dns-service/dnsservice-test/pom.xml b/server/dns-service/dnsservice-test/pom.xml index 76f22a5..ac00863 100644 --- a/server/dns-service/dnsservice-test/pom.xml +++ b/server/dns-service/dnsservice-test/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-dnsservice-test</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: DNS Service :: Test</name> @@ -65,11 +65,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml index b4bf057..a8e0819 100644 --- a/server/karaf/integration/pom.xml +++ b/server/karaf/integration/pom.xml @@ -18,6 +18,7 @@ <karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version> <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version> <url.version>1.4.0</url.version> + <felix.version>4.0.3</felix.version> </properties> <dependencies> @@ -34,6 +35,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> + <version>${felix.version}</version> <scope>test</scope> </dependency> diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index aa73971..13d3c06 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailets-integration-testing</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mailets Integration Testing</name> diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml index 5e1d75a..326e3ac 100644 --- a/server/mailet/mailetcontainer-api/pom.xml +++ b/server/mailet/mailetcontainer-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailetcontainer-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mailetcontainer API</name> @@ -56,11 +56,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index b0ff16a..a057bf4 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailetcontainer-camel</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mailetcontainer Camel</name> @@ -189,13 +189,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index cb82e3b..ae022c0 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailets</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mailets</name> @@ -292,10 +292,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml index ef3c13e..12dab15 100644 --- a/server/mailrepository/mailrepository-api/pom.xml +++ b/server/mailrepository/mailrepository-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-mailrepository-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: MailRepository :: API</name> @@ -88,11 +88,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> </project> diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml b/server/mailrepository/mailrepository-cassandra/pom.xml index 9dc8fd1..a507bc5 100644 --- a/server/mailrepository/mailrepository-cassandra/pom.xml +++ b/server/mailrepository/mailrepository-cassandra/pom.xml @@ -113,11 +113,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml index b061512..71b5a8d 100644 --- a/server/mailrepository/mailrepository-memory/pom.xml +++ b/server/mailrepository/mailrepository-memory/pom.xml @@ -77,11 +77,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> </plugins> </build> </project> diff --git a/server/pom.xml b/server/pom.xml index f7e6aaf..6447abd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -140,25 +140,6 @@ </plugin> </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <!-- During release:perform, enable the "release" profile --> - <releaseProfiles>with-assembly</releaseProfiles> - <goals>deploy assembly:single</goals> - </configuration> - </plugin> - </plugins> </build> </project> diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml index c02d3f2..6391af7 100644 --- a/server/protocols/fetchmail/pom.xml +++ b/server/protocols/fetchmail/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-fetchmail</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: FetchMail</name> @@ -91,14 +91,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml index 4decc91..b3535fd 100644 --- a/server/protocols/protocols-imap4/pom.xml +++ b/server/protocols/protocols-imap4/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-protocols-imap4</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: IMAP</name> @@ -107,13 +107,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml index ac7b806..905252c 100644 --- a/server/protocols/protocols-library/pom.xml +++ b/server/protocols/protocols-library/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-protocols-library</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Protocols Library</name> @@ -107,10 +107,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> </plugins> </build> diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml index ab6288b..248f726 100644 --- a/server/protocols/protocols-lmtp/pom.xml +++ b/server/protocols/protocols-lmtp/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-protocols-lmtp</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: LMTP</name> @@ -129,13 +129,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index 60e244f..ed168ba 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-protocols-pop3</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: POP3</name> @@ -166,13 +166,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 784fd1d..d244dc5 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-protocols-smtp</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: SMTP</name> @@ -240,13 +240,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index dc18ce1..1a40d62 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-queue-activemq</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mail Queue :: ActiveMQ</name> @@ -157,14 +157,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </project> diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index c1fdf43..c579497 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-queue-api</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mail Queue :: API</name> @@ -120,10 +120,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> </plugins> </build> diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index 338ee73..989fc66 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-queue-file</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mail Queue :: File</name> @@ -110,10 +110,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index d006c59..f799cab 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-queue-jms</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mail Queue :: JMS</name> @@ -159,13 +159,4 @@ <artifactId>threeten-extra</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml index 90e297e..d4b6133 100644 --- a/server/queue/queue-rabbitmq/pom.xml +++ b/server/queue/queue-rabbitmq/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>james-server-queue-rabbitmq</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache James :: Server :: Mail Queue :: RabbitMQ</name> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
