fix version in pom and use trick from 9.4.x branch with flatten-maven-plugin

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2019-04-03 17:31:25 +10:00
parent c0c2996339
commit 6051d135f2
1 changed files with 53 additions and 98 deletions

View File

@ -1,96 +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"> <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-parent</artifactId>
<version>25</version>
</parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>jetty-bom</artifactId> <artifactId>jetty-bom</artifactId>
<version>9.3.26.v20190403</version>
<name>Jetty :: Bom</name> <name>Jetty :: Bom</name>
<description>Jetty BOM artifact</description> <description>Jetty BOM artifact</description>
<url>http://www.eclipse.org/jetty</url> <url>http://www.eclipse.org/jetty</url>
<inceptionYear>1995</inceptionYear>
<packaging>pom</packaging> <packaging>pom</packaging>
<issueManagement> <parent>
<system>github</system> <groupId>org.eclipse.jetty</groupId>
<url>https://github.com/eclipse/jetty.project/issues</url> <artifactId>jetty-project</artifactId>
</issueManagement> <version>9.3.27-SNAPSHOT</version>
</parent>
<licenses>
<license>
<name>Apache Software License - Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
<license>
<name>Eclipse Public License - Version 1.0</name>
<url>http://www.eclipse.org/org/documents/epl-v10.php</url>
</license>
</licenses>
<properties>
<jetty.url>http://www.eclipse.org/jetty</jetty.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-support-version>1.4</build-support-version>
</properties>
<scm>
<connection>scm:git:https://github.com/eclipse/jetty.project.git</connection>
<developerConnection>scm:git:git@github.com:eclipse/jetty.project.git</developerConnection>
<url>https://github.com/eclipse/jetty.project</url>
</scm>
<distributionManagement>
<repository>
<id>oss.sonatype.org</id>
<name>Jetty Staging Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>oss.sonatype.org</id>
<name>Jetty Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
</snapshotRepository>
<site>
<id>jetty.eclipse.website</id>
<url>scp://build.eclipse.org:/home/data/httpd/download.eclipse.org/jetty/${project.version}/</url>
</site>
</distributionManagement>
<build> <build>
<pluginManagement> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.codehaus.mojo</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>flatten-maven-plugin</artifactId>
<artifactId>maven-release-plugin</artifactId> <version>1.0.1</version>
<version>2.5</version> <configuration>
<configuration> <outputDirectory>${project.build.directory}</outputDirectory>
<useReleaseProfile>false</useReleaseProfile> <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename>
<goals>deploy</goals> <flattenMode>bom</flattenMode>
<arguments>-Peclipse-release</arguments> <updatePomFile>true</updatePomFile>
<preparationGoals>clean install</preparationGoals> <pomElements>
<mavenExecutorId>forked-path</mavenExecutorId> <build>remove</build>
</configuration> <properties>remove</properties>
</plugin> </pomElements>
<plugin> </configuration>
<groupId>org.apache.maven.plugins</groupId> <executions>
<artifactId>maven-source-plugin</artifactId> <execution>
<version>3.0.1</version> <id>flatten</id>
<configuration> <goals>
<skip>true</skip> <goal>flatten</goal>
</configuration> </goals>
</plugin> <phase>process-resources</phase>
<plugin> </execution>
<groupId>org.apache.maven.plugins</groupId> <execution>
<artifactId>maven-javadoc-plugin</artifactId> <id>flatten-clean</id>
<version>3.0.0-M1</version> <goals>
<configuration> <goal>clean</goal>
<skip>true</skip> </goals>
</configuration> <phase>clean</phase>
</plugin> </execution>
</plugins> </executions>
</pluginManagement> </plugin>
</plugins>
</build> </build>
<dependencyManagement> <dependencyManagement>
@ -103,17 +58,17 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>cdi-core</artifactId> <artifactId>cdi-core</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>cdi-servlet</artifactId> <artifactId>cdi-servlet</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>cdi-websocket</artifactId> <artifactId>cdi-websocket</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
@ -138,12 +93,12 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-gcloud-memcached-session-manager</artifactId> <artifactId>jetty-gcloud-memcached-session-manager</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-gcloud-session-manager</artifactId> <artifactId>jetty-gcloud-session-manager</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
@ -228,17 +183,17 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-osgi-boot</artifactId> <artifactId>jetty-osgi-boot</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId> <artifactId>jetty-osgi-boot-jsp</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId> <artifactId>jetty-osgi-boot-warurl</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
@ -303,37 +258,37 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-client-impl</artifactId> <artifactId>javax-websocket-client-impl</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server-impl</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-api</artifactId> <artifactId>javax-websocket-api</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-client</artifactId> <artifactId>javax-websocket-client</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-common</artifactId> <artifactId>javax-websocket-common</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-server</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax-websocket-servlet</artifactId> <artifactId>javax-websocket-servlet</artifactId>
<version>9.3.26-SNAPSHOT</version> <version>9.3.27-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>