Commit patches provided by Antonio Petrelli - thanks Antonio
Bugzilla issues:
47595: POMs of companions have problems
47599: TestLogMF fails with Italian locale
47600: ConnectionSourceSkeleton does not close connection after discovery
47615: The DB Appender does not work under Oracle
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/companions/component/trunk@821364 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index e9018de..2873718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.2</source>
- <target>1.1</target>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
</plugin>
<plugin>
@@ -115,7 +115,7 @@
<id>untag-site</id>
<configuration>
<tasks>
- <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
+ <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"/>
@@ -163,7 +163,7 @@
<version>1.0b2</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -174,6 +174,7 @@
</configuration>
<executions>
<execution>
+ <phase>package</phase>
<goals>
<goal>assembly</goal>
</goals>
@@ -200,7 +201,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -214,10 +215,28 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
- </dependency>
+ <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>
</dependencies>
<reporting>
- <excludeDefaults>true</excludeDefaults>
+ <excludeDefaults>true</excludeDefaults>
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -256,7 +275,7 @@
<configuration>
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
@@ -274,5 +293,5 @@
<id>logging.site</id>
<url>scp://localhost/${user.dir}/target/site-deploy</url>
</site>
- </distributionManagement>
+ </distributionManagement>
</project>