Merge branch 'stable-2.9'
* stable-2.9: Define mvn() function only once Add pom with meta-data for plugin projects Add more bug-fixes to 2.9 release notes No pom.xml in gerrit-plugin-gwtui to update Conflicts: tools/version.py Change-Id: I653f71d4203d516a8b8e35bebbb23b7534e433ee
This commit is contained in:
David Pursehouse
commit
063f658042
@ -486,6 +486,17 @@ Web UI
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2652[Issue 2652]:
|
||||
Copy label approvals when cherry-picking change to same branch.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2662[Issue 2662]:
|
||||
Limit file list in new change screen to files that were touched in new
|
||||
patch set.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2308[Issue 2308]:
|
||||
Show related changes in new change screen for merged changes if there
|
||||
are open descendants.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2635[Issue 2635]:
|
||||
Fix copying of download commands by 'Cmd-C' in Safari.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2178[Issue 2178]:
|
||||
Fix background of reply box on new change screen getting transparent.
|
||||
|
||||
@ -511,6 +522,14 @@ side-by-side diff screen.
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2340[Issue 2340]:
|
||||
Fix selection in new side-by-side diff screen.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2409[Issue 2409]:
|
||||
Show in new side-by-side diff screen updates of submodule links.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2481[Issue 2481]:
|
||||
After showing a binary file in the unified diff screen switch back to
|
||||
the side-by-side diff screen when the user navigates to the
|
||||
next/previous file.
|
||||
|
||||
* link:http://code.google.com/p/gerrit/issues/detail?id=2417[Issue 2417]:
|
||||
Respect base diff revision for files REST call.
|
||||
|
||||
|
||||
59
gerrit-extension-api/pom.xml
Normal file
59
gerrit-extension-api/pom.xml
Normal file
@ -0,0 +1,59 @@
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.google.gerrit</groupId>
|
||||
<artifactId>gerrit-extension-api</artifactId>
|
||||
<version>2.9-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>Gerrit Code Review - Extension API</name>
|
||||
<description>API for Gerrit Extensions</description>
|
||||
<url>http://code.google.com/p/gerrit/</url>
|
||||
|
||||
<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>
|
||||
59
gerrit-plugin-api/pom.xml
Normal file
59
gerrit-plugin-api/pom.xml
Normal file
@ -0,0 +1,59 @@
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.google.gerrit</groupId>
|
||||
<artifactId>gerrit-plugin-api</artifactId>
|
||||
<version>2.9-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>Gerrit Code Review - Plugin API</name>
|
||||
<description>API for Gerrit Plugins</description>
|
||||
<url>http://code.google.com/p/gerrit/</url>
|
||||
|
||||
<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>
|
||||
59
gerrit-plugin-gwtui/pom.xml
Normal file
59
gerrit-plugin-gwtui/pom.xml
Normal file
@ -0,0 +1,59 @@
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.google.gerrit</groupId>
|
||||
<artifactId>gerrit-plugin-gwtui</artifactId>
|
||||
<version>2.9-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>Gerrit Code Review - Plugin GWT UI</name>
|
||||
<description>Common Classes for Gerrit GWT UI Plugins</description>
|
||||
<url>http://code.google.com/p/gerrit/</url>
|
||||
|
||||
<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>
|
||||
@ -20,9 +20,6 @@ from os import path
|
||||
from sys import stderr
|
||||
from tools.util import check_output
|
||||
|
||||
def mvn(action):
|
||||
return ['mvn', '--file', path.join(self, 'fake_pom_%s.xml' % action)]
|
||||
|
||||
def mvn(action):
|
||||
return ['mvn', '--file', path.join(self, 'fake_pom_%s.xml' % action)]
|
||||
|
||||
|
||||
@ -30,9 +30,9 @@ elif len(args) > 1:
|
||||
new_version = args[0]
|
||||
pattern = re.compile(r'(\s*)<version>[-.\w]+</version>')
|
||||
|
||||
for project in ['gerrit-plugin-archetype',
|
||||
'gerrit-plugin-gwt-archetype',
|
||||
'gerrit-plugin-js-archetype']:
|
||||
for project in ['gerrit-extension-api', 'gerrit-plugin-api',
|
||||
'gerrit-plugin-archetype', 'gerrit-plugin-gwt-archetype',
|
||||
'gerrit-plugin-gwtui', 'gerrit-plugin-js-archetype']:
|
||||
pom = os.path.join(project, 'pom.xml')
|
||||
try:
|
||||
outxml = ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user