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:22 UTC
[logging-log4j1] annotated tag v1_2_15 created (now 9c6ece5)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to annotated tag v1_2_15
in repository https://gitbox.apache.org/repos/asf/logging-log4j1.git.
at 9c6ece5 (tag)
tagging 8014ad127c6ea4b4dcb23f06bad6dbbf7d092fe9 (commit)
replaces v1_2_15_rc6
by Curtis William Arnold
on Wed Sep 5 16:23:24 2007 +0000
- Log -----------------------------------------------------------------
v1_2_15
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new e025b74 [maven-release-plugin] copy for tag v1_2_15_rc6
new 8014ad1 rc6 was accepted as official 1.2.15
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[logging-log4j1] 02/02: rc6 was accepted as official 1.2.15
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to annotated tag v1_2_15
in repository https://gitbox.apache.org/repos/asf/logging-log4j1.git
commit 8014ad127c6ea4b4dcb23f06bad6dbbf7d092fe9
Author: Curtis William Arnold <ca...@apache.org>
AuthorDate: Wed Sep 5 16:23:24 2007 +0000
rc6 was accepted as official 1.2.15
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15@572985 13f79535-47bb-0310-9956-ffa450edef68
[logging-log4j1] 01/02: [maven-release-plugin] copy for tag v1_2_15_rc6
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to annotated tag v1_2_15
in repository https://gitbox.apache.org/repos/asf/logging-log4j1.git
commit e025b747ec3b0acfb68ab2b4cbab5ca0a40a7696
Author: Curtis William Arnold <ca...@apache.org>
AuthorDate: Sat Aug 25 04:02:57 2007 +0000
[maven-release-plugin] copy for tag v1_2_15_rc6
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc6@569611 13f79535-47bb-0310-9956-ffa450edef68
---
BUILD-INFO.txt | 13 ++++++++++++-
pom.xml | 14 +++++++++-----
src/changes/changes.xml | 3 ++-
src/main/java/org/apache/log4j/lf5/util/LogFileParser.java | 2 +-
.../java/org/apache/log4j/lf5/util/LogMonitorAdapter.java | 2 +-
src/main/java/org/apache/log4j/lf5/util/StreamUtils.java | 2 +-
.../java/org/apache/log4j/lf5/viewer/LogTableColumn.java | 2 +-
.../lf5/viewer/categoryexplorer/CategoryExplorerModel.java | 8 ++++----
.../java/org/apache/log4j/spi/NOPLoggerRepository.java | 2 +-
9 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/BUILD-INFO.txt b/BUILD-INFO.txt
index facccd4..60aa404 100644
--- a/BUILD-INFO.txt
+++ b/BUILD-INFO.txt
@@ -33,7 +33,7 @@ Launch Ubuntu 6.06-1 in VMWare Player (user name and password are ubuntu)
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.
+Subversion, mingw32, sun-java6-jdk, xemacs21. Press Apply to install. Exit Synaptics.
Download Maven-2.0.7 from http://maven.apache.org
Download JMX 1.2.1 Reference Implementation from
@@ -45,6 +45,7 @@ Copy include/win32/jni_md.h from a Windows JDK to ~
From a command prompt:
+$ export SVN_EDITOR=xemacs
$ export JAVA_HOME=/usr/lib/jvm/java-6-sun
$ export PATH=$JAVA_HOME/bin:/home/ubuntu/maven-2.0.7/bin:$PATH
$ export JNI_WIN32_INCLUDE_DIR=/home/ubuntu
@@ -76,3 +77,13 @@ and localhost before attempting a deployment like:
$ ssh -l USERNAME people.apache.org
$ ssh localhost
+
+release:perform has been running into http://jira.codehaus.org/browse/MRELEASE-273.
+Release was attempted to be prepared with:
+
+$ mvn release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc6
+
+but it may have been necessary to specify a -Dgoals=".." to avoid the bug. If so,
+any final build notes will be added to bug 40951.
+
+
diff --git a/pom.xml b/pom.xml
index bea2312..b3f7fd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<artifactId>log4j</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j</name>
- <version>1.2.16-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/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc6</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc6</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/tags/v1_2_15_rc6</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -442,8 +442,12 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <!--
+ Bug MRELEASE273 has been throwing NPE during release:perform,
+ typically after deploy so this places it last.
+ -->
<configuration>
- <goals>deploy site-deploy assembly:attached</goals>
+ <goals>test site-deploy assembly:attached deploy</goals>
</configuration>
</plugin>
<plugin>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ccef084..ff15482 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,7 +21,8 @@
</properties>
<body>
- <release version="1.2.15" date="2007-06-27" description="SyslogAppender enhancements, NTEventLogAppender and Maven build.">
+ <release version="1.2.15" date="2007-08-24" description="SyslogAppender enhancements, NTEventLogAppender and Maven build.">
+ <action issue="40951">log4j 1.2.15 release preparation.</action>
<action action="add" issue="40212">Switch to NOPLoggerRepository if application reloading nulls repositorySelector.</action>
<action action="add" issue="43202">Add 'application' property support to SocketAppender (from 1.3)</action>
<action action="fix" issue="43200">Log4JEntityResolver will return null if log4j.dtd can not be found on classpath.</action>
diff --git a/src/main/java/org/apache/log4j/lf5/util/LogFileParser.java b/src/main/java/org/apache/log4j/lf5/util/LogFileParser.java
index 9fd1317..4d12ed9 100644
--- a/src/main/java/org/apache/log4j/lf5/util/LogFileParser.java
+++ b/src/main/java/org/apache/log4j/lf5/util/LogFileParser.java
@@ -83,7 +83,7 @@ public class LogFileParser implements Runnable {
/**
* Starts a new thread to parse the log file and create a LogRecord.
* See run().
- * @param LogBrokerMonitor
+ * @param monitor LogBrokerMonitor
*/
public void parse(LogBrokerMonitor monitor) throws RuntimeException {
_monitor = monitor;
diff --git a/src/main/java/org/apache/log4j/lf5/util/LogMonitorAdapter.java b/src/main/java/org/apache/log4j/lf5/util/LogMonitorAdapter.java
index 904c179..394a851 100644
--- a/src/main/java/org/apache/log4j/lf5/util/LogMonitorAdapter.java
+++ b/src/main/java/org/apache/log4j/lf5/util/LogMonitorAdapter.java
@@ -107,7 +107,7 @@ public class LogMonitorAdapter {
* The first LogLevel in the List is used as the default LogLevel unless
* changed using the setDefaultLevel method.<p>
*
- * @param userDefined A list of user defined LogLevel objects.
+ * @param userDefinedLevels A list of user defined LogLevel objects.
* @return LogMonitorAdapter
*/
public static LogMonitorAdapter newInstance(List userDefinedLevels) {
diff --git a/src/main/java/org/apache/log4j/lf5/util/StreamUtils.java b/src/main/java/org/apache/log4j/lf5/util/StreamUtils.java
index 0d67358..183f9aa 100644
--- a/src/main/java/org/apache/log4j/lf5/util/StreamUtils.java
+++ b/src/main/java/org/apache/log4j/lf5/util/StreamUtils.java
@@ -97,7 +97,7 @@ public abstract class StreamUtils {
}
/**
- * @returns a byte[] containing the information contained in the
+ * @return a byte[] containing the information contained in the
* specified InputStream.
* @throws java.io.IOException
*/
diff --git a/src/main/java/org/apache/log4j/lf5/viewer/LogTableColumn.java b/src/main/java/org/apache/log4j/lf5/viewer/LogTableColumn.java
index 045212c..c86c6bb 100644
--- a/src/main/java/org/apache/log4j/lf5/viewer/LogTableColumn.java
+++ b/src/main/java/org/apache/log4j/lf5/viewer/LogTableColumn.java
@@ -89,7 +89,7 @@ public class LogTableColumn implements java.io.Serializable {
/**
* Convert a column label into a LogTableColumn object.
*
- * @param level The label of a level to be converted into a LogTableColumn.
+ * @param column The label of a level to be converted into a LogTableColumn.
* @return LogTableColumn The LogTableColumn with a label equal to column.
* @throws LogTableColumnFormatException Is thrown when the column can not be
* converted into a LogTableColumn.
diff --git a/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java b/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java
index 6735469..1ace72e 100644
--- a/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java
+++ b/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java
@@ -185,8 +185,8 @@ public class CategoryExplorerModel extends DefaultTreeModel {
* <p>Method altered by Richard Hurst such that it returns the CategoryNode
* corresponding to the CategoryPath</p>
*
- * @param CategoryPath
- * @returns CategoryNode
+ * @param path category path.
+ * @return CategoryNode
*/
public CategoryNode addCategory(CategoryPath path) {
CategoryNode root = (CategoryNode) getRoot();
@@ -299,8 +299,8 @@ public class CategoryExplorerModel extends DefaultTreeModel {
/**
* <p>Returns the CategoryPath to the specified CategoryNode</p>
*
- * @param CategoryNode The target CategoryNode
- * @returns CategoryPath
+ * @param node The target CategoryNode
+ * @return CategoryPath
*/
public TreePath getTreePathToRoot(CategoryNode node) {
if (node == null) {
diff --git a/src/main/java/org/apache/log4j/spi/NOPLoggerRepository.java b/src/main/java/org/apache/log4j/spi/NOPLoggerRepository.java
index ca92dbe..bdb6ed9 100644
--- a/src/main/java/org/apache/log4j/spi/NOPLoggerRepository.java
+++ b/src/main/java/org/apache/log4j/spi/NOPLoggerRepository.java
@@ -62,7 +62,7 @@ public final class NOPLoggerRepository implements LoggerRepository {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public Level getThreshold() {
return Level.OFF;