You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2021/12/23 16:26:30 UTC
[logging-log4j1] 01/01: [maven-release-plugin] copy for tag v1_2_15_rc3
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to annotated tag v1_2_15_rc3
in repository https://gitbox.apache.org/repos/asf/logging-log4j1.git
commit baa463abc7edf7a4a55758091b80979431967750
Author: Curtis William Arnold <ca...@apache.org>
AuthorDate: Thu Jun 21 01:36:59 2007 +0000
[maven-release-plugin] copy for tag v1_2_15_rc3
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc3@549321 13f79535-47bb-0310-9956-ffa450edef68
---
BUILD-INFO.txt | 44 ++++++++++-------
pom.xml | 10 ++--
src/assembly/bin.xml | 19 ++++----
src/ntdll/build.xml | 3 ++
tests/build.xml | 5 +-
tests/run-tests.bat | 131 ++++++++++++++++++++++++++++-----------------------
6 files changed, 122 insertions(+), 90 deletions(-)
diff --git a/BUILD-INFO.txt b/BUILD-INFO.txt
index 94e4518..253c8fa 100644
--- a/BUILD-INFO.txt
+++ b/BUILD-INFO.txt
@@ -1,26 +1,34 @@
-This is the build information for the current log4j release. It contains the
-versions of tools and jars used to build this version of the log4j library.
+This is a detailed instruction to reproduce the log4j distribution
+either to verify that the release is reproducable or to prepare
+a hot-fix.
-Maven - 2.0.6; Available from http://maven.apache.org
-MinGW - MinGW-3.1.0-1.exe; Available from http://mingw.sourceforge.net/downloads.html (used to build NTEventLogAppender.dll)
-JDK - jdk1.4.2_13; Available from http://java.sun.com/products/archive/
-Windows 2000 SP4
+Install VMWare Player or Workstation appropriate for machine.
-JMX 1.2.1 Reference Implementation must be downloaded
-from http://java.sun.com/products/JavaManagement/download.html
-and lib/jmxtools.jar and lib/jmxri.jar installed with the
-following commands:
+Download Ubuntu-6.06-1 desktop from http://www.vmware.com/vmtn/appliances/directory/ubuntu.html
- mvn install:install-file -DgroupId=com.sun.jdmk -DartifactId=jmxtools \
- -Dversion=1.2.1 -Dpackaging=jar -Dfile=/path/to/jmxtools.jar
-
- mvn install:install-file -DgroupId=com.sun.jmx -DartifactId=jmxri \
- -Dversion=1.2.1 -Dpackaging=jar -Dfile=/path/to/jmxri.jar
+Launch Ubuntu 6.06-1 in VMWare Player (user name and password are ubuntu)
-JMS 1.1 must be downloaded from http://java.sun.com/products/jms/docs.html
+Launch Synaptics Package Manager (System > Administration > Synaptic Package Manager), select all available repositories (Settings > Repositories), press Reload button to update list of available packages. Select the following packages for installation: Subversion, mingw32, sun-java6-jdk. Press Apply to install. Exit Synaptics.
- mvn install:install-file -DgroupId=javax.jms -DartifactId=jms \
- -Dversion=1.1 -Dpackaging=jar -Dfile=/path/to/jms.jar
+Download Maven-2.0.6 from http://maven.apache.org
+Download JMX 1.2.1 Reference Implementation from
+ http://java.sun.com/products/JavaManagement/download.html
+Download JMS 1.1 from http://java.sun.com/products/jms/docs.html
+Unzip all in ~
+Copy include/win32/jni_md.h from a Windows JDK to ~
+From a command prompt:
+$ export JAVA_HOME=/usr/lib/jvm/java-6-sun
+$ export PATH=$JAVA_HOME/bin:/home/ubuntu/maven-2.0.6/bin:$PATH
+$ export JNI_WIN32_INCLUDE_DIR=/home/ubuntu
+$ svn co https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15 log4j
+$ mvn install:install-file -DgroupId=com.sun.jdmk -DartifactId=jmxtools \
+ -Dversion=1.2.1 -Dpackaging=jar -Dfile=~/jmx-1_2_1-bin/lib/jmxtools.jar
+$ mvn install:install-file -DgroupId=com.sun.jmx -DartifactId=jmxri \
+ -Dversion=1.2.1 -Dpackaging=jar -Dfile=~/jmx-1_2_1-bin/lib/jmxri.jar
+$ mvn install:install-file -DgroupId=javax.jms -DartifactId=jms \
+ -Dversion=1.1 -Dpackaging=jar -Dfile=~/jms1.1/lib/jms.jar
+$ cd log4j
+$ mvn site assembly:assembly
diff --git a/pom.xml b/pom.xml
index 0b309a4..0d21c22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>log4j</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j</name>
- <version>1.2.15-SNAPSHOT</version>
+ <version>1.2.15</version>
<properties>
<currentVersion>1.2.15</currentVersion>
</properties>
@@ -68,9 +68,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/branches/v1_2-branch</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/branches/v1_2-branch</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/branches/v1_2-branch</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc3</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/tags/v1_2_15_rc3</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -392,6 +392,8 @@
<artifactId>maven-release-plugin</artifactId>
<configuration>
<goals>site-deploy</goals>
+ <goals>assembly:assembly</goals>
+ <goals>deploy</goals>
</configuration>
</plugin>
<plugin>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 969ea25..4090576 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -51,13 +51,14 @@
<include>tests/witness/**</include>
</includes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>log4j*.jar</include>
- <include>NTEventLogAppender.dll</include>
- </includes>
- </fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+ <files>
+ <file>
+ <source>target/log4j-${project.version}.jar</source>
+ </file>
+ <file>
+ <source>target/NTEventLogAppender.dll</source>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
+</assembly>
diff --git a/src/ntdll/build.xml b/src/ntdll/build.xml
index 414319b..b63fa39 100755
--- a/src/ntdll/build.xml
+++ b/src/ntdll/build.xml
@@ -71,6 +71,9 @@
<arg value="-Wall"/>
<arg value="-D_JNI_IMPLEMENTATION_"/>
<arg value="-Wl,--kill-at"/>
+ <arg value="-fno-rtti"/>
+ <arg value="-fno-exceptions"/>
+ <arg value="-s"/>
<arg value="-I${jni.win32.include.dir}"/>
<arg value="-I${jni.include.dir}"/>
<arg value="-I${object.dir}"/>
diff --git a/tests/build.xml b/tests/build.xml
index e1efacd..527282f 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -46,7 +46,6 @@
<!-- The directory where source files are stored. -->
<property name="project.source.home" value="../src/main/java/"/>
<property name="project.classes.home" value="../dist/classes/"/>
- <property name="project.lib.home" value="../dist/lib/"/>
<property name="tests.source.home" value="./src/java/"/>
<property name="excludes" value=""/>
@@ -97,6 +96,10 @@
</target>
<target name="prepare">
+ <!-- if target directory available, use it
+ otherwise assume it is a distribution and jar is in root -->
+ <available property="project.lib.home" value="../target" file="../target"/>
+ <property name="project.lib.home" value=".."/>
<mkdir dir="./classes" />
<mkdir dir="./output" />
<condition property="is-windows" value="true">
diff --git a/tests/run-tests.bat b/tests/run-tests.bat
index 437d1c9..504a105 100755
--- a/tests/run-tests.bat
+++ b/tests/run-tests.bat
@@ -1,50 +1,65 @@
-' Batch file for running tests on JDK 1.1
-'
-SET CLASSPATH=\java\junit3.8.1\junit.jar;\java\crimson-1.1.3\crimson.jar;\java\jakarta-oro-2.0.8\jakarta-oro-2.0.8.jar;..\dist\classes;classes;..\..\classes;resources;%log4j.jar%
-mkdir classes
+rem Batch file for running tests on JDK 1.1
+rem
+SET CLASSPATH=\java\junit3.8.1\junit.jar;\java\crimson-1.1.3\crimson.jar;\java\jakarta-oro-2.0.8\jakarta-oro-2.0.8.jar;target\classes;..\..\target\classes;resources;%log4j.jar%
+mkdir target
+mkdir target\classes
cd src\java
-javac -d ..\..\classes org\apache\log4j\util\SerializationTestHelper.java
-javac -d ..\..\classes org\apache\log4j\spi\LoggingEventTest.java
-javac -d ..\..\classes org\apache\log4j\LevelTest.java
-javac -d ..\..\classes org\apache\log4j\FileAppenderTest.java
-javac -d ..\..\classes org\apache\log4j\CoreTestSuite.java
-javac -d ..\..\classes org\apache\log4j\util\UnexpectedFormatException.java
-javac -d ..\..\classes org\apache\log4j\util\Filter.java
-javac -d ..\..\classes org\apache\log4j\util\Compare.java
-javac -d ..\..\classes org\apache\log4j\util\ControlFilter.java
-javac -d ..\..\classes org\apache\log4j\util\Transformer.java
-javac -d ..\..\classes org\apache\log4j\util\LineNumberFilter.java
-javac -d ..\..\classes org\apache\log4j\util\AbsoluteDateAndTimeFilter.java
-javac -d ..\..\classes org\apache\log4j\MinimumTestCase.java
-javac -d ..\..\classes org\apache\log4j\VectorAppender.java
-javac -d ..\..\classes org\apache\log4j\LoggerTestCase.java
-javac -d ..\..\classes org\apache\log4j\util\ISO8601Filter.java
-javac -d ..\..\classes org\apache\log4j\util\SunReflectFilter.java
-javac -d ..\..\classes org\apache\log4j\util\JunitTestRunnerFilter.java
-javac -d ..\..\classes org\apache\log4j\xml\DOMTestCase.java
-javac -d ..\..\classes org\apache\log4j\xml\XLevel.java
-javac -d ..\..\classes org\apache\log4j\xml\CustomLevelTestCase.java
-javac -d ..\..\classes org\apache\log4j\customLogger\XLogger.java
-javac -d ..\..\classes org\apache\log4j\customLogger\XLoggerTestCase.java
-javac -d ..\..\classes org\apache\log4j\defaultInit\TestCase1.java
-javac -d ..\..\classes org\apache\log4j\defaultInit\TestCase3.java
-javac -d ..\..\classes org\apache\log4j\defaultInit\TestCase4.java
-javac -d ..\..\classes org\apache\log4j\util\XMLTimestampFilter.java
-javac -d ..\..\classes org\apache\log4j\util\XMLLineAttributeFilter.java
-javac -d ..\..\classes org\apache\log4j\xml\XMLLayoutTestCase.java
-javac -d ..\..\classes org\apache\log4j\AsyncAppenderTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\OptionConverterTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\BoundedFIFOTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\CyclicBufferTestCase.java
-javac -d ..\..\classes org\apache\log4j\or\ORTestCase.java
-javac -d ..\..\classes org\apache\log4j\varia\LevelMatchFilterTestCase.java
-javac -d ..\..\classes org\apache\log4j\helpers\PatternParserTestCase.java
-javac -d ..\..\classes org\apache\log4j\util\AbsoluteTimeFilter.java
-javac -d ..\..\classes org\apache\log4j\util\RelativeTimeFilter.java
-javac -d ..\..\classes org\apache\log4j\PatternLayoutTestCase.java
-javac -d ..\..\classes org\apache\log4j\MyPatternParser.java
-javac -d ..\..\classes org\apache\log4j\MyPatternLayout.java
-javac -d ..\..\classes org\apache\log4j\DRFATestCase.java
+javac -d ..\..\target\classes org\apache\log4j\util\SerializationTestHelper.java
+javac -d ..\..\target\classes org\apache\log4j\spi\LoggingEventTest.java
+javac -d ..\..\target\classes org\apache\log4j\LevelTest.java
+javac -d ..\..\target\classes org\apache\log4j\FileAppenderTest.java
+javac -d ..\..\target\classes org\apache\log4j\PriorityTest.java
+javac -d ..\..\target\classes org\apache\log4j\CategoryTest.java
+javac -d ..\..\target\classes org\apache\log4j\LogManagerTest.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\LogLogTest.java
+javac -d ..\..\target\classes org\apache\log4j\LayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\DateLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\TTCCLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\xml\XMLLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\HTMLLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\PatternLayoutTest.java
+javac -d ..\..\target\classes org\apache\log4j\spi\ThrowableInformationTest.java
+javac -d ..\..\target\classes org\apache\log4j\spi\LocationInfoTest.java
+javac -d ..\..\target\classes org\apache\log4j\PropertyConfiguratorTest.java
+javac -d ..\..\target\classes org\apache\log4j\CoreTestSuite.java
+javac -d ..\..\target\classes org\apache\log4j\util\UnexpectedFormatException.java
+javac -d ..\..\target\classes org\apache\log4j\util\Filter.java
+javac -d ..\..\target\classes org\apache\log4j\util\Compare.java
+javac -d ..\..\target\classes org\apache\log4j\util\ControlFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\Transformer.java
+javac -d ..\..\target\classes org\apache\log4j\util\LineNumberFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\AbsoluteDateAndTimeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\MinimumTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\VectorAppender.java
+javac -d ..\..\target\classes org\apache\log4j\LoggerTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\util\ISO8601Filter.java
+javac -d ..\..\target\classes org\apache\log4j\util\SunReflectFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\JunitTestRunnerFilter.java
+javac -d ..\..\target\classes org\apache\log4j\xml\DOMTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\xml\XLevel.java
+javac -d ..\..\target\classes org\apache\log4j\xml\CustomLevelTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\customLogger\XLogger.java
+javac -d ..\..\target\classes org\apache\log4j\customLogger\XLoggerTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\defaultInit\TestCase1.java
+javac -d ..\..\target\classes org\apache\log4j\defaultInit\TestCase3.java
+javac -d ..\..\target\classes org\apache\log4j\defaultInit\TestCase4.java
+javac -d ..\..\target\classes org\apache\log4j\util\XMLTimestampFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\XMLLineAttributeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\xml\XMLLayoutTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\AsyncAppenderTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\OptionConverterTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\BoundedFIFOTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\CyclicBufferTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\or\ORTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\varia\LevelMatchFilterTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\helpers\PatternParserTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\util\AbsoluteTimeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\util\RelativeTimeFilter.java
+javac -d ..\..\target\classes org\apache\log4j\PatternLayoutTestCase.java
+javac -d ..\..\target\classes org\apache\log4j\MyPatternParser.java
+javac -d ..\..\target\classes org\apache\log4j\MyPatternLayout.java
+javac -d ..\..\target\classes org\apache\log4j\VectorErrorHandler.java
+javac -d ..\..\target\classes org\apache\log4j\DRFATestCase.java
cd ..\..
mkdir output
java junit.textui.TestRunner org.apache.log4j.CoreTestSuite
@@ -53,23 +68,23 @@ java junit.textui.TestRunner org.apache.log4j.LoggerTestCase
java junit.textui.TestRunner org.apache.log4j.xml.DOMTestCase
java junit.textui.TestRunner org.apache.log4j.xml.CustomLevelTestCase
java junit.textui.TestRunner org.apache.log4j.customLogger.XLoggerTestCase
-del classes\log4j.xml
-del classes\log4j.properties
+del target\classes\log4j.xml
+del target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase1
-copy input\xml\defaultInit.xml classes\log4j.xml
+copy input\xml\defaultInit.xml target\classes\log4j.xml
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase2
-del classes\log4j.xml
-copy input\xml\defaultInit.xml classes\log4j.xml
+del target\classes\log4j.xml
+copy input\xml\defaultInit.xml target\classes\log4j.xml
java -Dlog4j.defaultInitOverride=true junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase1
-del classes\log4j.xml
-copy input\defaultInit3.properties classes\log4j.properties
+del target\classes\log4j.xml
+copy input\defaultInit3.properties target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase3
-del classes\log4j.properties
-copy input\xml\defaultInit.xml classes\log4j.xml
-copy input\defaultInit3.properties classes\log4j.properties
+del target\classes\log4j.properties
+copy input\xml\defaultInit.xml target\classes\log4j.xml
+copy input\defaultInit3.properties target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.defaultInit.TestCase4
-del classes\log4j.xml
-del classes\log4j.properties
+del target\classes\log4j.xml
+del target\classes\log4j.properties
java junit.textui.TestRunner org.apache.log4j.xml.XMLLayoutTestCase
java junit.textui.TestRunner org.apache.log4j.AsyncAppenderTestCase
java junit.textui.TestRunner org.apache.log4j.helpers.OptionConverterTestCase