Merge branch 'stable-2.9'

* stable-2.9:
  Add meta-data to archetype poms
  Fix bad style name

Conflicts:
	gerrit-plugin-gwt-archetype/pom.xml

Change-Id: I5e929d603c7b88d8f03d1f507dfba9fb7261766d
This commit is contained in:
David Pursehouse 2014-05-21 17:20:11 +09:00
commit 4bd8980633
4 changed files with 153 additions and 3 deletions

View File

@ -89,7 +89,7 @@ limitations under the License.
display: block;
}
.mergeCommit {
.commit {
margin-right: 3px;
float: left;
}
@ -127,7 +127,7 @@ limitations under the License.
</tr>
<tr>
<th>
<div class='{style.mergeCommit}'>
<div class='{style.commit}'>
<ui:msg>Commit</ui:msg>
</div>
<g:Image

View File

@ -22,6 +22,8 @@ limitations under the License.
<artifactId>gerrit-plugin-archetype</artifactId>
<version>2.10-SNAPSHOT</version>
<name>Gerrit Code Review - Plugin Archetype</name>
<description>Maven Archetype for Gerrit Plugins</description>
<url>http://code.google.com/p/gerrit/</url>
<properties>
<defaultGerritApiVersion>${project.version}</defaultGerritApiVersion>
@ -46,4 +48,52 @@ limitations under the License.
</resources>
</build>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>https://gerrit.googlesource.com/gerrit</url>
<connection>https://gerrit.googlesource.com/gerrit</connection>
</scm>
<developers>
<developer>
<name>Dave Borowitz</name>
</developer>
<developer>
<name>David Pursehouse</name>
</developer>
<developer>
<name>Edwin Kempin</name>
</developer>
<developer>
<name>Martin Fick</name>
</developer>
<developer>
<name>Saša Živkov</name>
</developer>
<developer>
<name>Shawn Pearce</name>
</developer>
</developers>
<mailingLists>
<mailingList>
<name>Repo and Gerrit Discussion</name>
<post>repo-discuss@googlegroups.com</post>
<subscribe>https://groups.google.com/forum/#!forum/repo-discuss</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/repo-discuss</unsubscribe>
<archive>https://groups.google.com/forum/#!forum/repo-discuss</archive>
</mailingList>
</mailingLists>
<issueManagement>
<url>http://code.google.com/p/gerrit/issues/list</url>
<system>Google Code Issue Tracker</system>
</issueManagement>
</project>

View File

@ -21,7 +21,9 @@ limitations under the License.
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-plugin-gwt-archetype</artifactId>
<version>2.10-SNAPSHOT</version>
<name>Gerrit Code Review - Web Ui GWT Plugin Archetype</name>
<name>Gerrit Code Review - Web UI GWT Plugin Archetype</name>
<description>Maven Archetype for Gerrit Web UI GWT Plugins</description>
<url>http://code.google.com/p/gerrit/</url>
<properties>
<defaultGerritApiVersion>${project.version}</defaultGerritApiVersion>
@ -46,4 +48,52 @@ limitations under the License.
</resources>
</build>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>https://gerrit.googlesource.com/gerrit</url>
<connection>https://gerrit.googlesource.com/gerrit</connection>
</scm>
<developers>
<developer>
<name>Dave Borowitz</name>
</developer>
<developer>
<name>David Pursehouse</name>
</developer>
<developer>
<name>Edwin Kempin</name>
</developer>
<developer>
<name>Martin Fick</name>
</developer>
<developer>
<name>Saša Živkov</name>
</developer>
<developer>
<name>Shawn Pearce</name>
</developer>
</developers>
<mailingLists>
<mailingList>
<name>Repo and Gerrit Discussion</name>
<post>repo-discuss@googlegroups.com</post>
<subscribe>https://groups.google.com/forum/#!forum/repo-discuss</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/repo-discuss</unsubscribe>
<archive>https://groups.google.com/forum/#!forum/repo-discuss</archive>
</mailingList>
</mailingLists>
<issueManagement>
<url>http://code.google.com/p/gerrit/issues/list</url>
<system>Google Code Issue Tracker</system>
</issueManagement>
</project>

View File

@ -22,6 +22,8 @@ limitations under the License.
<artifactId>gerrit-plugin-js-archetype</artifactId>
<version>2.10-SNAPSHOT</version>
<name>Gerrit Code Review - Web UI JavaScript Plugin Archetype</name>
<description>Maven Archetype for Gerrit Web UI JavaScript Plugins</description>
<url>http://code.google.com/p/gerrit/</url>
<properties>
<defaultGerritApiVersion>${project.version}</defaultGerritApiVersion>
@ -46,4 +48,52 @@ limitations under the License.
</resources>
</build>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>https://gerrit.googlesource.com/gerrit</url>
<connection>https://gerrit.googlesource.com/gerrit</connection>
</scm>
<developers>
<developer>
<name>Dave Borowitz</name>
</developer>
<developer>
<name>David Pursehouse</name>
</developer>
<developer>
<name>Edwin Kempin</name>
</developer>
<developer>
<name>Martin Fick</name>
</developer>
<developer>
<name>Saša Živkov</name>
</developer>
<developer>
<name>Shawn Pearce</name>
</developer>
</developers>
<mailingLists>
<mailingList>
<name>Repo and Gerrit Discussion</name>
<post>repo-discuss@googlegroups.com</post>
<subscribe>https://groups.google.com/forum/#!forum/repo-discuss</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/repo-discuss</unsubscribe>
<archive>https://groups.google.com/forum/#!forum/repo-discuss</archive>
</mailingList>
</mailingLists>
<issueManagement>
<url>http://code.google.com/p/gerrit/issues/list</url>
<system>Google Code Issue Tracker</system>
</issueManagement>
</project>