logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1343080 - /logging/log4j/trunk/pom.xml
Date Sun, 27 May 2012 19:30:18 GMT
Author: ggregory
Date: Sun May 27 19:30:18 2012
New Revision: 1343080

URL: http://svn.apache.org/viewvc?rev=1343080&view=rev
Log:
Format consistently (no tabs, 2 spaces indent).

Modified:
    logging/log4j/trunk/pom.xml

Modified: logging/log4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/pom.xml?rev=1343080&r1=1343079&r2=1343080&view=diff
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Sun May 27 19:30:18 2012
@@ -26,7 +26,8 @@ To build NTEventLogAppender.dll using Mi
 target platform and specify -Dntdll_target=msbuild on the mvn command line.
 
 -->        
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>log4j</groupId>
   <artifactId>log4j</artifactId>
@@ -125,14 +126,12 @@ target platform and specify -Dntdll_targ
             <include>org/apache/log4j/xml/DOMTestCase.java</include>
             <include>org/apache/log4j/xml/CustomLevelTestCase.java</include>
             <include>org/apache/log4j/customLogger/XLoggerTestCase.java</include>
-            <!-- DefaultInit  -->
+            <!-- DefaultInit -->
             <!-- SocketServer -->
             <include>org/apache/log4j/xml/XMLLayoutTestCase.java</include>
             <include>org/apache/log4j/xml/AsyncAppenderTestCase.java</include>
             <include>org/apache/log4j/varia/LevelMatchFilterTestCase.java</include>
-            <!--   ErrorHandlerTestCase is not run in Ant build either
-            <include>org/apache/log4j/varia/ErrorHandlerTestCase.java</include>
-            -->
+            <!-- ErrorHandlerTestCase is not run in Ant build either <include>org/apache/log4j/varia/ErrorHandlerTestCase.java</include>
-->
             <!-- include>org/apache/log4j/helpers/OptionConverterTestCase.java</include
-->
             <include>org/apache/log4j/helpers/BoundedFIFOTestCase.java</include>
             <include>org/apache/log4j/helpers/CyclicBufferTestCase.java</include>
@@ -165,7 +164,7 @@ target platform and specify -Dntdll_targ
               <manifestSection>
                 <name>org.apache.log4j</name>
                 <manifestEntries>
-		          <DynamicImport-Package>*</DynamicImport-Package>
+                  <DynamicImport-Package>*</DynamicImport-Package>
                   <Implementation-Title>log4j</Implementation-Title>
                   <Implementation-Version>${project.version}</Implementation-Version>
                   <Implementation-Vendor>"Apache Software Foundation"</Implementation-Vendor>
@@ -179,7 +178,7 @@ target platform and specify -Dntdll_targ
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.2</version>
         <executions>
-          <!--   generate NTEventLogAppender.dll    -->
+          <!-- generate NTEventLogAppender.dll -->
           <execution>
             <phase>process-classes</phase>
             <id>ntdll</id>
@@ -197,7 +196,7 @@ target platform and specify -Dntdll_targ
               <goal>run</goal>
             </goals>
           </execution>
-          <!--   create tests/output prior to test run    -->
+          <!-- create tests/output prior to test run -->
           <execution>
             <phase>test-compile</phase>
             <id>mkdir_tests_output</id>
@@ -228,7 +227,7 @@ target platform and specify -Dntdll_targ
             <id>runAll</id>
             <configuration>
               <tasks>
-                 <ant dir="tests" target="runAll">
+                <ant dir="tests" target="runAll">
                   <property name="m2_repo" location="${m2_repo}" />
                   <property name="log4j.jar" location="target/classes" />
                   <property name="project.lib.home" location="target" />
@@ -239,14 +238,15 @@ target platform and specify -Dntdll_targ
               <goal>run</goal>
             </goals>
           </execution>
-          <!--   release builds will put SVN tags into the SCM page, this changes it back
to trunk  -->
+          <!-- release builds will put SVN tags into the SCM page, this changes it back
to trunk -->
           <execution>
             <phase>site</phase>
             <id>untag-site</id>
             <configuration>
               <tasks>
                 <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
/>
-                <replaceregexp file="target/site/source-repository.html" match="/tags/[^
&quot;'&lt;]*" replace="/trunk" flags="g" />
+                <replaceregexp file="target/site/source-repository.html" match="/tags/[^
&quot;'&lt;]*"
+                  replace="/trunk" flags="g" />
                 <replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated
by \1 --" flags="g">
                   <fileset dir="target/site/apidocs" includes="**/*.html" />
                 </replaceregexp>
@@ -365,7 +365,7 @@ target platform and specify -Dntdll_targ
           </execution>
           <execution>
             <id>site</id>
-	    <phase>pre-site</phase>
+            <phase>pre-site</phase>
             <goals>
               <goal>javadoc</goal>
             </goals>
@@ -375,10 +375,7 @@ target platform and specify -Dntdll_targ
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <version>2.0-beta-9</version>
-        <!--
-          Bug MRELEASE-273 has been throwing NPE during release:perform,
-          typically after deploy so this places it last.
-        -->
+        <!-- Bug MRELEASE-273 has been throwing NPE during release:perform, typically
after deploy so this places it last. -->
         <configuration>
           <goals>package site-deploy assembly:attached deploy</goals>
         </configuration>
@@ -394,13 +391,8 @@ target platform and specify -Dntdll_targ
           </execution>
         </executions>
       </plugin>
-      <!--
-        clirr:check will fail with NullPointerException
-        due to missing javax.jms.MessageListener,
-        however it will trigger download of supporting components
-        which can allow "ant clirr" to succeed.
-        Could possibly run on a JavaEE platform.
-       -->
+      <!-- clirr:check will fail with NullPointerException due to missing javax.jms.MessageListener,
however it will trigger 
+        download of supporting components which can allow "ant clirr" to succeed. Could possibly
run on a JavaEE platform. -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
@@ -414,11 +406,11 @@ target platform and specify -Dntdll_targ
         <artifactId>rat-maven-plugin</artifactId>
         <version>1.0-alpha-3</version>
         <configuration>
-            <excludes>
-                <exclude>tests/witness/**</exclude>
-                <exclude>tests/output/**</exclude>
-                <exclude>tests/classes/**</exclude>
-            </excludes>
+          <excludes>
+            <exclude>tests/witness/**</exclude>
+            <exclude>tests/output/**</exclude>
+            <exclude>tests/classes/**</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -427,35 +419,35 @@ target platform and specify -Dntdll_targ
         <version>2.1.0</version>
         <extensions>true</extensions>
         <configuration>
-            <instructions>
-                <!-- omit chainsaw and LF5   -->
-                <Export-Package>!org.apache.log4j.lf5.*,
-                                !org.apache.log4j.chainsaw.*,
-                                org.apache.log4j.*;version=1.2.17;-noimport:=true</Export-Package>
-		<!--  all other potential imports are covered by DynamicImport-Package earlier -->
-		<Import-Package>!javax.swing.*,
-				!com.ibm.uvm.tools.*,
-				!com.sun.jdmk.comm.*,
-				javax.jmdns.*;resolution:=optional,
-				javax.jms.*;resolution:=optional,
-				javax.mail.*;resolution:=optional,
-                                *</Import-Package>
-                <Bundle-DocURL>http://logging.apache.org/log4j/1.2</Bundle-DocURL>
-            </instructions>
+          <instructions>
+            <!-- omit chainsaw and LF5 -->
+            <Export-Package>!org.apache.log4j.lf5.*,
+              !org.apache.log4j.chainsaw.*,
+              org.apache.log4j.*;version=1.2.17;-noimport:=true</Export-Package>
+            <!-- all other potential imports are covered by DynamicImport-Package earlier
-->
+            <Import-Package>!javax.swing.*,
+              !com.ibm.uvm.tools.*,
+              !com.sun.jdmk.comm.*,
+              javax.jmdns.*;resolution:=optional,
+              javax.jms.*;resolution:=optional,
+              javax.mail.*;resolution:=optional,
+              *</Import-Package>
+            <Bundle-DocURL>http://logging.apache.org/log4j/1.2</Bundle-DocURL>
+          </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-	       <templateFile>${basedir}/src/site/maven-site.vm</templateFile>
-           <excludeDefaults>true</excludeDefaults>
+          <templateFile>${basedir}/src/site/maven-site.vm</templateFile>
+          <excludeDefaults>true</excludeDefaults>
         </configuration>
         <executions>
           <execution>
-		      <phase>package</phase>		
+            <phase>package</phase>
             <goals>
-               <goal>site</goal>
+              <goal>site</goal>
             </goals>
           </execution>
         </executions>
@@ -470,37 +462,37 @@ target platform and specify -Dntdll_targ
   </build>
   <reporting>
     <plugins>
-    <plugin>
+      <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>2.4</version>
         <reportSets>
-        <reportSet>
+          <reportSet>
             <reports>
-            <report>scm</report>
-            <report>dependencies</report>
-            <report>cim</report>
-            <report>issue-tracking</report>
-            <report>mailing-list</report>
-            <report>license</report>
+              <report>scm</report>
+              <report>dependencies</report>
+              <report>cim</report>
+              <report>issue-tracking</report>
+              <report>mailing-list</report>
+              <report>license</report>
             </reports>
-        </reportSet>
+          </reportSet>
         </reportSets>
-    </plugin>
-    <plugin>
+      </plugin>
+      <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
         <version>2.1</version>
-    </plugin>
-    <plugin>
+      </plugin>
+      <plugin>
         <artifactId>maven-changes-plugin</artifactId>
         <version>2.7</version>
         <reportSets>
-        <reportSet>
+          <reportSet>
             <reports>
-            <report>changes-report</report>
+              <report>changes-report</report>
             </reports>
-        </reportSet>
+          </reportSet>
         </reportSets>
-    </plugin>
+      </plugin>
     </plugins>
   </reporting>
   <profiles>
@@ -551,14 +543,8 @@ target platform and specify -Dntdll_targ
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-    <!--  the following dependency is not needed on JDK 1.5 and higher 
-    <dependency>
-      <groupId>com.sun.jmx</groupId>
-      <artifactId>jmxri</artifactId>
-      <version>1.2.1</version>
-      <optional>true</optional>
-    </dependency>
-    -->
+    <!-- the following dependency is not needed on JDK 1.5 and higher <dependency>
<groupId>com.sun.jmx</groupId> <artifactId>jmxri</artifactId> 
+      <version>1.2.1</version> <optional>true</optional> </dependency>
-->
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
@@ -577,7 +563,7 @@ target platform and specify -Dntdll_targ
       <version>1.0</version>
       <optional>true</optional>
     </dependency>
- </dependencies>
+  </dependencies>
   <distributionManagement>
     <repository>
       <id>logging.repo</id>



Mime
View raw message