This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch hermetic-tests
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 88e2812ac09f6119ccc01d68ebf62caf978732bb
Merge: 6680e1c de12cc7
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Fri Aug 4 22:44:04 2017 +0000
Merge latest changes from trunk.
legal/jalopy-LICENSE.txt | 43 --------------
modules/codegen/pom.xml | 7 ++-
.../src/org/apache/axis2/util/PrettyPrinter.java | 69 ++++------------------
.../extension/JavaPrettyPrinterExtension.java | 5 --
.../java/InterfaceImplementationTemplate.xsl | 11 +---
modules/distribution/pom.xml | 14 ++---
.../test-resources/log4j.properties | 3 +-
modules/jaxws/test-resources/log4j.properties | 3 +-
modules/jibx-codegen/pom.xml | 69 ++++++++++++++++++++++
.../apache/axis2/jibx/CodeGenerationUtility.java | 0
.../jibx/template/JibXDatabindingTemplate.xsl | 0
modules/jibx/pom.xml | 9 +--
modules/kernel/conf/log4j.properties | 3 +-
.../test-resources/deployment/echo/build.xml | 4 +-
.../deployment/invalidservice/build.xml | 4 +-
.../test-resources/deployment/module1/build.xml | 4 +-
.../test-resources/deployment/service2/build.xml | 4 +-
.../deployment/serviceModule/build.xml | 4 +-
modules/metadata/test-resources/log4j.properties | 1 -
modules/saaj/test-resources/log4j.properties | 3 +-
modules/samples/book/src/main/log4j.properties | 3 +-
.../src/webapp/WEB-INF/classes/log4j.properties | 3 +-
.../src/webapp/WEB-INF/classes/log4j.properties | 3 +-
modules/tool/axis2-aar-maven-plugin/pom.xml | 31 +++++-----
.../aar-plugin-config-1.xml => it/test1/pom.xml} | 21 +++++--
.../src/main/resources/META-INF}/services.xml | 12 ++--
.../axis2-aar-maven-plugin/src/it/test1/verify.bsh | 5 ++
.../test2}/AdditionalDir/AdditionalFile.txt | 0
.../axis2-aar-maven-plugin/src/it/test2/pom.xml | 58 ++++++++++++++++++
.../src/{test/resources => it/test2}/services.xml | 12 ++--
.../src/{test/resources => it/test2}/simple.wsdl | 0
.../axis2-aar-maven-plugin/src/it/test2/verify.bsh | 5 ++
.../org/apache/axis2/maven2/aar/AarMojoTest.java | 44 --------------
.../apache/axis2/maven2/aar/AbstractAarTest.java | 68 ---------------------
.../src/test/resources/aar-plugin-config-2.xml | 47 ---------------
.../src/test/resources/log4j.properties | 1 -
modules/tool/axis2-eclipse-codegen-plugin/pom.xml | 2 +-
modules/tool/axis2-java2wsdl-maven-plugin/pom.xml | 31 +++++-----
.../src/{test => it}/test1/pom.xml | 24 +++++---
.../apache/axis2/maven2/java2wsdl/test/Adder.java | 0
.../axis2/maven2/java2wsdl/Java2WSDLMojoTest.java | 61 -------------------
modules/tool/axis2-mar-maven-plugin/pom.xml | 6 --
modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 20 +++++--
.../src/test/resources/log4j.properties | 1 -
pom.xml | 35 +++++------
45 files changed, 292 insertions(+), 461 deletions(-)
