From e2ed116931af72688549f8dbbbeb13a7ba6e1036 Mon Sep 17 00:00:00 2001 From: Sravan Kumar Lakkimsetti Date: Fri, 7 Sep 2018 17:04:03 +0530 Subject: Bug 538784 - Upgrade Maven to 3.5.4 in build scripts Change-Id: I40f020410e159dc32134bb3aee23871bab7a0f45 Signed-off-by: Sravan Kumar Lakkimsetti --- README.md | 2 +- eclipse-platform-parent/pom.xml | 6 +++--- .../java11patch49/eclipse.releng.repository.java11patch/pom.xml | 2 +- production/build_eclipse_org.shsource | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3bd99d1c4..62d5d6935 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Aggregator repo for Eclipse SDK builds. To run a complete build, on your local machine, run the commands from ./scripts/build.sh in this folder. -These commands requires the installation and setup of Java 1.8 or higher and Maven version 3.3.3 or higher Plus, other settings, alternatives, and other recommendations are made in the complete instructions on the [Platform Build wiki](http://wiki.eclipse.org/Platform-releng/Platform_Build "Platform Build"). Note, it is highly recommended to use toolchains.xml and -Pbree-libs as decribed in [Using BREE Libs](https://wiki.eclipse.org/Platform-releng/Platform_Build#Using_BREE_Libs "Using BREE Libs"). If you do use BREE Libs (with proper toolchains.xml file) you can use Java 1.7 to "run the build". +These commands requires the installation and setup of Java 1.8 or higher and Maven version 3.5.4 or higher Plus, other settings, alternatives, and other recommendations are made in the complete instructions on the [Platform Build wiki](http://wiki.eclipse.org/Platform-releng/Platform_Build "Platform Build"). Note, it is highly recommended to use toolchains.xml and -Pbree-libs as decribed in [Using BREE Libs](https://wiki.eclipse.org/Platform-releng/Platform_Build#Using_BREE_Libs "Using BREE Libs"). If you do use BREE Libs (with proper toolchains.xml file) you can use Java 1.7 to "run the build". Eclipse Platform Project committers should also read [Automated Platform Builds](http://wiki.eclipse.org/Platform-releng/Automated_Platform_Build "Automated Platform Builds"). diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 4adf8256b..9979792cb 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -30,7 +30,7 @@ If version number changed in one place, be sure to change in the other. --> - 3.3.3 + 3.5.4 generate-api-build-xml @@ -384,7 +384,7 @@ - 3.3.3 + 3.5.4 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java11patch49/eclipse.releng.repository.java11patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java11patch49/eclipse.releng.repository.java11patch/pom.xml index 88f1cc5fd..112f0cd14 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/java11patch49/eclipse.releng.repository.java11patch/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/java11patch49/eclipse.releng.repository.java11patch/pom.xml @@ -30,7 +30,7 @@ Notice that all the tasks in this pom are normally done during the packaging phase, but the last few we deliberately do later, during the pre-integration-test phase, in order that things be done in the right order, and changes maintained. - See https://maven.apache.org/ref/3.3.3/maven-core/lifecycles.html + See https://maven.apache.org/ref/3.5.4/maven-core/lifecycles.html for complete list of phases. --> diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index b09037b13..59df3f97b 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -90,7 +90,7 @@ mkdir -p ${MAVEN_TMP_DIR} # Lower mx since less needed with Tycho 0.23.1. But, still higher than our previous 4G, since we do use near 4G. export MAVEN_OPTS=${MAVEN_OPTS:--Xms2048m -Xmx5120m -Djava.io.tmpdir=${MAVEN_TMP_DIR} -Dtycho.localArtifacts=ignore ${MIRROR_SETTING}} -export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.3.3/bin} +export MAVEN_PATH=${MAVEN_PATH:-/shared/common/maven/apache-maven-3.5.4/bin} export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH -- cgit v1.2.3