Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify pom by using simple property rather than xml fragment (#7578) 

* simplify skip deploy configuration

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2022-02-15 09:16:34 +10:00 committed by GitHub
parent 992e8e4d93
commit 274375272e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 36 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-resources/pom.xml
View File

@ -8,19 +8,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M2</version>
<configuration>
<!-- never deploy to a repository, only use in reactor -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

14
examples/pom.xml
View File

@ -15,21 +15,9 @@
<properties>
<sonar.skip>true</sonar.skip>
<spotbugs.skip>true</spotbugs.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- No point deploying example projects -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<modules>
<!--
- The async-rest and embedded are examples that have historical locations,

13
jetty-jmh/pom.xml
View File

@ -13,6 +13,7 @@
<properties>
<bundle-symbolic-name>${project.groupId}.jmh</bundle-symbolic-name>
<spotbugs.skip>true</spotbugs.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
@ -57,18 +58,6 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- No point deploying jmh project -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>

9
jetty-osgi/test-jetty-osgi-context/pom.xml
View File

@ -10,6 +10,7 @@
<description>Test Jetty OSGi bundle with a ContextHandler</description>
<properties>
<bundle-symbolic-name>${project.groupId}.testcontext</bundle-symbolic-name>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
@ -44,14 +45,6 @@
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

9
jetty-osgi/test-jetty-osgi-fragment/pom.xml
View File

@ -11,6 +11,7 @@
<description>Test Jetty OSGi Webapp Fragment bundle</description>
<properties>
<bundle-symbolic-name>${project.groupId}.webapp.fragment</bundle-symbolic-name>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
<resources>
@ -20,14 +21,6 @@
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

9
jetty-osgi/test-jetty-osgi-server/pom.xml
View File

@ -10,6 +10,7 @@
<description>Test Jetty OSGi bundle with a Server</description>
<properties>
<bundle-symbolic-name>${project.groupId}.testserver</bundle-symbolic-name>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
@ -35,14 +36,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

48
jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml
View File

@ -14,26 +14,26 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/classes</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/classes</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@ -58,14 +58,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- must deploy: required for jetty-distribution -->
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>

9
jetty-osgi/test-jetty-osgi-webapp/pom.xml
View File

@ -11,6 +11,7 @@
<description>Test Jetty OSGi Webapp bundle</description>
<properties>
<bundle-symbolic-name>${project.groupId}.webapp</bundle-symbolic-name>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
@ -37,14 +38,6 @@
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

34
tests/pom.xml
View File

@ -13,37 +13,11 @@
<packaging>pom</packaging>
<properties>
<spotbugs.skip>true</spotbugs.skip>
<!-- No point deploying testing projects -->
<maven.deploy.skip>true</maven.deploy.skip>
<maven.source.skip>true</maven.source.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- No point deploying testing projects -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<!-- no need of sources for test jars -->
<skipSource>true</skipSource>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- No point building javadoc on testing projects -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
<module>test-webapps</module>
<module>test-sessions</module>

12
tests/test-continuation/pom.xml
View File

@ -14,18 +14,6 @@
<properties>
<bundle-symbolic-name>${project.groupId}.continuation</bundle-symbolic-name>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>

8
tests/test-http-client-transport/pom.xml
View File

@ -95,14 +95,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>

10
tests/test-jmx/jmx-webapp/pom.xml
View File

@ -27,15 +27,5 @@
</dependencies>
<build>
<finalName>jmx-webapp</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

12
tests/test-sessions/test-file-sessions/pom.xml
View File

@ -11,18 +11,6 @@
<properties>
<bundle-symbolic-name>${project.groupId}.sessions.file</bundle-symbolic-name>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>

12
tests/test-sessions/test-gcloud-sessions/pom.xml
View File

@ -11,18 +11,6 @@
<properties>
<bundle-symbolic-name>${project.groupId}.sessions.gcloud</bundle-symbolic-name>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>

9
tests/test-sessions/test-hazelcast-sessions/pom.xml
View File

@ -10,17 +10,10 @@
<name>Jetty Tests :: Sessions :: Hazelcast</name>
<properties>
<bundle-symbolic-name>${project.groupId}.sessions.hazelcast</bundle-symbolic-name>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>

8
tests/test-sessions/test-infinispan-sessions/pom.xml
View File

@ -17,14 +17,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>

8
tests/test-sessions/test-jdbc-sessions/pom.xml
View File

@ -14,14 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>

12
tests/test-sessions/test-memcached-sessions/pom.xml
View File

@ -12,18 +12,6 @@
<bundle-symbolic-name>${project.groupId}.sessions.memcached</bundle-symbolic-name>
<memcached.docker.version></memcached.docker.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>

8
tests/test-sessions/test-mongodb-sessions/pom.xml
View File

@ -14,14 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>

8
tests/test-webapps/pom.xml
View File

@ -12,14 +12,6 @@
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>

8
tests/test-webapps/test-jaas-webapp/pom.xml
View File

@ -14,14 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>

10
tests/test-webapps/test-jetty-webapp/pom.xml
View File

@ -13,6 +13,8 @@
<packaging>war</packaging>
<properties>
<bundle-symbolic-name>${project.groupId}.tests.webapp</bundle-symbolic-name>
<!-- must deploy: required for jetty-distribution -->
<maven.deploy.skip>false</maven.deploy.skip>
</properties>
<build>
<plugins>
@ -125,14 +127,6 @@
</loginServices>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- must deploy: required for jetty-distribution -->
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>

8
tests/test-webapps/test-jndi-webapp/pom.xml
View File

@ -14,14 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>

10
tests/test-webapps/test-proxy-webapp/pom.xml
View File

@ -13,6 +13,8 @@
<packaging>war</packaging>
<properties>
<bundle-symbolic-name>${project.groupId}.proxy</bundle-symbolic-name>
<!-- must deploy: required for jetty-distribution -->
<maven.deploy.skip>false</maven.deploy.skip>
</properties>
<build>
<plugins>
@ -24,14 +26,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- must deploy: required for jetty-distribution -->
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>

12
tests/test-webapps/test-servlet-spec/pom.xml
View File

@ -9,18 +9,6 @@
<artifactId>test-servlet-spec-parent</artifactId>
<name>Jetty Tests :: Spec Test WebApp :: Parent</name>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<modules>
<module>test-web-fragment</module>
<module>test-container-initializer</module>

8
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
View File

@ -14,14 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>

8
tests/test-webapps/test-webapp-rfc2616/pom.xml
View File

@ -14,14 +14,6 @@
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<!-- DO NOT DEPLOY (or Release) -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>