[maven-release-plugin] copy for tag v0_10_0-rc2
diff --git a/build.xml b/build.xml
index 2093ab2..7b48632 100644
--- a/build.xml
+++ b/build.xml
@@ -78,7 +78,7 @@
<property name="tests.resources.dir" location="${tests.dir}/resources"/>
<property name="tests.output.dir" location="${tests.resources.dir}/output"/>
<property name="m2_repo" location="${user.home}/.m2/repository"/>
-<property name="log4j.version" value="1.2.15"/>
+<property name="log4j.version" value="1.2.14"/>
<available property="log4j.jar"
value="/usr/share/java/log4j-1.2.jar"
file="/usr/share/java/log4j-1.2.jar"/>
@@ -87,7 +87,6 @@
<property name="doxygen.exe" value="doxygen"/>
-<property name="enable_dot" value="YES"/>
<property name="lib.name" value="log4cxx"/>
<property name="lib.prefix" value=""/>
@@ -1071,7 +1070,6 @@
<replace file="${target.dir}/Doxyfile">
<replacefilter token="@VERSION@" value="${version}"/>
<replacefilter token="@base_dir@" value="${base.dir}"/>
- <replacefilter token="@enable_dot@" value="${enable_dot}"/>
<replacefilter token="@manual_dest@" value="${base.dir}/target/site/apidocs"/>
</replace>
<mkdir dir="target/site/apidocs"/>
@@ -1084,7 +1082,19 @@
*/
/* Minimal replacement for GPL'd doxygen.css */
</echo>
-
+ <echo file="${target.dir}/site/apidocs/tabs.css">
+/*
+&license;
+*/
+/* Minimal replacement for GPL'd tabs.css */
+DIV.tabs {
+ display : none ;
+}
+</echo>
+ <!-- fix for issue http://jira.codehaus.org/browse/MSKINS-2 -->
+ <replace file="${target.dir}/site/css/maven-theme.css"
+ token="font-size: normal;"
+ value="font-size: medium;"/>
</target>
diff --git a/pom.xml b/pom.xml
index 5173f20..df0cb56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.0</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org:80/log4cxx</url>
@@ -45,9 +45,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4cxx/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4cxx/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/log4cxx/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4cxx/tags/v0_10_0-rc2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4cxx/tags/v0_10_0-rc2</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/logging/log4cxx/tags/v0_10_0-rc2</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -204,7 +204,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <goals>site-deploy</goals>
+ <goals>site-deploy assembly:assembly</goals>
</configuration>
</plugin>
<plugin>
@@ -228,4 +228,4 @@
<url>file:///${user.dir}/target/site-deploy</url>
</site>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/ant/find-apr-util.xml b/src/ant/find-apr-util.xml
index 21d7ad7..47a1d73 100644
--- a/src/ant/find-apr-util.xml
+++ b/src/ant/find-apr-util.xml
@@ -22,9 +22,18 @@
</condition>
<condition property="apr-util.src.dir" value="${apr-util.dir}">
<available file="${apr-util.dir}/${apr-util.sample.c}"/>
+ </condition>
+ <property name="apr-util.cwd.parent" location=".."/>
+ <condition property="apr-util.src.dir" value="${apr-util.cwd.parent}/apr-util">
+ <available file="${apr-util.cwd.parent}/apr-util/${apr-util.sample.c}"/>
</condition>
- <condition property="apr-util.src.dir" value="../apr-util">
- <available file="../apr-util/${apr-util.sample.c}"/>
+ <property name="apr-util.cwd.grand" location="../.."/>
+ <condition property="apr-util.src.dir" value="${apr-util.cwd.grand}/apr-util">
+ <available file="${apr-util.cwd.grand}/apr-util/${apr-util.sample.c}"/>
+ </condition>
+ <property name="apr-util.cwd.great" location="../../.."/>
+ <condition property="apr-util.src.dir" value="${apr-util.cwd.great}/apr-util">
+ <available file="${apr-util.cwd.great}/apr-util/${apr-util.sample.c}"/>
</condition>
</target>
@@ -310,4 +319,4 @@
apr-util.lib.suffix=${apr-util.lib.suffix}
apr-util.lib.type=${apr-util.lib.type}
</echo>
-</target>
\ No newline at end of file
+</target>
diff --git a/src/ant/find-apr.xml b/src/ant/find-apr.xml
index ec228e6..f889089 100644
--- a/src/ant/find-apr.xml
+++ b/src/ant/find-apr.xml
@@ -22,9 +22,18 @@
</condition>
<condition property="apr.src.dir" value="${apr.dir}">
<available file="${apr.dir}/${apr.sample.c}"/>
+ </condition>
+ <property name="apr.cwd.parent" location=".."/>
+ <condition property="apr.src.dir" value="${apr.cwd.parent}/apr">
+ <available file="${apr.cwd.parent}/apr/${apr.sample.c}"/>
</condition>
- <condition property="apr.src.dir" value="../apr">
- <available file="../apr/${apr.sample.c}"/>
+ <property name="apr.cwd.grand" location="../.."/>
+ <condition property="apr.src.dir" value="${apr.cwd.grand}/apr">
+ <available file="${apr.cwd.grand}/apr/${apr.sample.c}"/>
+ </condition>
+ <property name="apr.cwd.great" location="../../.."/>
+ <condition property="apr.src.dir" value="${apr.cwd.great}/apr">
+ <available file="${apr.cwd.great}/apr/${apr.sample.c}"/>
</condition>
</target>
@@ -310,4 +319,4 @@
apr.lib.suffix=${apr.lib.suffix}
apr.lib.type=${apr.lib.type}
</echo>
-</target>
\ No newline at end of file
+</target>
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index 005aa3b..fd861ac 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -19,9 +19,13 @@
# rewrite site requests to equivalent new URLs
#
RewriteRule ^contributing\.html$ http://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L]
+ RewriteRule ^roadmap\.html$ http://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L]
RewriteRule ^support\.html$ http://logging.apache.org/log4cxx/index.html [R=permanent,L]
RewriteRule ^team\.html$ http://logging.apache.org/team-list.html [R=permanent,L]
+ RewriteRule ^performance\.html$ http://logging.apache.org/log4cxx/index.html [R=permanent,L]
RewriteRule ^ChangeLog$ http://logging.apache.org/log4cxx/changes-report.html [R=permanent,L]
+ RewriteRule ^news$ http://logging.apache.org/log4cxx/changes-report.html [R=permanent,L]
+ RewriteRule ^manual\.html$ http://logging.apache.org/log4cxx/index.html [R=permanent,L]
RewriteRule ^manual/index\.html$ http://logging.apache.org/log4cxx/manual.html [R=permanent,L]
RewriteRule ^manual/(.*)$ http://logging.apache.org/log4cxx/apidocs/$1 [R=permanent,L]
RewriteRule ^manual\.html/index\.html$ http://logging.apache.org/log4cxx/manual.html [R=permanent,L]
