logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sde...@apache.org
Subject svn commit: r945512 - in /logging/log4j/trunk: build.xml pom.xml tests/build.xml
Date Tue, 18 May 2010 06:21:54 GMT
Author: sdeboy
Date: Tue May 18 06:21:54 2010
New Revision: 945512

URL: http://svn.apache.org/viewvc?rev=945512&view=rev
Log:
Maven and build fixes to allow log4j, Chainsaw and companions (minus ZeroConf) to be built
without requiring manual installation of any maven depdencies
 - replaced log4j 1.2.16-SNAPSHOT references with log4j 1.2.16
 - added java.net repository information to automatically provide javamail maven dependency
(java.net repo provide javamail 1.4.3, so all javamail refs were updated to 1.4.3)
 - added openejb maven dependency information to support javaee class dependencies
 - updated 'version' property to 1.2.16
 - removed zeroconf maven dependency from Chainsaw, added jmdns 1.0 maven dependency

All modules build (including tests) on Fedora 11.

Modified:
    logging/log4j/trunk/build.xml
    logging/log4j/trunk/pom.xml
    logging/log4j/trunk/tests/build.xml

Modified: logging/log4j/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/build.xml?rev=945512&r1=945511&r2=945512&view=diff
==============================================================================
--- logging/log4j/trunk/build.xml (original)
+++ logging/log4j/trunk/build.xml Tue May 18 06:21:54 2010
@@ -29,7 +29,7 @@
   <!--   if a Maven build has been attempted,
               the Maven repository can provide all the dependencies.  -->
   <property name="m2_repo" location="${user.home}/.m2/repository"/>
-  <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4/mail-1.4.jar"/>
+  <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4.3/mail-1.4.3.jar"/>
   <property name="geronimo-jms.jar"
          value="${m2_repo}/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0/geronimo-jms_1.1_spec-1.0.jar"/>
   <available property="jms.jar" value="${geronimo-jms.jar}" file="${geronimo-jms.jar}"/>
@@ -41,7 +41,7 @@
   <!-- prefixed with "env". -->
   <property environment="env"/>
 
-  <property name="version" value="1.2.15"/>
+  <property name="version" value="1.2.16"/>
 
   <!-- The base directory relative to which most targets are built -->
   <property name="base" value="."/>

Modified: logging/log4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/pom.xml?rev=945512&r1=945511&r2=945512&view=diff
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Tue May 18 06:21:54 2010
@@ -309,8 +309,6 @@ target platform and specify -Dntdll_targ
             <scope>system</scope>
             <systemPath>${tools.jar}</systemPath>
           </dependency>
- 
-
         </dependencies>
       </plugin>
       <plugin>
@@ -457,14 +455,27 @@ target platform and specify -Dntdll_targ
     </profile>
   </profiles>
   <repositories>
+    <repository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2/</url>
+      <layout>default</layout>
+    </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1</version>
+      <version>1.4.3</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>5.0-2</version>
+      <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>

Modified: logging/log4j/trunk/tests/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/build.xml?rev=945512&r1=945511&r2=945512&view=diff
==============================================================================
--- logging/log4j/trunk/tests/build.xml (original)
+++ logging/log4j/trunk/tests/build.xml Tue May 18 06:21:54 2010
@@ -34,7 +34,7 @@
   <property name="jakarta.oro.jar" location="${m2_repo}/oro/oro/${oro.version}/oro-${oro.version}.jar"/>
   <property name="checkstyle.version" value="4.1"/>
   <property name="checkstyle.jar" location="${m2_repo}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}.jar"/>
-  <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4/mail-1.4.jar"/>
+  <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4.3/mail-1.4.3.jar"/>
   <property name="activation.jar" location="${m2_repo}/javax/activation/activation/1.1/activation-1.1.jar"/>
   <property name="junit.version" value="3.8.1"/>
   <property name="junit.jar" location="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message