Remove partial browser builds
Maven cannot be trusted to produce a release build without someone
checking a file that does not live under version control is correctly
configured. Drop the per-browser alternative switches to ensure
the build always creates all permutations for all browsers.
Change-Id: Ie9d7f23afc725f9411b371c231a21a19523df034
diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt
index 0bc0b40..cd7cd34 100644
--- a/Documentation/dev-release.txt
+++ b/Documentation/dev-release.txt
@@ -138,16 +138,8 @@
* Build the Gerrit WAR
+
====
- rm -f ~/.m2/settings.xml
./tools/release.sh
====
-+
-[WARNING]
-========================================================================
-Make sure you are compiling the release for all browsers. Check in your
-Maven `~/.m2/settings.xml` file that no Maven profile is active that
-limits the compilation to a certain browser.
-========================================================================
* Sanity check WAR
* Test the new Gerrit version
diff --git a/gerrit-gwtui/pom.xml b/gerrit-gwtui/pom.xml
index 5446ea0..7d09989 100644
--- a/gerrit-gwtui/pom.xml
+++ b/gerrit-gwtui/pom.xml
@@ -151,53 +151,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <GerritGwtUI.browserType>com.google.gerrit.GerritGwtUI</GerritGwtUI.browserType>
- <GerritGwtUI.draftCompile>false</GerritGwtUI.draftCompile>
- </properties>
- </profile>
- <profile>
- <id>safari</id>
- <properties>
- <GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIsafari</GerritGwtUI.browserType>
- <GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
- </properties>
- </profile>
- <profile>
- <id>chrome</id>
- <properties>
- <GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIsafari</GerritGwtUI.browserType>
- <GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
- </properties>
- </profile>
- <profile>
- <id>webkit</id>
- <properties>
- <GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIsafari</GerritGwtUI.browserType>
- <GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
- </properties>
- </profile>
- <profile>
- <id>gecko1_8</id>
- <properties>
- <GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIgecko1_8</GerritGwtUI.browserType>
- <GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
- </properties>
- </profile>
- <profile>
- <id>firefox</id>
- <properties>
- <GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIgecko1_8</GerritGwtUI.browserType>
- <GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
- </properties>
- </profile>
- </profiles>
<build>
<plugins>
@@ -208,12 +161,11 @@
<execution>
<id>optimized</id>
<configuration>
- <module>${GerritGwtUI.browserType}</module>
+ <module>com.google.gerrit.GerritGwtUI</module>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
<compileReport>${gwt.compileReport}</compileReport>
<disableClassMetadata>true</disableClassMetadata>
<disableCastChecking>true</disableCastChecking>
- <draftCompile>${GerritGwtUI.draftCompile}</draftCompile>
</configuration>
<goals>
<goal>compile</goal>
@@ -223,11 +175,10 @@
<id>debug</id>
<configuration>
<style>PRETTY</style>
- <module>${GerritGwtUI.browserType}</module>
+ <module>com.google.gerrit.GerritGwtUI</module>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
<disableClassMetadata>true</disableClassMetadata>
<disableRunAsync>true</disableRunAsync>
- <draftCompile>true</draftCompile>
<webappDirectory>${project.build.directory}/${project.build.finalName}_dbg</webappDirectory>
</configuration>
<goals>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
deleted file mode 100644
index d7e835f..0000000
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="gerrit_ui">
- <inherits name='com.google.gerrit.GerritGwtUI'/>
- <set-property name="user.agent" value="gecko1_8" />
- <set-property name="locale" value="default" />
-</module>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
deleted file mode 100644
index 88bea84..0000000
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="gerrit_ui">
- <inherits name='com.google.gerrit.GerritGwtUI'/>
- <set-property name="user.agent" value="safari" />
- <set-property name="locale" value="default" />
-</module>
