You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2014/07/31 16:31:26 UTC

svn commit: r1614908 - in /logging/log4j/log4j2/trunk: log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java src/changes/changes.xml

Author: rpopma
Date: Thu Jul 31 14:31:25 2014
New Revision: 1614908

URL: http://svn.apache.org/r1614908
Log:
LOG4J2-75 Prevent JUnit test from creating unnecessary Log4j2Plugins.dat file during build.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java?rev=1614908&r1=1614907&r2=1614908&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/PluginManagerPackagesTest.java Thu Jul 31 14:31:25 2014
@@ -97,7 +97,9 @@ public class PluginManagerPackagesTest {
         Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(Arrays.asList(f));
 
         // compile generated source
-        compiler.getTask(null, fileManager, diagnostics, null, null, compilationUnits).call();
+        // (switch off annotation processing: no need to create Log4j2Plugins.dat)
+        List<String> options = Arrays.asList("-proc:none");
+        compiler.getTask(null, fileManager, diagnostics, options, null, compilationUnits).call();
 
         // check we don't have any compilation errors
         List<String> errors = new ArrayList<String>();

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1614908&r1=1614907&r2=1614908&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Thu Jul 31 14:31:25 2014
@@ -21,6 +21,11 @@
     <title>Changes</title>
   </properties>
   <body>
+    <release version="2.1" date="2014-0?-??" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-756" dev="rpopma" type="fix" due-to="Scott Harrington">
+        Prevent JUnit test from creating unnecessary Log4j2Plugins.dat during build.
+      </action>      
+    </release> 
     <release version="2.0.1" date="2014-07-29" description="Bug fixes">
       <action issue="LOG4J2-744" dev="rpopma" type="fix" due-to="Scott Harrington">
         Avoid unnecessary Clock calls when TimestampMessage is logged.