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:32 UTC

[logging-log4j1] 01/01: [maven-release-plugin] copy for tag v1_2_15_rc4

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to annotated tag v1_2_15_rc4
in repository https://gitbox.apache.org/repos/asf/logging-log4j1.git

commit c48c59874893aba3b933e858428a0f8cc846b5af
Author: Curtis William Arnold <ca...@apache.org>
AuthorDate: Thu Jun 28 01:34:21 2007 +0000

    [maven-release-plugin]  copy for tag v1_2_15_rc4
    
    git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc4@551422 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml               | 34 ++++++++++++++++++++--------------
 pom.xml                 | 22 ++++++++++++++++++----
 src/changes/changes.xml |  2 +-
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index 528fa14..dc1467e 100644
--- a/build.xml
+++ b/build.xml
@@ -613,32 +613,38 @@
 	  <!-- Compare the current API with a previous release                   -->
 	  <!-- ================================================================= -->
 	  <target name="clirr" depends="jar" description="Check binary compatibility with arbitrary release">
-	  	   <fail unless="clirr-core.jar">-Dclirr-core.jar=PATH must be specified.</fail>
-	  	   <fail unless="bcel.jar">-Dbcel.jar=PATH must be specified.</fail>
-	  	   <fail unless="reference.jar">-Dreference.jar=PATH must be specified.</fail>
+	       <property name="clirr.version" value="0.6"/>
+	       <property name="clirr-core.jar" value="${m2_repo}/net/sf/clirr/clirr-core/${clirr.version}/clirr-core-${clirr.version}.jar"/>
+	       <available property="clirr-core.jar-available" file="${clirr-core.jar}"/>
+	       <fail unless="clirr-core.jar-available">clirr-core-${clirr.version}.jar not in maven repo.  Run mvn clirr:check to download.</fail>
+	       <property name="bcel.version" value="5.1"/>
+	       <property name="bcel.jar" value="${m2_repo}/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar"/>
+	       <available property="bcel.jar-available" file="${bcel.jar}"/>
+	       <fail unless="bcel.jar-available">bcel-${bcel.version}.jar not in maven repo.  Run mvn clirr:check to download.</fail>
+	       <property name="reference.version" value="1.2.14"/>
+	       <property name="reference.jar" value="${m2_repo}/log4j/log4j/${reference.version}/log4j-${reference.version}.jar"/>
+	       <available property="reference.jar-available" file="${reference.jar}"/>
+	       <fail unless="reference.jar-available">log4j-${reference.version}.jar not in maven repo.  Run mvn clirr:check to download.</fail>
 	       <taskdef resource="clirrtask.properties" 
 	           classpath="${clirr-core.jar};${bcel.jar}"/>
-	       <delete dir="build/clirr"/>
-	       <mkdir dir="build/clirr/orig"/>
-	       <mkdir dir="build/clirr/new"/>
-	       <copy todir="build/clirr/orig">	       
+	       <delete dir="target/clirr"/>
+	       <mkdir dir="target/clirr/orig"/>
+	       <mkdir dir="target/clirr/new"/>
+	       <copy todir="target/clirr/orig">	       
 	       	    <fileset file="${jms.jar}"/>
 	       	    <fileset file="${jmx.jar}"/>
 				<fileset file="${reference.jar}"/>
 	       </copy>
-	       <copy todir="build/clirr/new">
+	       <copy todir="target/clirr/new">
 	       	    <fileset file="${jms.jar}"/>
 	       	    <fileset file="${jmx.jar}"/>
 	       	    <fileset dir="${jar.dest}" includes="${jar.filename}"/>
 	       </copy>
 	  	   <clirr failOnBinError="no" failOnSrcError="no">
-	  	        <origfiles dir="build/clirr/orig" includes="*.jar"/>
-	  	        <newfiles dir="build/clirr/new" includes="*.jar"/>
-	  	  	    <formatter type="xml" outfile="${docs.dest}/compatibility.xml"/>
+	  	        <origfiles dir="target/clirr/orig" includes="*.jar"/>
+	  	        <newfiles dir="target/clirr/new" includes="*.jar"/>
+	  	  	    <formatter type="xml" outfile="target/clirr/compatibility.xml"/>
 	  	  </clirr>
-	  	  <xslt in="${docs.dest}/compatibility.xml"
-	  	        out="${docs.dest}/compatibility.html"
-	  	        style="${basedir}/src/xdocs/stylesheets/compatibility.xslt"/>
 	  </target>  
 
   <!-- ============================================== -->
diff --git a/pom.xml b/pom.xml
index 0b309a4..e289f11 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_rc4</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_15_rc4</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/logging/log4j/tags/v1_2_15_rc4</url>
   </scm>
   <organization>
     <name>Apache Software Foundation</name>
@@ -297,6 +297,20 @@
             </execution>
         </executions>
       </plugin>     
+      <!--   
+           clirr:check will fail with NullPointerException
+                due to missing javax.jms.MessageListener,
+                however it will trigger download of supporting components
+                which can allow "ant clirr" to succeed.
+                Could possibly run on a JavaEE platform.
+       -->
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>clirr-maven-plugin</artifactId>
+          <configuration>
+          	  <comparisonVersion>1.2.14</comparisonVersion>
+          </configuration>
+      </plugin>
     </plugins>      
     <testSourceDirectory>tests/src/java</testSourceDirectory>
 	<testResources>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a78b9f7..46dd0de 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,7 +21,7 @@
   </properties>
   <body>
   
-    <release version="1.2.15" date="2007-06-25" description="SyslogAppender enhancements, NTEventLogAppender and Maven build.">
+    <release version="1.2.15" date="2007-06-27" description="SyslogAppender enhancements, NTEventLogAppender and Maven build.">
        <action action="fix" issue="42694">Typo in log4j.dtd concerning threshold.</action>
        <action action="fix" issue="42611">ERFATestCase fails on some JDK's.</action>
        <action action="fix" issue="42585">SocketNode can leak Sockets.</action>