rename pom-aggregate-only.xml -> pom.xml; rename old pom.xml -> pom-build-everything.xml; update readme
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/README.adoc b/README.adoc
index 84c7518..2f73c32 100644
--- a/README.adoc
+++ b/README.adoc
@@ -15,30 +15,44 @@
# or
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # linux users
-4. build
+4a. build just the aggregate, using upstream CI builds. Should take under 20 mins.
- mvn clean install -V -B -Dmaven.test.skip=true -DskipWithIssues=false \
+ mvn clean install -V -B -PCI | tee log-aggregate-only.txt
+
+4b. OR, build everything in this repo, including all the submodules, from scratch. May take over 2 hrs. This approach is DEPRECATED.
+
+ mvn clean install -f pom-build-everything.xml -V -B -Dmaven.test.skip=true -DskipWithIssues=false \
-Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true \
-Dsurefire.timeout=1800 -P bree-libs -P integration -ff \
- | tee log.txt
+ | tee log-everything-build.txt
Some other flags you can use:
+ -P CI # build using upstream CI jobs' repos instead of having to build all the projects in the same reactor
+ -P bree-libs # build using strict adherence to Bundle-RequireExecutionEnvironment (BREE) rules. Requires a ~/.m2/toolchains.xml file.
+
-Dplatform-repo.url=http://download.eclipse.org/eclipse/updates/4.8-I-builds/
+
-Dwebtools.buildSite=http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-3.10.0-20171004000115/
-Dwebtools.buildSite=http://build.eclipse.org/webtools/committers/wtp-R3.10.0-I/20171211000140/I-3.10.0-20171211000140/
+ -Dwebtools-common-site=file:///path/to/where/you/build/locally/webtools.common/site/target/repository/
+ -Dwebtools-servertools-site=file:///path/to/where/you/build/locally/webtools.servertools/site/target/repository/
+ -Dwebtools-servertools-integration-site=file:///path/to/where/you/build/locally/webtools.servertools/site-integration/target/repository/
+ -Dwebtools-jeetools-site=file:///path/to/where/you/build/locally/webtools.javaee/site/target/repository/
+ ...
+
Note the above profiles:
* bree-libs profile may not work if you don't have old JDKs (eg., JDK5) installed locally
-* integration profile is needed to build the SDK & integration features (cross-repo dependencies)
+* integration profile is needed to build the SDK & integration features (cross-repo dependencies) (DEPRECATED)
---
-In future, this repo will likely be deprecated (or transform into something else) as webtools is moving away from a monolithic submodule-based uber-build and toward a sequential series of builds.
+This repo is being transformed as webtools is moving away from a monolithic submodule-based uber-build (see 4b above) and toward a sequential series of builds (see 4a above).
-This will allow users to build individual projects w/o having to check out the entire stack. For example, to contribute a fix to webtools.common, you need only fetch that project and build it by itself; then if you want to contribute a fix to a downstream project, such as webtools.servertools, you can rely on the latest local or CI build of webtools.common.
+This will allow users to build individual projects w/o having to check out and build the entire stack. For example, to contribute a fix to webtools.common, you need only fetch that project and build it by itself; then if you want to contribute a fix to a downstream project, such as webtools.servertools, you can rely on the latest local or CI build of webtools.common.
This will allow development to be more agile, more reactive, and to move incrementally without the need for this project.
--- 2017-12-14 @nickboldt
+-- 2018-03-12 @nickboldt
diff --git a/pom-aggregate-only.xml b/pom-aggregate-only.xml
deleted file mode 100644
index cc2410c..0000000
--- a/pom-aggregate-only.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2018 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Nick Boldt, Red Hat - initial implementation
--->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse</groupId>
- <artifactId>wtp-parent</artifactId>
- <version>3.10.0-SNAPSHOT</version>
- <relativePath>wtp-parent</relativePath>
- </parent>
-
- <groupId>org.eclipse.wtp</groupId>
- <artifactId>wtp-aggregator</artifactId>
- <version>3.10.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <!-- TODO: this pom should replace the pom.xml in this folder when we're sure we don't have to build anything in the 8 wtp repos... and only need to aggregate them here. -->
-
- <modules>
-
- <!-- TODO: do we need all these releng scripts and libs? Can they be deprecated? -->
- <module>webtools.releng</module>
-
- <!-- new aggregate update site for 3.10.0.M6 -->
- <module>webtools.repositories</module>
-
- <!-- TODO call:
- ant -f wtp-parent/postBuild.xml -lib ./libs/ -Dbuild.type=I -Dpublish=true -Dwtp.version=3.10.0
- so we don't need a separate step in Jenkins
- -->
- </modules>
-
- <repositories>
- <!-- To reference parent pom -->
- <repository>
- <id>Webtools Repository - Releases</id>
- <name>Webtools Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/webtools-releases/</url>
- </repository>
- <repository>
- <id>Webtools Repository - Snapshots</id>
- <name>Webtools Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/webtools-snapshots/</url>
- </repository>
- </repositories>
-
-</project>
diff --git a/pom-build-everything.xml b/pom-build-everything.xml
new file mode 100644
index 0000000..27ff823
--- /dev/null
+++ b/pom-build-everything.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.eclipse.wtp</groupId>
+ <artifactId>wtp-aggregator</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>wtp-parent</module>
+ <module>webtools.releng</module>
+ <module>webtools.repositories</module>
+
+ <module>webtools.common</module>
+ <module>webtools.servertools</module>
+ <module>webtools.jsdt</module>
+ <module>webtools.sourceediting</module>
+
+ <module>webtools.javaee</module>
+ <module>webtools.dali</module>
+ <module>webtools.jsf</module>
+ <module>webtools.webservices</module>
+ </modules>
+</project>
diff --git a/pom.xml b/pom.xml
index 27ff823..cc2410c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2018 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
+ Nick Boldt, Red Hat - initial implementation
-->
<project
@@ -15,24 +15,46 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse</groupId>
+ <artifactId>wtp-parent</artifactId>
+ <version>3.10.0-SNAPSHOT</version>
+ <relativePath>wtp-parent</relativePath>
+ </parent>
+
<groupId>org.eclipse.wtp</groupId>
<artifactId>wtp-aggregator</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <modules>
- <module>wtp-parent</module>
- <module>webtools.releng</module>
- <module>webtools.repositories</module>
-
- <module>webtools.common</module>
- <module>webtools.servertools</module>
- <module>webtools.jsdt</module>
- <module>webtools.sourceediting</module>
+ <!-- TODO: this pom should replace the pom.xml in this folder when we're sure we don't have to build anything in the 8 wtp repos... and only need to aggregate them here. -->
- <module>webtools.javaee</module>
- <module>webtools.dali</module>
- <module>webtools.jsf</module>
- <module>webtools.webservices</module>
+ <modules>
+
+ <!-- TODO: do we need all these releng scripts and libs? Can they be deprecated? -->
+ <module>webtools.releng</module>
+
+ <!-- new aggregate update site for 3.10.0.M6 -->
+ <module>webtools.repositories</module>
+
+ <!-- TODO call:
+ ant -f wtp-parent/postBuild.xml -lib ./libs/ -Dbuild.type=I -Dpublish=true -Dwtp.version=3.10.0
+ so we don't need a separate step in Jenkins
+ -->
</modules>
+
+ <repositories>
+ <!-- To reference parent pom -->
+ <repository>
+ <id>Webtools Repository - Releases</id>
+ <name>Webtools Repository - Releases</name>
+ <url>https://repo.eclipse.org/content/repositories/webtools-releases/</url>
+ </repository>
+ <repository>
+ <id>Webtools Repository - Snapshots</id>
+ <name>Webtools Repository - Snapshots</name>
+ <url>https://repo.eclipse.org/content/repositories/webtools-snapshots/</url>
+ </repository>
+ </repositories>
+
</project>
