diff options
31 files changed, 30 insertions, 509 deletions
diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 1493dea255..bfd0b92f4c 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -35,23 +35,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 051b2b4dc8..b6bc20e62d 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index dff18787e1..410ef11ad9 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -12,23 +12,6 @@ </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature with a snapshot. --> <plugin> diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index e8199c053e..678e8d7dc6 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index b6e9bfea9d..af9a8a3cdc 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -16,23 +16,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 58cc708480..13c09f1e5f 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -33,23 +33,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 1c57cc5c96..91c096b59f 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -16,22 +16,6 @@ <build> <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 8582fd37b3..9b9a6c1047 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -18,23 +18,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index a8393bf972..f30c3a8b69 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -33,23 +33,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature with a snapshot. --> <plugin> diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index b476e0bcc3..398a2f2cb5 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -14,23 +14,6 @@ </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 6664653437..3924132ced 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 1f2ba5fa77..b916de79c0 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 52d71e58f3..fe40e402b0 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -14,23 +14,6 @@ </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 1a0dedee79..3ce5b3f4d0 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -33,23 +33,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>always</forkMode> diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index a04cfefd1e..ff6f078069 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -14,23 +14,6 @@ <build> <defaultGoal>install</defaultGoal> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> <dependencies> diff --git a/jetty-npn/jetty-npn-server/pom.xml b/jetty-npn/jetty-npn-server/pom.xml index b887a07481..3c606d34a2 100644 --- a/jetty-npn/jetty-npn-server/pom.xml +++ b/jetty-npn/jetty-npn-server/pom.xml @@ -12,23 +12,6 @@ </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature with a snapshot. --> <plugin> diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 7999c68ecd..e6710d1d19 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -34,23 +34,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature with a snapshot. --> <plugin> diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 36612da4d4..ebb99e7f45 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 2e5e2b6cf3..87bad0d25e 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -85,23 +85,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 9915097289..97e1c61d8f 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 480e2ff225..838749b24f 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -33,23 +33,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 0a200a105d..6068b90d30 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -46,23 +46,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 73bc85058e..379ca786a2 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -46,23 +46,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 98bfefdf14..a8c2ee8b6a 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -16,23 +16,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml index 148ff92242..4708b9f429 100644 --- a/jetty-spdy/spdy-http-server/pom.xml +++ b/jetty-spdy/spdy-http-server/pom.xml @@ -17,23 +17,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index df362cb6d2..e5f1fbca73 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -17,23 +17,6 @@ <build> <defaultGoal>install</defaultGoal> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> <dependencies> diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index ee95fe379d..1e5c1ad4bb 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -15,23 +15,6 @@ <build> <plugins> <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> --> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index c4f991b69b..e5f2108ac8 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -32,23 +32,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index ffbc21d9e4..095f204960 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -28,23 +28,6 @@ </resources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index 745cac2483..56651501ca 100644 --- a/jetty-websocket/javax-websocket-server-impl/pom.xml +++ b/jetty-websocket/javax-websocket-server-impl/pom.xml @@ -70,23 +70,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>config</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> @@ -724,6 +724,36 @@ --> <profiles> <profile> + <id>config</id> + <activation> + <file> + <exists>src/main/config</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptorRefs> + <descriptorRef>config</descriptorRef> + </descriptorRefs> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>eclipse-release</id> <modules> <module>aggregates/jetty-all</module> |