You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/05/16 23:23:04 UTC
svn commit: r538742 - in /logging/log4j/branches/v1_2-branch: build.xml
pom.xml
Author: carnold
Date: Wed May 16 14:23:03 2007
New Revision: 538742
URL: http://svn.apache.org/viewvc?view=rev&rev=538742
Log:
Bug 37930: Update build.xml, Mac tools.jar fix, mvn manifest fix
Modified:
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.xml
Modified: logging/log4j/branches/v1_2-branch/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.xml?view=diff&rev=538742&r1=538741&r2=538742
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Wed May 16 14:23:03 2007
@@ -29,7 +29,9 @@
<!-- 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="javaee-api.jar" location="${m2_repo}/javaee/javaee-api/5/javaee-api-5.jar"/>
+ <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <property name="jms.jar" location="${m2_repo}/javax/jms/jms/1.1/jms-1.1.jar"/>
+ <property name="jmx.jar" location="${m2_repo}/com/sun/jmx/jmxri/1.2.1/jmxri-1.2.1.jar"/>
<property name="jmx-extra.jar" location="${m2_repo}/com/sun/jdmk/jmxtools/1.2.1/jmxtools-1.2.1.jar"/>
@@ -89,9 +91,6 @@
<!-- Some targets needs a more precise stem. -->
<property name="BSTEM" value="${java.source.dir}/${stem}"/>
- <!-- Original manifest.mf file before filtering. -->
- <property name="manifest.src" value="build/manifest.mf"/>
-
<!-- Directory where release images go. -->
<property name="dist.images" value="${dist.dir}/images"/>
@@ -455,20 +454,12 @@
<!-- dependencies. -->
<!-- ================================================================= -->
<target name="jar" depends="log4j.jar, log4j-sources.jar">
- <delete file="${jar.dest}/manifest.mf"/>
- </target>
-
- <target name="prejar" depends="init">
- <mkdir dir="${jar.dest}"/>
- <filter token="version" value="${version}" />
- <copy file="${manifest.src}" tofile="${jar.dest}/manifest.mf"
- filtering="true"/>
</target>
<!-- ================================================================= -->
<!-- Create log4j.jar, excluding tests and other odds and ends. -->
<!-- ================================================================= -->
- <target name="log4j.jar" depends="build, prejar">
+ <target name="log4j.jar" depends="build">
<delete>
<fileset dir="${jar.dest}">
<include name="${jar.filename}"/>
@@ -495,8 +486,14 @@
${stem}/or/sax/*.class,
${stem}/or/jms/*.class,
${stem}/config/*.class"
- excludes="**/UnitTest**"
- manifest="${jar.dest}/manifest.mf">
+ excludes="**/UnitTest**">
+ <manifest>
+ <section name="org/apache/log4j">
+ <attribute name="Implementation-Title" value="log4j"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value='"Apache Software Foundation"'/>
+ </section>
+ </manifest>
<metainf dir="." includes="NOTICE,LICENSE"/>
</jar>
</target>
@@ -505,15 +502,21 @@
<!-- ================================================================= -->
<!-- Create log4j-sources.jar -->
<!-- ================================================================= -->
- <target name="log4j-sources.jar" depends="prejar">
+ <target name="log4j-sources.jar">
<delete>
<fileset dir="${jar.dest}" includes="${sources-jar.filename}"/>
</delete>
<jar jarfile="${jar.dest}/${sources-jar.filename}" basedir="${java.source.dir}"
- includes="**/*.java"
- manifest="${jar.dest}/manifest.mf">
- <metainf dir="." includes="NOTICE,LICENSE"/>
+ includes="**/*.java">
+ <manifest>
+ <section name="org/apache/log4j">
+ <attribute name="Implementation-Title" value="log4j"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value='"Apache Software Foundation"'/>
+ </section>
+ </manifest>
+ <metainf dir="." includes="NOTICE,LICENSE"/>
</jar>
</target>
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=538742&r1=538741&r2=538742
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Wed May 16 14:23:03 2007
@@ -145,9 +145,16 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
+ <manifestSections>
+ <manifestSection>
+ <name>org.apache.log4j</name>
+ <manifestEntries>
+ <Implementation-Title>log4j</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>"Apache Software Foundation"</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
</archive>
</configuration>
</plugin>
@@ -250,6 +257,13 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.4.2</version>
+ <scope>system</scope>
+ <systemPath>${tools.jar}</systemPath>
+ </dependency>
</dependencies>
</plugin>
<plugin>
@@ -298,25 +312,23 @@
</build>
<profiles>
<profile>
- <!-- NOTE: This will not be activated on OS X, since classes.jar
-already has the tools in it. -->
- <id>default-tools.jar</id>
+ <id>mac</id>
<activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
+ <os><family>mac</family></os>
</activation>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
+ <properties>
+ <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
+ </properties>
</profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
+ </properties>
+ </profile>
</profiles>
<repositories>
<repository>
@@ -404,11 +416,11 @@
</reporting>
<distributionManagement>
<repository>
- <id>log4j12.builds</id>
- <url>scp://people.apache.org/www/people.apache.org/builds/logging/log4j/${project.version}/</url>
+ <id>logging.repo</id>
+ <url>scp://people.apache.org/www/people.apache.org/builds/logging/repo/</url>
</repository>
<site>
- <id>log4j12.website</id>
+ <id>logging.site</id>
<url>scp://people.apache.org/www/logging.apache.org/log4j/1.2/</url>
</site>
</distributionManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org