This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 138f617d9cc249ecb9193eb3c92736a6d0a84525 Merge: 157cefb aa78736 Author: Jean-Baptiste Onofré <[email protected]> AuthorDate: Mon Jan 7 16:47:13 2019 +0100 Merge pull request #712 from jbonofre/KARAF-6069 [KARAF-6069] Avoid to overwrite project artifact if the packaging is pom examples/karaf-config-example/README.md | 14 +++++++------- .../org/apache/karaf/examples/itests/ExampleITest.java | 4 ++-- .../karaf-maven-example-assembly/pom.xml | 2 +- .../karaf-maven-example/karaf-maven-example-client/pom.xml | 2 +- .../karaf-maven-example/karaf-maven-example-deploy/pom.xml | 2 +- .../karaf-maven-example/karaf-maven-example-kar/pom.xml | 2 +- .../mavenresolver/KarafMinimalMonitoredTestSupport.java | 4 ++-- .../main/java/org/apache/karaf/tooling/ArchiveMojo.java | 6 ++++-- 8 files changed, 19 insertions(+), 17 deletions(-)
