Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-11-19 21:02:55 +0000
committerDavid Williams2015-11-19 21:03:07 +0000
commit8a1ab2e2786454f69e7dbce00bae039212c71bd5 (patch)
tree9751f38a3eee760d1780b5080a027b502d5f8290
parent8cb2481a57d868e2d3c0be7f7eb69775147a693c (diff)
downloadeclipse.platform.releng.aggregator-8a1ab2e2786454f69e7dbce00bae039212c71bd5.tar.gz
eclipse.platform.releng.aggregator-8a1ab2e2786454f69e7dbce00bae039212c71bd5.tar.xz
eclipse.platform.releng.aggregator-8a1ab2e2786454f69e7dbce00bae039212c71bd5.zip
Bug 480532 - Move the Platform build to use Maven 3.3.3
-rw-r--r--README.md2
-rw-r--r--eclipse-platform-parent/pom.xml6
-rw-r--r--production/build_eclipse_org.shsource2
3 files changed, 5 insertions, 5 deletions
diff --git a/README.md b/README.md
index 5e8efb534..3bd99d1c4 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.1.1 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.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".
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 06471250d..078f54214 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.
-->
<prerequisites>
- <maven>3.1.1</maven>
+ <maven>3.3.3</maven>
</prerequisites>
<properties>
<!-- As of Tycho 0.22, skipTests takes priority, if maven.test.skip also specified,
@@ -241,7 +241,7 @@
<execution>
<!--
Default lifecycle phase: 'GENERATE_SOURCES'
- See https://maven.apache.org/ref/3.1.1/maven-core/lifecycles.html
+ See https://maven.apache.org/ref/3.3.3/maven-core/lifecycles.html
-->
<goals>
<goal>generate-api-build-xml</goal>
@@ -414,7 +414,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>3.1.1</version>
+ <version>3.3.3</version>
</requireMavenVersion>
</rules>
</configuration>
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 7ecdaeef7..58ee9f61c 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -60,7 +60,7 @@ export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=fal
# 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=${TMP_DIR} -Dtycho.localArtifacts=ignore ${MIRROR_SETTING}}
-export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.1.1/bin}
+export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.3.3/bin}
export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH

Back to the top