Merge branch 'jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Olivier Lamy 2021-10-01 18:04:59 +10:00
commit e78951bfeb
2 changed files with 52 additions and 0 deletions

51
jetty-p2/pom.xml Normal file
View File

@ -0,0 +1,51 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-p2</artifactId>
<name>Jetty :: P2</name>
<description>Generates a (maven based) P2 Updatesite</description>
<packaging>pom</packaging>
<properties>
<tycho-version>2.5.0</tycho-version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<configuration>
<categoryName>Jetty Bundles</categoryName>
<includeReactor>true</includeReactor>
<includeDependencies>false</includeDependencies>
<includePGPSignature>true</includePGPSignature>
</configuration>
<id>maven-p2-site</id>
<phase>prepare-package</phase>
<goals>
<goal>assemble-maven-repository</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<!-- This dependency is to make sure this projects is build after all relevant
artifacts are created -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>
</project>

View File

@ -245,6 +245,7 @@
<module>jetty-bom</module> <module>jetty-bom</module>
<module>documentation</module> <module>documentation</module>
<module>jetty-keystore</module> <module>jetty-keystore</module>
<module>jetty-p2</module>
<module>jetty-unixdomain-server</module> <module>jetty-unixdomain-server</module>
</modules> </modules>