Author: grobmeier
Date: Tue Oct 9 12:22:37 2012
New Revision: 1395992
URL: http://svn.apache.org/viewvc?rev=1395992&view=rev
Log:
made apache pom the parent pom of extras. Removed unnecessary tags and copied
the dependencies from the old parent to this one.
Modified:
logging/log4j/companions/extras/trunk/pom.xml
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=1395992&r1=1395991&r2=1395992&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Tue Oct 9 12:22:37 2012
@@ -18,10 +18,9 @@
<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>
<parent>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-companions-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../apache-log4j-companions-parent</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>11</version>
</parent>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
@@ -66,22 +65,12 @@
</otherArchives>
</mailingList>
</mailingLists>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/extras/tags/apache-log4j-extras-1.1</url>
</scm>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
+
<!--+
| BUILD PLUGINS
+-->
@@ -264,72 +253,34 @@
<goals>package site-deploy assembly:attached deploy</goals>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <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/[^ "'<]*" replace="/trunk" flags="g"/>
- <replaceregexp match="-- Generated by (.*) on .*--"
replace="-- Generated by \1 --" flags="g">
- <fileset dir="target/site/apidocs" includes="**/*.html"/>
- </replaceregexp>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <phase>post-site</phase>
- <id>post-site</id>
- <configuration>
- <tasks>
- <ant target="post-site"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <phase>site-deploy</phase>
- <id>site-deploy</id>
- <configuration>
- <tasks>
- <ant target="site-deploy"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b2</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
@@ -342,6 +293,7 @@
<optional>true</optional>
</dependency>
</dependencies>
+ <!--
<distributionManagement>
<repository>
<id>logging.repo</id>
@@ -352,4 +304,5 @@
<url>scp://localhost/${user.dir}/target/site-deploy</url>
</site>
</distributionManagement>
+ -->
</project>
