Author: pfg
Date: Wed May 9 23:22:11 2012
New Revision: 1336449
URL: http://svn.apache.org/viewvc?rev=1336449&view=rev
Log:
Update Apache Commons
Update commons-codec to version 1.6.
Update commons-lang to version 2.4.
Patch common-httpclient to avoid building issues
with OpenJDK-7.
These versions maintain ABI compatibility while
using features from newer Java versions and
have been tested on the FreeBSD port.
Added:
incubator/ooo/trunk/ext_sources/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
(with props)
incubator/ooo/trunk/ext_sources/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
(with props)
incubator/ooo/trunk/main/apache-commons/patches/httpclient.patch (with
props)
Removed:
incubator/ooo/trunk/ext_sources/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
incubator/ooo/trunk/ext_sources/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
incubator/ooo/trunk/ext_sources/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
Modified:
incubator/ooo/trunk/main/apache-commons/java/codec/makefile.mk
incubator/ooo/trunk/main/apache-commons/java/httpclient/makefile.mk
incubator/ooo/trunk/main/apache-commons/java/lang/makefile.mk
incubator/ooo/trunk/main/apache-commons/patches/codec.patch
incubator/ooo/trunk/main/apache-commons/prj/d.lst
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/swext/mediawiki/build.xml
incubator/ooo/trunk/main/swext/mediawiki/makefile.mk
Added:
incubator/ooo/trunk/ext_sources/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz?rev=1336449&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ooo/trunk/ext_sources/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/x-gzip
Added:
incubator/ooo/trunk/ext_sources/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz?rev=1336449&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ooo/trunk/ext_sources/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/x-gzip
Modified: incubator/ooo/trunk/main/apache-commons/java/codec/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/apache-commons/java/codec/makefile.mk?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/apache-commons/java/codec/makefile.mk (original)
+++ incubator/ooo/trunk/main/apache-commons/java/codec/makefile.mk Wed May 9
23:22:11 2012
@@ -38,16 +38,16 @@ ANT_BUILDFILE=build.xml
.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=commons-codec-1.3-src
-TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1
+TARFILE_NAME=commons-codec-1.6-src
+TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7
-TARFILE_ROOTDIR=commons-codec-1.3
+TARFILE_ROOTDIR=commons-codec-1.6-src
PATCH_FILES=$(PRJ)$/patches$/codec.patch
#CONVERTFILES=build.xml
-OUT2CLASS=dist$/commons-codec-1.3.jar
+OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
Modified: incubator/ooo/trunk/main/apache-commons/java/httpclient/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/apache-commons/java/httpclient/makefile.mk?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/apache-commons/java/httpclient/makefile.mk
(original)
+++ incubator/ooo/trunk/main/apache-commons/java/httpclient/makefile.mk Wed May
9 23:22:11 2012
@@ -45,14 +45,14 @@ TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776
TARFILE_ROOTDIR=commons-httpclient-3.1
-#PATCH_FILES=$(PRJ)$/patches$/httpclient.patch
+PATCH_FILES=$(PRJ)$/patches$/httpclient.patch
#CONVERTFILES=build.xml
OUT2CLASS=dist$/commons-httpclient.jar
COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
-COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.6-SNAPSHOT.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
Modified: incubator/ooo/trunk/main/apache-commons/java/lang/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/apache-commons/java/lang/makefile.mk?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/apache-commons/java/lang/makefile.mk (original)
+++ incubator/ooo/trunk/main/apache-commons/java/lang/makefile.mk Wed May 9
23:22:11 2012
@@ -40,16 +40,16 @@ TAR!:=$(GNUTAR)
.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=commons-lang-2.3-src
-TARFILE_MD5=2ae988b339daec234019a7066f96733e
+TARFILE_NAME=commons-lang-2.4-src
+TARFILE_MD5=625ff5f2f968dd908bca43c9469d6e6b
-TARFILE_ROOTDIR=commons-lang-2.3-src
+TARFILE_ROOTDIR=commons-lang-2.4-src
#PATCH_FILES=$(PRJ)$/patches$/logging.patch
#CONVERTFILES=build.xml
-OUT2CLASS=dist$/commons-lang-2.3.jar
+OUT2CLASS=dist$/commons-lang-2.4.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
Modified: incubator/ooo/trunk/main/apache-commons/patches/codec.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/apache-commons/patches/codec.patch?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/apache-commons/patches/codec.patch (original)
+++ incubator/ooo/trunk/main/apache-commons/patches/codec.patch Wed May 9
23:22:11 2012
@@ -1,17 +1,20 @@
---- misc/build/commons-codec-1.3/build.xml-old 2008-01-31 15:28:58.000000000
+0100
-+++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.000000000
+0100
-@@ -90,14 +90,12 @@
+--- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05
22:12:32.000000000 -0500
++++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000
-0500
+@@ -96,7 +96,6 @@
</target>
- <target name="dist" depends="compile,javadoc" description="Create binary
distribution">
+ <target name="dist" depends="compile, javadoc" description="Create binary
distribution">
<mkdir dir="${dist.home}"/>
-- <copy file="../LICENSE" todir="${dist.home}"/>
+- <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
+ <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
<copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
<antcall target="jar"/>
- </target>
+@@ -104,8 +103,7 @@
<target name="jar" depends="compile" description="Create jar">
<mkdir dir="${dist.home}"/>
<mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="../LICENSE"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/${final.name}.jar"
basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
- </target>
- <target name="install-jar" depends="jar" description="--> Installs jar
file in ${lib.repo}">
+- <copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+- <copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++ <copy file="${basedir}/NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+ <jar jarfile="${dist.home}/${final.name}.jar"
basedir="${build.home}/classes">
+ <manifest>
+ <attribute name="Specification-Title" value="Commons Codec"/>
Added: incubator/ooo/trunk/main/apache-commons/patches/httpclient.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/apache-commons/patches/httpclient.patch?rev=1336449&view=auto
==============================================================================
--- incubator/ooo/trunk/main/apache-commons/patches/httpclient.patch (added)
+++ incubator/ooo/trunk/main/apache-commons/patches/httpclient.patch Wed May 9
23:22:11 2012
@@ -0,0 +1,120 @@
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
2012-05-07 12:37:50.000000000 -0500
+@@ -38,7 +38,7 @@
+ /**
+ * Establishes a tunneled HTTP connection via the CONNECT method.
+ *
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+ * @author dIon Gillard
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+ * @author <a href="mailto:[email protected]";>Oleg Kalnichevski</a>
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
2012-05-07 12:37:50.000000000 -0500
+@@ -48,7 +48,7 @@
+ * @author <a href="mailto:[email protected]";>Rodney Waldhoff</a>
+ * @author Sean C. Sullivan
+ * @author <a href="mailto:[email protected]";>dIon Gillard</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @author <a href="mailto:[email protected]";>Michael Becke</a>
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+ * @author Sam Maloney
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
2012-05-07 12:37:50.000000000 -0500
+@@ -33,7 +33,7 @@
+ /**
+ * Signals that an error has occurred.
+ *
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov
2006) $
+ * @since 3.0
+ */
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
2012-05-07 12:37:50.000000000 -0500
+@@ -3,7 +3,7 @@
+ /**
+ * Signals that the response content was larger than anticipated.
+ *
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+ */
+ public class HttpContentTooLargeException extends HttpException {
+ private int maxlen;
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
2012-05-07 12:37:50.000000000 -0500
+@@ -37,7 +37,7 @@
+ /**
+ * Logs all data read to the wire LOG.
+ *
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+ * @author <a href="mailto:[email protected]";>Oleg Kalnichevski</a>
+ *
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
2012-05-07 12:37:50.000000000 -0500
+@@ -46,7 +46,7 @@
+ * @author <a href="mailto:[email protected]";>Remy Maucherat</a>
+ * @author Rodney Waldhoff
+ * @author <a href="mailto:[email protected]";>Jeff Dever</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author <a href="mailto:[email protected]";>Adrian Sutton</a>
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
2012-05-07 12:37:50.000000000 -0500
+@@ -67,7 +67,7 @@
+ * @author <a href="mailto:[email protected]";>Remy Maucherat</a>
+ * @author Rodney Waldhoff
+ * @author <a href="mailto:[email protected]";>Jeff Dever</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author <a href="mailto:[email protected]";>Adrian Sutton</a>
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
2012-05-07 12:37:50.000000000 -0500
+@@ -62,7 +62,7 @@
+ * @author <a href="mailto:[email protected]";>Remy Maucherat</a>
+ * @author Rodney Waldhoff
+ * @author <a href="mailto:[email protected]";>Jeff Dever</a>
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author <a href="mailto:[email protected]";>Adrian Sutton</a>
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
2012-05-07 12:37:50.000000000 -0500
+@@ -43,7 +43,7 @@
+ * @author <a href="mailto:[email protected]";>Remy Maucherat</a>
+ * @author Rodney Waldhoff
+ * @author <a href="mailto:[email protected]";>Jeff Dever</a>
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author <a href="mailto:[email protected]";>Adrian Sutton</a>
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+diff -ru
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
+---
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java
2012-05-07 12:34:01.000000000 -0500
++++
misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
2012-05-07 12:37:50.000000000 -0500
+@@ -62,7 +62,7 @@
+ * @author <a href="mailto:[email protected]";>Remy Maucherat</a>
+ * @author <a href="mailto:[email protected]";>Doug Sale</a>
+ * @author <a href="mailto:[email protected]";>Jeff Dever</a>
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+ * @author <a href="mailto:[email protected]";>Mike Bowler</a>
+ * @author <a href="mailto:[email protected]";>Oleg Kalnichevski</a>
+ *
Propchange: incubator/ooo/trunk/main/apache-commons/patches/httpclient.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/trunk/main/apache-commons/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/apache-commons/prj/d.lst?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/apache-commons/prj/d.lst (original)
+++ incubator/ooo/trunk/main/apache-commons/prj/d.lst Wed May 9 23:22:11 2012
@@ -1,5 +1,5 @@
..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar
%_DEST%\bin%_EXT%\commons-logging-1.1.1.jar
-..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin%_EXT%\commons-codec-1.3.jar
+..\%__SRC%\class\commons-codec-1.6-SNAPSHOT.jar
%_DEST%\bin%_EXT%\commons-codec-1.6.jar
..\%__SRC%\class\commons-httpclient.jar
%_DEST%\bin%_EXT%\commons-httpclient-3.1.jar
-..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin%_EXT%\commons-lang-2.3.jar
+..\%__SRC%\class\commons-lang-2.6.jar %_DEST%\bin%_EXT%\commons-lang-2.6.jar
Modified: incubator/ooo/trunk/main/ooo.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Wed May 9 23:22:11 2012
@@ -10,19 +10,19 @@ http://svn.apache.org/repos/asf/incubato
# Libraries with category A license
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
+625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
@@ -32,7 +32,6 @@ http://svn.apache.org/repos/asf/incubato
980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip
a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
Modified: incubator/ooo/trunk/main/swext/mediawiki/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/swext/mediawiki/build.xml?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/swext/mediawiki/build.xml (original)
+++ incubator/ooo/trunk/main/swext/mediawiki/build.xml Wed May 9 23:22:11 2012
@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true"
jarfile="${dist}/${target}.jar">
<manifest>
<!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.3.jar
commons-lang-2.3.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
+ <attribute name="Class-Path" value="commons-codec-1.6.jar
commons-lang-2.4.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
<attribute name="RegistrationClassName"
value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
Modified: incubator/ooo/trunk/main/swext/mediawiki/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/swext/mediawiki/makefile.mk?rev=1336449&r1=1336448&r2=1336449&view=diff
==============================================================================
--- incubator/ooo/trunk/main/swext/mediawiki/makefile.mk (original)
+++ incubator/ooo/trunk/main/swext/mediawiki/makefile.mk Wed May 9 23:22:11
2012
@@ -29,8 +29,8 @@ TARGET=mediawiki
.INCLUDE : ant.mk
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.jar
-COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
+COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.6.jar
+COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.4.jar
COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
.ELSE
