You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2013/11/30 07:39:51 UTC

svn commit: r1546689 - in /logging/log4net/trunk: doc/ doc/site/ doc/site/pom.xml doc/site/src/ pom.xml src/assembly/ src/changes/ src/site/

Author: bodewig
Date: Sat Nov 30 06:39:50 2013
New Revision: 1546689

URL: http://svn.apache.org/r1546689
Log:
LOG4NET-71 move site stuff, untested so far

Added:
    logging/log4net/trunk/doc/
    logging/log4net/trunk/doc/site/
    logging/log4net/trunk/doc/site/pom.xml
      - copied, changed from r1546688, logging/log4net/trunk/pom.xml
    logging/log4net/trunk/doc/site/src/
      - copied from r1546688, logging/log4net/trunk/src/site/
Removed:
    logging/log4net/trunk/pom.xml
    logging/log4net/trunk/src/assembly/
    logging/log4net/trunk/src/changes/
    logging/log4net/trunk/src/site/

Copied: logging/log4net/trunk/doc/site/pom.xml (from r1546688, logging/log4net/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/doc/site/pom.xml?p2=logging/log4net/trunk/doc/site/pom.xml&p1=logging/log4net/trunk/pom.xml&r1=1546688&r2=1546689&rev=1546689&view=diff
==============================================================================
--- logging/log4net/trunk/pom.xml (original)
+++ logging/log4net/trunk/doc/site/pom.xml Sat Nov 30 06:39:50 2013
@@ -20,7 +20,7 @@
   <groupId>log4net</groupId>
   <artifactId>apache-log4net</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.13-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <name>Apache log4net</name>
   <description>Logging framework for Microsoft .NET Framework.</description>
   <url>http://logging.apache.org/log4net/</url>
@@ -85,30 +85,28 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.8</version>
+        <version>0.10</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.3</version>
         <configuration>
-
           <!-- Override default rendering (only required to add a custom footer) -->
           <!-- This can be removed once <footer> tag is supported in site.xml.  -->
-          <templateFile>${basedir}/src/site/site.vm</templateFile>
-          <!-- Configure additional reports on the site -->
+          <templateFile>${basedir}/src/site.vm</templateFile>
+          <siteDirectory>${basedir}/src</siteDirectory>
+          <siteDirectory>${basedir}/target</siteDirectory>
           <reportPlugins>
-            <!-- Project info report -->
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.4</version>
+              <version>2.7</version>
               <reportSets>
                 <reportSet>
                   <reports>
                     <report>cim</report>	
                     <report>scm</report>
-                    <report>dependencies</report>
                     <report>license</report>
                     <report>project-team</report>
                     <report>issue-tracking</report>
@@ -123,7 +121,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.4</version>
+        <version>1.7</version>
         <executions>
           <execution>
             <phase>install</phase>
@@ -132,7 +130,7 @@
             </goals>
             <configuration>
               <tasks>
-                <fixcrlf srcDir="target/site" excludes="images/**"/>
+                <fixcrlf srcDir="target" excludes="images/**"/>
               </tasks>
             </configuration>
           </execution>
@@ -141,7 +139,7 @@
           <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.8.2</version>
+            <version>1.9.2</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -154,23 +152,19 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.7</version>
+        <version>0.10</version>
         <configuration>
+          <baseDir>${basedir}/../..</baseDir>
           <excludes>
             <!-- generated files -->
             <exclude>**/*.suo</exclude>
             <exclude>**/*.user</exclude>
             <exclude>**/obj/**</exclude>
-            <exclude>bin/**</exclude>
             <exclude>build/**</exclude>
-            <exclude>doc/sdk/**</exclude>
-            <exclude>src/log4net.xml</exclude>
-            <exclude>src/GeneratedAssemblyInfo.cs</exclude>
-            <exclude>tests/bin/**</exclude>
+            <exclude>doc/site/target/**</exclude>
 
             <!-- really README files -->
             <exclude>*.snk*</exclude>
-            <exclude>tests/lib/prerequisites.txt</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -243,14 +237,4 @@
       <name>Jarrod Alexander</name>
     </contributor>
   </contributors>
-
-  <dependencies>
-  </dependencies>
-
-  <distributionManagement>
-    <site>
-      <id>logging.site</id>
-      <url>file:///${user.dir}/target/site-deploy</url>
-    </site>
-  </distributionManagement> 
 </project>