diff options
| author | Pedro Giffuni <pfg@apache.org> | 2012-05-09 22:22:11 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2012-05-09 22:22:11 +0000 |
| commit | ef867d46563915bce0439c2d6a741175baadf6d0 (patch) | |
| tree | 522a3cbd733653e2fbdcfbc55b24257ccc2ff441 /swext | |
| parent | 3b83c404c56e5db5bab29ffee41f02822410d625 (diff) | |
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.
Notes
Notes:
merged as: adda54b5211916f9b442e8ac7d82cc861bdde54d
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/mediawiki/build.xml | 2 | ||||
| -rw-r--r-- | swext/mediawiki/makefile.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index 318b0e499b0e..f76d6d10534c 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -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> diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk index d422d2fda6f3..b9e631191a5e 100644 --- a/swext/mediawiki/makefile.mk +++ b/swext/mediawiki/makefile.mk @@ -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 |