From 5866743e10d8ade755fffb1279db7594b13e69a4 Mon Sep 17 00:00:00 2001
From: Henri Yandell <bayard@apache.org>
Date: Sun, 28 Mar 2010 23:07:18 +0000
Subject: [PATCH] Removing M1 build, M2 build seems fine

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@928514 13f79535-47bb-0310-9956-ffa450edef68
---
 maven.xml   | 103 ------------------
 project.xml | 296 ----------------------------------------------------
 2 files changed, 399 deletions(-)
 delete mode 100644 maven.xml
 delete mode 100644 project.xml

diff --git a/maven.xml b/maven.xml
deleted file mode 100644
index 34e01f9..0000000
--- a/maven.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-<project default="jar:jar" xmlns:j="jelly:core">
-
-  <!-- ==================================================================
-    -   COMMONS-BUILD TWEAKS
-    -
-    -  Ensure commons-build stylesheets are copied into target directory
-    -  when executing the xdoc goal (part of the site goal), so that the
-    -  resulting website has the correct look-and-feel.
-    -
-    -  This goal assumes that commons-build is checked out as a sibling
-    -  to the directory we are doing the build in. 
-    -
-    -  Copy the release notes into the target directory, so that they
-    -  are available on the website.
-    ================================================================== -->
-
-  <postGoal name="xdoc:copy-resources">  
-    <copy todir="${basedir}/target/docs/" failonerror="false">
-      <fileset dir="${basedir}">
-        <include name='RELEASE-NOTES.txt'/>
-      </fileset>
-    </copy>
-  </postGoal>
-
-  <!-- ==================================================================
-    -  JAR tweaks
-    -
-    - Unit test tweaks
-    ================================================================== -->
-
-  <preGoal name="test:test">
-    <echo level="warning">
-      Unit testing cannot be done in Maven; the tests require classpaths and
-      system properties to be set differently for different unit tests which
-      Maven does not support. Please run "ant test" to execute the unit tests.
-    </echo>
-  </preGoal>
-  
-  <!-- ==================================================================
-    -  JAR tweaks
-    -
-    - Maven is designed to create only one jar file ("artifact") for each
-    - project.xml file. However we want to create a couple of additional
-    - jars that contain subsets of the main "commons-digester.jar" file.
-    - So here we arrange for those jars to be created.
-    -
-    - We unpack the main jar into a temp dir, then create a new jar file
-    - including or excluding the relevant files. This is simpler than
-    - trying to recreate an appropriate MANIFEST.MF file.
-    ================================================================== -->
-
-  <postGoal name="jar:jar">
-  
-    <j:set var="logging.api.work.dir">${maven.build.dir}/logging-api-work</j:set>
-
-    <delete dir="${logging.api.work.dir}"/>
-    <mkdir dir="${logging.api.work.dir}"/>
-    <unzip 
-      src="${maven.build.dir}/${maven.final.name}.jar" 
-      dest="${logging.api.work.dir}"/>
-    
-    <delete file="${maven.build.dir}/${maven.final.name}-api.jar"/>
-    <zip destfile="${maven.build.dir}/${maven.final.name}-api.jar"
-      index="${maven.jar.index}"
-      compress="${maven.jar.compress}">
-      <fileset dir="${logging.api.work.dir}">
-        <exclude name="**/AvalonLogger.class"/>
-        <exclude name="**/Jdk13LumberjackLogger.class"/>
-        <exclude name="**/Log4jFactory.class"/>
-        <exclude name="**/Log4JLogger.class"/>
-        <exclude name="**/LogKitLogger.class"/>
-      </fileset>
-    </zip>
-      
-    <delete file="${maven.build.dir}/${maven.final.name}-adapters.jar"/>
-    <zip destfile="${maven.build.dir}/${maven.final.name}-adapters.jar"
-      index="${maven.jar.index}"
-      compress="${maven.jar.compress}">
-      <fileset dir="${logging.api.work.dir}">
-        <include name="**/impl/**.class"/>
-      </fileset>
-    </zip>
-  </postGoal>  
-</project>
diff --git a/project.xml b/project.xml
deleted file mode 100644
index e35d305..0000000
--- a/project.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project>
-  <pomVersion>3</pomVersion>
-  
-  <name>Logging</name>
-  <groupId>commons-logging</groupId>
-  <artifactId>commons-logging</artifactId>
-  <currentVersion>1.1.1-SNAPSHOT</currentVersion>
-  <inceptionYear>2001</inceptionYear>
-  <shortDescription>Commons Logging</shortDescription>
-  <description>
-    Commons Logging is a thin adapter allowing configurable bridging to other,
-    well known logging systems.
-  </description>
-  <logo>/images/logo.png</logo>
-  
-  <url>http://commons.apache.org/logging/</url>
-  <package>org.apache.commons.logging</package>
-
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://commons.apache.org/</url>
-    <logo>http://commons.apache.org/images/logo.png</logo>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  
-  <gumpRepositoryId>commons</gumpRepositoryId>
-  <issueTrackingUrl>http://issues.apache.org/jira/browse/LOGGING</issueTrackingUrl>
-  <siteAddress>people.apache.org</siteAddress>
-  <siteDirectory>/www/commons.apache.org/logging/</siteDirectory>
-  <distributionDirectory>/www/people.apache.org/builds/commons/logging/</distributionDirectory>
-  
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/trunk/</connection>
-    <url>http://svn.apache.org/repos/asf/commons/proper/logging/trunk/</url>
-  </repository>
-  
-  <versions>
-      <version>
-          <id>1.0.1</id>
-          <name>1.0.1</name>
-          <tag>LOGGING_1_0_1</tag>
-      </version>
-      <version>
-          <id>1.0.2</id>
-          <name>1.0.2</name>
-          <tag>LOGGING_1_0_2</tag>
-      </version>      
-      <version>
-          <id>1.0.3</id>
-          <name>1.0.3</name>
-          <tag>LOGGING_1_0_3</tag>
-      </version>
-      <version>
-          <id>1.0.4</id>
-          <name>1.0.4</name>
-          <tag>LOGGING_1_0_4</tag>
-      </version>
-      <version>
-          <id>1.1</id>
-          <name>1.1</name>
-          <tag>LOGGING_1_1_0</tag>
-      </version>
-  </versions>
-  
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>dev-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>user-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <developers>
-    <developer>
-      <name>Morgan Delagrange</name>
-      <id>morgand</id>
-      <email>morgand at apache dot org</email>
-      <organization>Apache</organization>
-      <roles><role>Java Developer</role></roles>
-    </developer>
-    <developer>
-      <name>Rodney Waldhoff</name>
-      <id>rwaldhoff</id>
-      <email>rwaldhoff at apache org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Craig McClanahan</name>
-      <id>craigmcc</id>
-      <email>craigmcc at apache org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Scott Sanders</name>
-      <id>sanders</id>
-      <email>sanders at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Robert Burrell Donkin</name>
-      <id>rdonkin</id>
-      <email>rdonkin at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Peter Donald</name>
-      <id>donaldp</id>
-      <email>donaldp at apache dot org</email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <name>Costin Manolache</name>
-      <id>costin</id>
-      <email>costin at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Richard Sitze</name>
-      <id>rsitze</id>
-      <email>rsitze at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Juozas Baliuka</name>
-      <id>baliuka</id>
-      <email>baliuka@apache.org</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Simon Kitching</name>
-      <id>skitching</id>
-      <email>skitching@apache.org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Dennis Lundberg</name>
-      <id>dennisl</id>
-      <email>dennisl@apache.org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <name>Brian Stansberry</name>
-      <id>bstansberry</id>
-    </developer>
-  </developers>
-  
-  <dependencies>
-    
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <url>http://logging.apache.org/log4j/docs/index.html</url>
-      <properties>
-        <comment>
-Runtime Optional. 
-1.2.12 required for compilation but 1.2.6 onwards supported at runtime.
-        </comment>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>logkit</groupId>
-      <artifactId>logkit</artifactId>
-      <version>1.0.1</version>
-      <url>http://avalon.apache.org/logkit/</url>
-      <properties>
-        <comment>Runtime Optional</comment>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <url>http://www.junit.org/index.htm</url>
-      <properties>
-        <comment>Used for testing only.</comment>
-        <scope>test</scope>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework</artifactId>
-      <version>4.1.3</version>
-      <url>http://avalon.apache.org/</url>
-      <properties>
-        <comment>Runtime Optional</comment>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
-      <url>http://java.sun.com/products/servlet/</url>
-      <properties>
-        <comment>Used only by servlet filter. Not used by core logging implementation.</comment>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>maven</groupId>
-      <artifactId>maven-xdoc-plugin</artifactId>
-      <version>1.9.2</version>
-      <url>http://maven.apache.org/maven-1.x/reference/plugins/xdoc/</url>
-      <type>plugin</type>
-      <properties>
-        <comment>
-          &lt;strong&gt;Site Only&lt;/strong&gt; - v1.9.2 (minimum)
-        </comment>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-  </dependencies>
-  <build>
-    <nagEmailAddress>dev@commons.apache.org</nagEmailAddress>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <sourceModifications>
-      <sourceModification>
-        <className>java.util.logging.Logger</className>
-        <excludes>
-          <exclude>**/Jdk14Logger.java</exclude>
-        </excludes>
-      </sourceModification>
-    </sourceModifications>
-    <unitTest>
-      <!--
-At the moment there are problems running the unit tests under maven.
-The unit tests are run by custom ant targets which perform configuration
-before the tests are run.
-There is no easy way to run these under maven at the moment.
-      -->
-      <includes>
-        <include>**/AvalonLoggerTest.java</include>
-      </includes>
-    </unitTest>
-  </build>
-
-  <reports>
-    <report>maven-checkstyle-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jdepend-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-license-plugin</report>
-    <!-- Slow but useful when checking releases 
-    <report>maven-linkcheck-plugin</report>
-    -->
-
-  </reports>
-  
-</project>