From accf0715b33e6fbff0c5ec87b51a36cd3a26120a Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Wed, 7 Dec 2016 19:19:23 +1100 Subject: [PATCH] fix some osgi build Signed-off-by: olivier lamy --- apache-jsp/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 1 + jetty-io/pom.xml | 1 + jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 1 + jetty-jndi/pom.xml | 1 + jetty-monitor/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 1 - jetty-plus/pom.xml | 1 + jetty-proxy/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-rhttp/jetty-rhttp-client/pom.xml | 2 +- jetty-rhttp/jetty-rhttp-connector/pom.xml | 2 +- jetty-rhttp/jetty-rhttp-gateway/pom.xml | 2 +- jetty-security/pom.xml | 1 + jetty-server/pom.xml | 1 + jetty-servlet/pom.xml | 1 + jetty-servlets/pom.xml | 2 +- jetty-spdy/pom.xml | 1 + jetty-spdy/spdy-client/pom.xml | 2 +- jetty-spdy/spdy-http-common/pom.xml | 2 +- jetty-spdy/spdy-http-server/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 1 + jetty-webapp/pom.xml | 1 + jetty-websocket/pom.xml | 2 +- jetty-xml/pom.xml | 1 + pom.xml | 3 +-- tests/test-webapps/test-mock-resources/pom.xml | 2 +- tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml | 1 - 39 files changed, 37 insertions(+), 28 deletions(-) diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index d32b7d72c2d..a1fbd36f4bc 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -17,10 +17,10 @@ org.apache.felix maven-bundle-plugin - true generate-manifest + process-classes manifest diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index d489c7f2f74..6ac9cb4c025 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index c397f582d55..765012d0e82 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index e77c5eeb630..d3a2eec40a3 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -34,10 +34,10 @@ org.apache.felix maven-bundle-plugin - true generate-manifest + process-classes manifest diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index b8991e2d5ef..291e6acd4d2 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -35,9 +35,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 1482a8b44c2..6b4d9cce92a 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 031bbe364ea..6ac08b70ee7 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 7d8dc6707e6..316c3e222ed 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -35,9 +35,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index e81fd43a1fe..ee0081dec67 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -32,6 +32,7 @@ true + process-classes manifest diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 617aa68d9e5..a12206c7096 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -36,6 +36,7 @@ true + process-classes manifest diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 79d45382a18..06b158df7a3 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -16,9 +16,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index e428fd472e8..df2ee61dc06 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -34,9 +34,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 3cf3e96d876..52a201c11a9 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -20,6 +20,7 @@ true + process-classes manifest diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index a071d9c5d4e..3436201a741 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -37,6 +37,7 @@ true + process-classes manifest diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index a50a73b2dc2..5259b1646e6 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -34,9 +34,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index df17be718bc..caa91e85fc9 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -39,9 +39,9 @@ javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.server.session.jmx;version="9.1";resolution:=optional,,org.eclipse.jetty.*;version="9.1",* - true + process-classes manifest diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index fdc45b7046c..1f9090deb92 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -88,7 +88,6 @@ org.apache.felix maven-bundle-plugin - true bundle-manifest diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 65701352e92..a1be3dacf91 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -20,6 +20,7 @@ true + process-classes manifest diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index e2d362a8e15..aef67972565 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 015bbfd25c4..17d3d4dabe1 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-rhttp/jetty-rhttp-client/pom.xml b/jetty-rhttp/jetty-rhttp-client/pom.xml index 14dc5b31f0a..c12a4f81499 100644 --- a/jetty-rhttp/jetty-rhttp-client/pom.xml +++ b/jetty-rhttp/jetty-rhttp-client/pom.xml @@ -20,9 +20,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-rhttp/jetty-rhttp-connector/pom.xml b/jetty-rhttp/jetty-rhttp-connector/pom.xml index b248c482105..969bfba97e1 100644 --- a/jetty-rhttp/jetty-rhttp-connector/pom.xml +++ b/jetty-rhttp/jetty-rhttp-connector/pom.xml @@ -28,9 +28,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-rhttp/jetty-rhttp-gateway/pom.xml b/jetty-rhttp/jetty-rhttp-gateway/pom.xml index 054bbd55bf3..f912f1bb0ba 100644 --- a/jetty-rhttp/jetty-rhttp-gateway/pom.xml +++ b/jetty-rhttp/jetty-rhttp-gateway/pom.xml @@ -29,9 +29,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index f2bbb9bed12..39ef55c08b3 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -20,6 +20,7 @@ true + process-classes manifest diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 64fc45bb7ec..f011ac4c31c 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -21,6 +21,7 @@ generate-manifest + process-classes manifest diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index a11c377f1c4..62f488f7062 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -21,6 +21,7 @@ true + process-classes manifest diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 266e73f6b5b..4ffb7ad9f46 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -18,9 +18,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 7de04132fe2..86f618589d0 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -52,6 +52,7 @@ true + process-classes manifest diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml index 04a2ba346d1..d961cec0489 100644 --- a/jetty-spdy/spdy-client/pom.xml +++ b/jetty-spdy/spdy-client/pom.xml @@ -20,9 +20,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-spdy/spdy-http-common/pom.xml b/jetty-spdy/spdy-http-common/pom.xml index 95826e627aa..f04526b1d7c 100644 --- a/jetty-spdy/spdy-http-common/pom.xml +++ b/jetty-spdy/spdy-http-common/pom.xml @@ -19,9 +19,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index fcc139fb97a..4d3024e3227 100644 --- a/jetty-spdy/spdy-http-server/pom.xml +++ b/jetty-spdy/spdy-http-server/pom.xml @@ -48,9 +48,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 5630d2420f6..0b7639e8c98 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -17,9 +17,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 02fae2ad60b..f8429fe9b7e 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -20,6 +20,7 @@ true + process-classes manifest diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 9d6fe800055..ca77ad934e1 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -50,6 +50,7 @@ true + process-classes manifest diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index dfaf7d2b145..7080c40e20b 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -35,9 +35,9 @@ org.apache.felix maven-bundle-plugin - true + process-classes manifest diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 6080ed95de0..05a7fa30cc4 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -20,6 +20,7 @@ true + process-classes manifest diff --git a/pom.xml b/pom.xml index aef445e4377..9c5c384ed75 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ attach-sources process-classes - jar + jar-no-fork @@ -343,7 +343,6 @@ org.apache.felix maven-bundle-plugin 2.5.4 - true ${bundle-symbolic-name} diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index 1689bbfd654..159bcc780a7 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -19,10 +19,10 @@ org.apache.felix maven-bundle-plugin - true generate-manifest + process-classes manifest diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml index 674dce3380c..a3518544b13 100644 --- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml @@ -37,7 +37,6 @@ org.apache.felix maven-bundle-plugin - true bundle-manifest