rpm/apache-commons-chain
SHA256
1
0
Fork 0
forked from pool/apache-commons-chain
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-chain?expand=0&rev=2

Browse Source
This commit is contained in:
Fridrich Strba 2018-12-21 21:00:09 +00:00 committed by Git OBS Bridge
parent c4525a2c92
commit 25cec1e3c8
3 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-commons-chain.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Build against commons-digester >= 1.8
- Removed patch:
* commons-chain-1.2-digester.patch
+ not needed when building with commons-digester >= 1.8
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 21 16:03:07 UTC 2018 - Fridrich Strba <fstrba@suse.com> Fri Dec 21 16:03:07 UTC 2018 - Fridrich Strba <fstrba@suse.com>

7
apache-commons-chain.spec
View File

@ -30,8 +30,6 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{sho
Patch0: %{name}-%{version}-tests-servlet31.patch Patch0: %{name}-%{version}-tests-servlet31.patch
# javax.portlet 2.0 api support # javax.portlet 2.0 api support
Patch1: %{name}-%{version}-portlet20.patch Patch1: %{name}-%{version}-portlet20.patch
# Fix build with older jakarta-commons-digester
Patch2: commons-chain-1.2-digester.patch
# Do not fetch dependencies during the build # Do not fetch dependencies during the build
Patch3: commons-chain-1.2-getdeps.patch Patch3: commons-chain-1.2-getdeps.patch
# javax.servlet 4.0 api support # javax.servlet 4.0 api support
@ -41,7 +39,7 @@ BuildRequires: ant-junit
BuildRequires: apache-commons-collections BuildRequires: apache-commons-collections
BuildRequires: apache-commons-parent BuildRequires: apache-commons-parent
BuildRequires: commons-beanutils BuildRequires: commons-beanutils
BuildRequires: commons-digester BuildRequires: commons-digester >= 1.8
BuildRequires: commons-logging BuildRequires: commons-logging
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -50,7 +48,7 @@ BuildRequires: portlet-1.0-api
BuildRequires: tomcat-servlet-4.0-api BuildRequires: tomcat-servlet-4.0-api
Requires: apache-commons-parent Requires: apache-commons-parent
Requires: commons-beanutils Requires: commons-beanutils
Requires: commons-digester Requires: commons-digester >= 1.8
Requires: commons-logging Requires: commons-logging
BuildArch: noarch BuildArch: noarch
@ -90,7 +88,6 @@ sed -i 's/\r$//g;' *.txt
%patch0 -p1 %patch0 -p1
%patch1 %patch1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1

36
commons-chain-1.2-digester.patch
View File

@ -1,36 +0,0 @@
--- commons-chain-1.2-src/src/java/org/apache/commons/chain/config/ConfigParser.java 2008-05-29 18:43:15.000000000 +0200
+++ commons-chain-1.2-src/src/java/org/apache/commons/chain/config/ConfigParser.java 2018-12-21 16:03:07.675014800 +0100
@@ -17,6 +17,7 @@
package org.apache.commons.chain.config;
+import java.net.URISyntaxException;
import java.net.URL;
import org.apache.commons.chain.Catalog;
import org.apache.commons.digester.Digester;
@@ -164,7 +164,11 @@
digester.push(catalog);
// Parse the configuration document
- digester.parse(url);
+ try {
+ digester.parse(url.toURI().toString());
+ } catch (URISyntaxException e) {
+ throw new Exception(e);
+ }
}
@@ -187,7 +191,11 @@
digester.clear();
// Parse the configuration document
- digester.parse(url);
+ try {
+ digester.parse(url.toURI().toString());
+ } catch (URISyntaxException e) {
+ throw new Exception(e);
+ }
}