You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/07/01 17:01:42 UTC
svn commit: r1800517 - in /axis/axis2/java/core/branches/google-java-format:
./ legal/ modules/codegen/ modules/codegen/src/org/apache/axis2/util/
modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/
modules/distribution/ modules/jaxws-integrat...
Author: veithen
Date: Sat Jul 1 17:01:42 2017
New Revision: 1800517
URL: http://svn.apache.org/viewvc?rev=1800517&view=rev
Log:
Replace Jalopy with the Google Java Formatter.
Removed:
axis/axis2/java/core/branches/google-java-format/legal/jalopy-LICENSE.txt
Modified:
axis/axis2/java/core/branches/google-java-format/modules/codegen/pom.xml
axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/util/PrettyPrinter.java
axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JavaPrettyPrinterExtension.java
axis/axis2/java/core/branches/google-java-format/modules/distribution/pom.xml
axis/axis2/java/core/branches/google-java-format/modules/jaxws-integration/test-resources/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/jaxws/test-resources/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/kernel/conf/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/metadata/test-resources/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/saaj/test-resources/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/samples/book/src/main/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/resources/log4j.properties
axis/axis2/java/core/branches/google-java-format/pom.xml
Modified: axis/axis2/java/core/branches/google-java-format/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/codegen/pom.xml?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/codegen/pom.xml Sat Jul 1 17:01:42 2017
@@ -42,6 +42,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.googlejavaformat</groupId>
+ <artifactId>google-java-format</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${project.version}</version>
Modified: axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/util/PrettyPrinter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/util/PrettyPrinter.java?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/util/PrettyPrinter.java (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/util/PrettyPrinter.java Sat Jul 1 17:01:42 2017
@@ -22,17 +22,14 @@ package org.apache.axis2.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.ByteArrayOutputStream;
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import com.google.googlejavaformat.java.Formatter;
+
import java.io.File;
-import java.io.PrintStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Properties;
/**
- * Tidies up the java source code using Jalopy.
- * This is used by both ADB and Codegen hence needs to be in the
- * commons rather than a specific module
+ * Tidies up the java source code.
*/
public class PrettyPrinter {
private static final Log log = LogFactory.getLog(PrettyPrinter.class);
@@ -44,59 +41,15 @@ public class PrettyPrinter {
* @param file
*/
public static void prettify(File file) {
- // If the user has set "axis2.jalopy=false" on the system property,
- // then just return back to caller
- String property = System.getProperty("axis2.jalopy");
- if((property != null) && !JavaUtils.isTrueExplicitly(property)){
- return;
- }
- PrintStream backupOutputStream = System.out;
- PrintStream backupErrorStream = System.err;
- System.setOut(new PrintStream(new ByteArrayOutputStream()));
- System.setErr(new PrintStream(new ByteArrayOutputStream()));
+ File formattedFile = new File(file.getParentFile(), file.getName() + ".new");
try {
- Class<?> clazzConfigurator = Loader.loadClass("org.apache.log4j.PropertyConfigurator");
- Method configure = clazzConfigurator.getMethod("configure", new Class[]{Properties.class});
- Properties properties = new Properties();
- properties.setProperty("log4j.logger.de.hunsicker.jalopy.io",
- System.getProperty("log4j.logger.de.hunsicker.jalopy.io", "FATAL"));
- configure.invoke(null, new Object[]{properties});
-
- // Create an instance of the Jalopy bean
- Class<?> clazz = Loader.loadClass("de.hunsicker.jalopy.Jalopy");
- Object prettifier = clazz.newInstance();
-
- // Set the input file
- Method input = clazz.getMethod("setInput", new Class[]{File.class});
- input.invoke(prettifier, new Object[]{file});
-
- // Set the output file
- Method output = clazz.getMethod("setOutput", new Class[]{File.class});
- output.invoke(prettifier, new Object[]{file});
-
- Class<?> clazz2 = Loader.loadClass("de.hunsicker.jalopy.storage.Convention");
- Method instance = clazz2.getMethod("getInstance", new Class[]{});
- Object settings = instance.invoke(null, new Object[]{});
-
- Class<?> clazz3 = Loader.loadClass("de.hunsicker.jalopy.storage.ConventionKeys");
- Field field = clazz3.getField("COMMENT_FORMAT_MULTI_LINE");
- Object key = field.get(null);
- Method put = clazz2.getMethod("put", new Class[]{key.getClass(), String.class});
- put.invoke(settings, new Object[]{key, "true"});
-
- // format and overwrite the given input file
- Method format = clazz.getMethod("format", new Class[]{});
- format.invoke(prettifier, new Object[]{});
- log.debug("Pretty printed file : " + file);
- } catch (ClassNotFoundException e) {
- log.debug("Jalopy/Log4j not found - unable to pretty print " + file);
+ new Formatter().formatSource(
+ Files.asCharSource(file, Charsets.UTF_8),
+ Files.asCharSink(formattedFile, Charsets.UTF_8));
} catch (Exception e) {
log.warn("Exception occurred while trying to pretty print file " + file, e);
- } catch (Throwable t) {
- log.debug("Exception occurred while trying to pretty print file " + file, t);
- } finally {
- System.setOut(backupOutputStream);
- System.setErr(backupErrorStream);
}
+ file.delete();
+ formattedFile.renameTo(file);
}
}
Modified: axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JavaPrettyPrinterExtension.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JavaPrettyPrinterExtension.java?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JavaPrettyPrinterExtension.java (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JavaPrettyPrinterExtension.java Sat Jul 1 17:01:42 2017
@@ -40,11 +40,6 @@ public class JavaPrettyPrinterExtension
* @param file
*/
protected void prettifyFile(File file) {
- // Special case jaxbri generated package-info.java
- // as jalopy corrupts the package level annotations
- if (file.getName().equals("package-info.java")) {
- return;
- }
PrettyPrinter.prettify(file);
}
}
Modified: axis/axis2/java/core/branches/google-java-format/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/distribution/pom.xml?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/distribution/pom.xml Sat Jul 1 17:01:42 2017
@@ -245,15 +245,6 @@
</exclusions>
</dependency>
- <!-- Jalopy is used by the PrettyPrinter class in the kernel,
- but it is invoked using reflection (and only if it is
- found on the classpath). Therefore it is not automatically
- added as a transitive dependency. -->
- <dependency>
- <groupId>jalopy</groupId>
- <artifactId>jalopy</artifactId>
- </dependency>
-
<!-- None of the Axis2 artifacts should have a dependency on log4j
because we don't want to impose a particular logging implementation
on our users. However, for the binary distribution, we need to
Modified: axis/axis2/java/core/branches/google-java-format/modules/jaxws-integration/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/jaxws-integration/test-resources/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/jaxws-integration/test-resources/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/jaxws-integration/test-resources/log4j.properties Sat Jul 1 17:01:42 2017
@@ -36,7 +36,6 @@ log4j.rootCategory=ERROR, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -58,4 +57,4 @@ log4j.appender.SMALL=org.apache.log4j.Fi
log4j.appender.SMALL.File=axis2.small.log
log4j.appender.SMALL.Append=true
log4j.appender.SMALL.layout=org.apache.log4j.PatternLayout
-log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/jaxws/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/jaxws/test-resources/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/jaxws/test-resources/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/jaxws/test-resources/log4j.properties Sat Jul 1 17:01:42 2017
@@ -35,7 +35,6 @@ log4j.rootCategory=ERROR, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -56,4 +55,4 @@ log4j.appender.SMALL=org.apache.log4j.Fi
log4j.appender.SMALL.File=axis2.small.log
log4j.appender.SMALL.Append=true
log4j.appender.SMALL.layout=org.apache.log4j.PatternLayout
-log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/kernel/conf/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/kernel/conf/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/kernel/conf/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/kernel/conf/log4j.properties Sat Jul 1 17:01:42 2017
@@ -23,7 +23,6 @@ log4j.rootCategory=INFO, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -37,4 +36,4 @@ log4j.appender.LOGFILE=org.apache.log4j.
log4j.appender.LOGFILE.File=axis2.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/metadata/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/metadata/test-resources/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/metadata/test-resources/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/metadata/test-resources/log4j.properties Sat Jul 1 17:01:42 2017
@@ -25,7 +25,6 @@ log4j.rootCategory=ERROR, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
Modified: axis/axis2/java/core/branches/google-java-format/modules/saaj/test-resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/saaj/test-resources/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/saaj/test-resources/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/saaj/test-resources/log4j.properties Sat Jul 1 17:01:42 2017
@@ -26,7 +26,6 @@ log4j.rootCategory=ERROR, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -40,4 +39,4 @@ log4j.appender.LOGFILE=org.apache.log4j.
log4j.appender.LOGFILE.File=axis2.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/samples/book/src/main/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/samples/book/src/main/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/samples/book/src/main/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/samples/book/src/main/log4j.properties Sat Jul 1 17:01:42 2017
@@ -23,7 +23,6 @@ log4j.rootCategory=INFO, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -37,4 +36,4 @@ log4j.appender.LOGFILE=org.apache.log4j.
log4j.appender.LOGFILE.File=axis2.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/samples/java_first_jaxws/src/webapp/WEB-INF/classes/log4j.properties Sat Jul 1 17:01:42 2017
@@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -38,4 +37,4 @@ log4j.appender.LOGFILE=org.apache.log4j.
log4j.appender.LOGFILE.File=axis2.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/samples/jaxws-samples/src/webapp/WEB-INF/classes/log4j.properties Sat Jul 1 17:01:42 2017
@@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -38,4 +37,4 @@ log4j.appender.LOGFILE=org.apache.log4j.
log4j.appender.LOGFILE.File=axis2.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Modified: axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-ant-plugin/src/test/resources/log4j.properties Sat Jul 1 17:01:42 2017
@@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
Modified: axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sat Jul 1 17:01:42 2017
@@ -140,10 +140,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jalopy</groupId>
- <artifactId>jalopy</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -163,8 +159,7 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <!-- Maven supports SLF4J, so use it. Note that Jalopy depends on log4j, but log4j-over-slf4j
- doesn't work since Jalopy uses reflection to manipulate log4j loggers. -->
+ <!-- Maven supports SLF4J, so use it. -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
Modified: axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/resources/log4j.properties?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/resources/log4j.properties (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/resources/log4j.properties Sat Jul 1 17:01:42 2017
@@ -24,7 +24,6 @@ log4j.rootCategory=INFO, CONSOLE
# Set the enterprise logger priority to FATAL
log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
Modified: axis/axis2/java/core/branches/google-java-format/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/pom.xml?rev=1800517&r1=1800516&r2=1800517&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/pom.xml (original)
+++ axis/axis2/java/core/branches/google-java-format/pom.xml Sat Jul 1 17:01:42 2017
@@ -523,7 +523,6 @@
<httpcore.version>4.4.6</httpcore.version>
<httpclient.version>4.5.3</httpclient.version>
<intellij.version>5.0</intellij.version>
- <jalopy.version>1.5rc3</jalopy.version>
<jaxb.api.version>2.2.6</jaxb.api.version>
<jaxbri.version>2.2.6</jaxbri.version>
<jettison.version>1.3.8</jettison.version>
@@ -1076,11 +1075,6 @@
<version>${bsf.version}</version>
</dependency>
<dependency>
- <groupId>jalopy</groupId>
- <artifactId>jalopy</artifactId>
- <version>${jalopy.version}</version>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons.lang.version}</version>