Sync from SUSE:SLFO:Main apache-commons-jxpath revision e608f2d6b381cb6ae849274725ba1dbe

2024-05-03 11:01:25 +02:00 · 2024-05-03 11:01:25 +02:00 · 2d2556af56
commit 2d2556af56
7 changed files with 304 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/apache-commons-jxpath.changes
+++ b/apache-commons-jxpath.changes
@ -0,0 +1,48 @@
+-------------------------------------------------------------------
+Thu Feb 28 07:24:19 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Sanitize dependencies
+- Build and distribute the javadoc too
+- Added patch:
+  * commons-jxpath-1.3-manifest.patch
+    - Add OSGi bundle entries
+- Modified patch:
+  * build.xml.patch
+    - Remove completely the get-deps target that we don't use
+
+-------------------------------------------------------------------
+Tue Feb  5 12:29:04 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Include a manifest in the jar file
+
+-------------------------------------------------------------------
+Sat Oct 20 13:03:03 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Install the provided pom.xml file and generate the mvn(...)
+  provides
+
+-------------------------------------------------------------------
+Tue May 15 10:47:35 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8
+
+-------------------------------------------------------------------
+Sun May 21 07:54:40 UTC 2017 - tchvatal@suse.com
+
+- Remove unneeded requires
+
+-------------------------------------------------------------------
+Thu Jun  4 09:42:05 UTC 2015 - tchvatal@suse.com
+
+- Build with new tomcat
+
+-------------------------------------------------------------------
+Fri Jul 18 13:26:09 UTC 2014 - tchvatal@suse.com
+
+- Cleanup a bit to be acceptable.
+
+-------------------------------------------------------------------
+Tue Dec 20 14:32:13 UTC 2011 - dmacvicar@suse.de
+
+- initial package based on Fedora's. Removed maven stuff
+
--- a/apache-commons-jxpath.spec
+++ b/apache-commons-jxpath.spec
@ -0,0 +1,102 @@
+#
+# spec file for package apache-commons-jxpath
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define base_name       jxpath
+%define short_name      commons-%{base_name}
+Name:           apache-%{short_name}
+Version:        1.3
+Release:        0
+Summary:        Simple XPath interpreter
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+URL:            http://commons.apache.org/%{base_name}/
+Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Patch0:         %{short_name}-mockrunner.patch
+Patch1:         build.xml.patch
+Patch2:         %{short_name}-%{version}-manifest.patch
+BuildRequires:  ant
+BuildRequires:  apache-commons-beanutils
+BuildRequires:  fdupes
+BuildRequires:  glassfish-servlet-api
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local
+BuildRequires:  jdom
+BuildRequires:  tomcat-jsp-2_3-api
+Requires:       java >= 1.8
+Requires:       jdom >= 1.0
+Provides:       jakarta-%{short_name} = %{version}-%{release}
+Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
+Provides:       %{short_name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description
+Defines a simple interpreter of an expression language called XPath.
+JXPath applies XPath expressions to graphs of objects of all kinds:
+JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
+
+%package javadoc
+Summary:        API documentation for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
+%patch1
+%patch2 -p1
+
+%pom_remove_parent
+
+%build
+mkdir -p target/lib
+build-jar-repository -s target/lib commons-beanutils jdom glassfish-servlet-api tomcat-jsp-2.3-api
+%{ant}  \
+	-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
+	-lib %{_javadir} \
+	jar javadoc
+
+sed -i "s/@name@/%{short_name}/g" src/conf/MANIFEST.MF
+sed -i "s/@fragment@/%{base_name}/g" src/conf/MANIFEST.MF
+sed -i "s/@version@/%{version}/g" src/conf/MANIFEST.MF
+jar ufm target/%{short_name}.jar src/conf/MANIFEST.MF
+
+%install
+#jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a org.apache.commons:%{short_name}
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%license LICENSE.txt
+%{_javadir}/%{short_name}.jar
+
+%files javadoc
+%license LICENSE.txt
+%{_javadocdir}/%{name}
+
+%changelog
--- a/build.xml.patch
+++ b/build.xml.patch
@ -0,0 +1,38 @@
+--- build.xml.orig	2011-01-27 02:16:32.000000000 -0700
+++ build.xml	2011-01-27 02:17:20.000000000 -0700
+@@ -30,7 +30,7 @@
+       </equals>
+     </condition>
+   </target>
+-  <target name="compile" description="o Compile the code" depends="get-deps">
+  <target name="compile" description="o Compile the code">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+@@ -52,7 +52,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
+  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -157,7 +157,7 @@
+       </classpath>
+     </javadoc>
+   </target>
+-  <target name="get-deps" unless="noget" depends="init">
+  <!-- <target name="get-deps" unless="noget" depends="init">
+     <get dest="${libdir}/xerces-2.4.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.4.0.jar">
+     </get>
+     <get dest="${libdir}/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.4.jar">
+@@ -176,7 +176,7 @@
+     </get>
+     <get dest="${libdir}/mockrunner-jdk1.3-j2ee1.3-0.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven2/com/mockrunner/mockrunner-jdk1.3-j2ee1.3/0.4/mockrunner-jdk1.3-j2ee1.3-0.4.jar">
+     </get>
+-  </target>
+  </target> -->
+   <target name="install-maven">
+     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
+     </get>
--- a/commons-jxpath-1.3-manifest.patch
+++ b/commons-jxpath-1.3-manifest.patch
@ -0,0 +1,43 @@
+--- commons-jxpath-1.3-src/src/conf/MANIFEST.MF	2008-07-30 18:31:34.000000000 +0200
+++ commons-jxpath-1.3-src/src/conf/MANIFEST.MF	2019-02-28 08:35:31.900760859 +0100
+@@ -1,8 +1,38 @@
+ Extension-Name: @name@
+-Specification-Title: Jakarta Commons JXPath
+Specification-Title: Commons JXPath
+ Specification-Vendor: Apache Software Foundation
+ Specification-Version: 1.0
+-Implementation-Title: org.apache.commons.jxpath
+Implementation-Title: org.apache.commons.@fragment@
+ Implementation-Vendor: Apache Software Foundation
+ Implementation-Version: @version@
+Bundle-Description: A Java-based implementation of XPath 1.0 that, in ad
+ dition to XML processing, can inspect/modify Java object graphs (the li
+ brary's explicit purpose) and even mixed Java/XML structures.
+Bundle-DocURL: http://commons.apache.org/jxpath/
+Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: Commons JXPath
+Bundle-SymbolicName: org.apache.commons.@fragment@
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: @version@.0
+Export-Package: org.apache.commons.@fragment@;version="@version@",org.apache.commo
+ ns.@fragment@.functions;version="@version@",org.apache.commons.@fragment@.ri;version=
+ "@version@",org.apache.commons.@fragment@.ri.axes;version="@version@",org.apache.common
+ s.@fragment@.ri.compiler;version="@version@",org.apache.commons.@fragment@.ri.model;v
+ ersion="@version@",org.apache.commons.@fragment@.ri.model.beans;version="@version@",org
+ .apache.commons.@fragment@.ri.model.container;version="@version@",org.apache.comm
+ ons.@fragment@.ri.model.dom;version="@version@",org.apache.commons.@fragment@.ri.mode
+ l.dynabeans;version="@version@",org.apache.commons.@fragment@.ri.model.dynamic;ve
+ rsion="@version@",org.apache.commons.@fragment@.ri.model.jdom;version="@version@",org.a
+ pache.commons.@fragment@.ri.parser;version="@version@",org.apache.commons.@fragment@.
+ servlet;version="@version@",org.apache.commons.@fragment@.util;version="@version@",org.
+ apache.commons.@fragment@.xml;version="@version@"
+Import-Package: org.apache.commons.beanutils;resolution:=optional,org.jd
+ om;resolution:=optional,org.jdom.input;resolution:=optional,org.w3c.dom
+ ;resolution:=optional,javax.servlet;resolution:=optional,javax.servlet.
+ http;resolution:=optional,javax.servlet.jsp;resolution:=optional,javax.
+ xml.parsers,javax.xml.transform,javax.xml.transform.dom
+Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LI
+ CENSE.txt
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+ 
--- a/commons-jxpath-1.3-src.tar.gz
+++ b/commons-jxpath-1.3-src.tar.gz
--- a/commons-jxpath-mockrunner.patch
+++ b/commons-jxpath-mockrunner.patch
@ -0,0 +1,47 @@
+diff --git a/pom.xml b/pom.xml
+index 1a4f2c4..f5fa596 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -160,42 +160,6 @@ under the License.
+       <version>1.7.0</version>
+       <optional>true</optional>
+     </dependency>
+-    <dependency>
+-      <groupId>com.mockrunner</groupId>
+-      <artifactId>mockrunner-jdk1.3-j2ee1.3</artifactId>
+-      <version>0.4</version>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>cglib-nodep</groupId>
+-          <artifactId>cglib-nodep</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>jboss</groupId>
+-          <artifactId>jboss-jee</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>nekohtml</groupId>
+-          <artifactId>nekohtml</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>struts</groupId>
+-          <artifactId>struts</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>oro</groupId>
+-          <artifactId>oro</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-validator</groupId>
+-          <artifactId>commons-validator</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-digester</groupId>
+-          <artifactId>commons-digester</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+   </dependencies>
+   <reporting>
+     <plugins>