commit 2d34232bde30483ebff0fc663419fd8f63549139
Merge: 322ef52 e3a0b91
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri Jan 10 10:12:15 2014 +0100
Really merge branch 'pom_editor.py'
Forgot to push merge commit on master, sorry
doc/pom_macros.txt | 4 +-
etc/macros.fjava | 13 +-
install | 2 +-
java-utils/pom_editor.py | 356 +++++++++++++++
java-utils/pom_editor.sh | 453 --------------------
man/pom_add_dep.txt | 8 +-
man/pom_add_parent.txt | 10 +-
man/pom_add_plugin.txt | 2 +-
man/pom_remove_dep.txt | 2 +-
man/pom_remove_plugin.txt | 4 +-
man/pom_set_parent.txt | 2 +-
test/data/pom_macros/pom_add_dep_extra.xml | 13 +
...arent_second.xml => pom_add_dep_extra.xml-want} | 22 +-
test/data/pom_macros/pom_add_dep_mgmt_extra.xml | 13 +
..._second.xml => pom_add_dep_mgmt_extra.xml-want} | 24 +-
..._parent_second.xml => pom_add_plugin_extra.xml} | 26 +-
test/data/pom_macros/pom_add_plugin_extra.xml-want | 36 ++
...rent_second.xml => pom_remove_dep_wildcard.xml} | 10 +
.../pom_macros/pom_remove_dep_wildcard.xml-want | 15 +
...cond.xml-want => pom_xpath_inject_multiple.xml} | 15 +-
...cond.xml => pom_xpath_inject_multiple.xml-want} | 12 +-
...t_second.xml => pom_xpath_replace_multiple.xml} | 6 +-
...ond.xml => pom_xpath_replace_multiple.xml-want} | 14 +-
.../pom_xpath_replace_whitespace.xml-want | 1 -
...arent_second.xml => pom_xpath_set_multiple.xml} | 2 +-
...nd.xml-want => pom_xpath_set_multiple.xml-want} | 35 +-
test/pom_macros_test.py | 139 +++++--
27 files changed, 654 insertions(+), 585 deletions(-)
---
Show replies by date