You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/13 22:44:30 UTC
[lucene-solr] branch jira/LUCENE-8738 updated: LUCENE-8738: Update
Maven build
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/LUCENE-8738 by this push:
new e23fd23 LUCENE-8738: Update Maven build
e23fd23 is described below
commit e23fd230a0dedf80ea94b9e2f32f1b9b3c122122
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sun Apr 14 00:44:02 2019 +0200
LUCENE-8738: Update Maven build
---
build.xml | 2 +-
dev-tools/maven/pom.xml.template | 49 ++++++++++++++------------
lucene/tools/src/groovy/run-maven-build.groovy | 1 +
3 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/build.xml b/build.xml
index f945499..d4efe46 100755
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="tests.heap-dump-dir" location="heapdumps"/>
<property name="maven-build-dir" value="maven-build"/>
- <property name="maven-version" value="2.2.1"/>
+ <property name="maven-version" value="3.5.0"/>
<property name="maven.dependencies.filters.file" location="lucene/build/maven.dependencies.filters.properties"/>
<property name="smokeTestRelease.dir" location="lucene/build/smokeTestRelease/dist"/>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 71c2b55..8952eea 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -44,8 +44,6 @@
<specification.version>@spec.version@</specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>11</java.compat.version>
- <!-- HACK: the enforce plugin does not like new versioning: -->
- <java.legacy-compat.version>1.${java.compat.version}</java.legacy-compat.version>
<jetty.version>9.3.8.v20160314</jetty.version>
<!-- RandomizedTesting library system properties -->
@@ -161,7 +159,7 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
- <version>2.4.1</version>
+ <version>2.6</version>
<configuration>
<!--
This is the default setting, we don't support too new Java versions.
@@ -177,17 +175,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.8.0</version>
<configuration>
<source>${java.compat.version}</source>
<target>${java.compat.version}</target>
@@ -200,27 +198,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3</version>
+ <version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.1.1</version>
<configuration>
<archive>
<manifest>
@@ -233,7 +231,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>3.1.0</version>
<configuration>
<quiet>true</quiet>
<additionalparam>-Xdoclint:all</additionalparam>
@@ -243,17 +241,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>3.0.0-M3</version>
<configuration>
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
@@ -293,7 +296,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.2</version>
<configuration>
<archive>
<!-- This section should be *exactly* the same under -->
@@ -319,12 +322,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -385,7 +388,7 @@
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>enforce-java-compat-version-and-maven-2.2.1</id>
+ <id>enforce-java-compat-version-and-maven-3.0.0</id>
<goals>
<goal>enforce</goal>
</goals>
@@ -393,11 +396,11 @@
<rules>
<requireJavaVersion>
<message>Java ${java.compat.version}+ is required.</message>
- <version>[${java.legacy-compat.version},)</version>
+ <version>[${java.compat.version},)</version>
</requireJavaVersion>
<requireMavenVersion>
- <message>Maven 2.2.1+ is required.</message>
- <version>[2.2.1,)</version>
+ <message>Maven 3.5.0+ is required.</message>
+ <version>[3.5.0,)</version>
</requireMavenVersion>
<requirePluginVersions/>
</rules>
@@ -418,7 +421,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
+ <version>4.2.0</version>
<configuration>
<instructions>
<Export-Package>*;-split-package:=merge-first</Export-Package>
diff --git a/lucene/tools/src/groovy/run-maven-build.groovy b/lucene/tools/src/groovy/run-maven-build.groovy
index c26c7bf..e241837 100644
--- a/lucene/tools/src/groovy/run-maven-build.groovy
+++ b/lucene/tools/src/groovy/run-maven-build.groovy
@@ -43,6 +43,7 @@ def artifact = NamespaceBuilder.newInstance(ant, 'antlib:org.apache.maven.artifa
task.log('Running Maven with props: ' + cmdlineProps.toString(), Project.MSG_INFO);
artifact.mvn(pom: properties['maven-build-dir']+'/pom.xml', mavenVersion: properties['maven-version'], failonerror: true, fork: true) {
+ sysproperty(key: 'maven.multiModuleProjectDirectory', file: properties['maven-build-dir'])
cmdlineProps.each{ k, v -> arg(value: '-D' + k + '=' + v) };
arg(value: '-fae');
arg(value: 'install');