summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2013-05-06 12:25:49 -0700
committerShawn Pearce <sop@google.com>2013-05-06 15:36:34 -0700
commit8d6dcac0b6f8d4daa162dcdb12b5689791c3e47f (patch)
tree803c37a0f01028a0f8d1baf940ca09b6196720bf
parent6a971631dff36769f8fff0729dde0d328994ebd7 (diff)
Always build all components of Gerrit
If we are committed to Maven as a build tool we need to have Maven always building the correct targets when a user runs `mvn package`. Include all modules as part of the build, all of the time. Change-Id: I23f02cf040437bfe91e8badb6fdb6f765e707b6f
-rw-r--r--pom.xml30
-rwxr-xr-xtools/release.sh2
2 files changed, 8 insertions, 24 deletions
diff --git a/pom.xml b/pom.xml
index 762329894d..5e6c9277a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@ limitations under the License.
<module>gerrit-common</module>
<module>gerrit-cache-h2</module>
<module>gerrit-httpd</module>
+ <module>gerrit-gwtui</module>
<module>gerrit-launcher</module>
<module>gerrit-main</module>
<module>gerrit-openid</module>
@@ -88,32 +89,15 @@ limitations under the License.
<module>gerrit-gwtdebug</module>
<module>gerrit-war</module>
- <module>gerrit-extension-api</module>
-
- <module>gerrit-gwtui</module>
-
<module>gerrit-acceptance-tests</module>
+ <module>gerrit-extension-api</module>
+ <module>gerrit-plugin-api</module>
+ <module>gerrit-plugin-archetype</module>
+ <module>gerrit-plugin-gwtui</module>
+ <module>gerrit-plugin-js-archetype</module>
+ <module>gerrit-plugin-gwt-archetype</module>
</modules>
- <profiles>
- <profile>
- <id>all</id>
- <modules>
- <module>gerrit-plugin-api</module>
- <module>gerrit-plugin-archetype</module>
- <module>gerrit-plugin-gwtui</module>
- <module>gerrit-plugin-js-archetype</module>
- <module>gerrit-plugin-gwt-archetype</module>
- </modules>
- </profile>
- <profile>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <id>no-plugins</id>
- </profile>
- </profiles>
-
<licenses>
<license>
<name>Apache License, 2.0</name>
diff --git a/tools/release.sh b/tools/release.sh
index 4d2b26b2f5..d4590492ae 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-flags=-Pall
+flags=
while [ $# -gt 0 ]
do