opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9'

Browse Source 
* 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
2014-05-23 11:16:23 +09:00
parent 5269a6090d ba0227cd88
commit 063f658042
6 changed files with 199 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/maven/mvn.py
View File

@@ -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)]

6
tools/version.py
View File

@@ -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 = ""