[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jpackage-announce
Subject:    [JPackage-announce] [RPM (6.0)]=?ISO-8859-1?Q?=20?=[DIST generic] jackrabbit22-2.2.13-4.jpp6
From:       Ralph Apel <jpackage () zarb ! org>
Date:       2013-02-21 14:15:51
Message-ID: 20130221141551.6C2361CAA2D () ryu ! zarb ! org
[Download RAW message or body]

Name        : jackrabbit22                 Relocations: (not relocatable)
Version     : 2.2.13                            Vendor: JPackage Project
Release     : 4.jpp6                        Build Date: Thu 21 Feb 2013 02:00:57 PM CET
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries/Application Frameworks   Source RPM: (none)
Size        : 11064857                         License: Apache Software License 2.0
Signature   : (none)
Packager    : Ralph Apel <r.apel@r-apel.de>
URL         : http://jackrabbit.apache.org/
Summary     : Apache Jackrabbit JCR 2.0 Implementation
Description :
Apache Jackrabbit is a fully conforming implementation of
the Content Repository for Java Technology API (JCR,
specified in JSR 170 and 283).
A content repository is a hierarchical content store with
support for structured and unstructured content, full text
search, versioning, transactions, observation, and more.
Apache Jackrabbit is a project of the Apache Software
Foundation.

---------------
Ralph Apel <r.apel at r-apel.de> 0:2.2.13-4
- Fix "library hell" with servlet api
---------------
jackrabbit22.src: W: source-or-patch-not-bzipped jackrabbit22-BasicCredentialsProviderTest.patch
jackrabbit22.src: W: no-signature
jackrabbit22.src: W: invalid-license Apache Software License 2.0
1 packages and 0 specfiles checked; 0 errors, 3 warnings.

---------------
Index: jackrabbit22-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jackrabbit22/jackrabbit22-jpp-depmap.xml,v
retrieving revision 1.1
diff -u -r1.1 jackrabbit22-jpp-depmap.xml
--- jackrabbit22-jpp-depmap.xml	29 Jan 2013 15:43:36 -0000	1.1
+++ jackrabbit22-jpp-depmap.xml	21 Feb 2013 14:15:49 -0000
@@ -189,8 +189,8 @@
         </maven>
         <jpp>
             <groupId>JPP</groupId>
-            <artifactId>servlet_2_3_api</artifactId>
-            <version>2.3</version>
+            <artifactId>geronimo-servlet-2.5-api</artifactId>
+            <version>2.5</version>
         </jpp>
     </dependency>
 
@@ -536,4 +536,199 @@
     </jpp>
 </dependency>
 
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>integration</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>integration</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-ext</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-ext</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jcl</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-jcl</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-migrator</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-migrator</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-nop</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-nop</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-parent</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-parent</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-site</artifactId>
+        <version>1.6.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/slf4j</groupId>
+        <artifactId>slf4j-site</artifactId>
+        <version>1.6.1</version>
+    </jpp>
+</dependency>
+
 </dependencies>
Index: jackrabbit22.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jackrabbit22/jackrabbit22.spec,v
retrieving revision 1.3
diff -u -r1.3 jackrabbit22.spec
--- jackrabbit22.spec	17 Feb 2013 11:30:04 -0000	1.3
+++ jackrabbit22.spec	21 Feb 2013 14:15:49 -0000
@@ -36,7 +36,7 @@
 
 Name:           jackrabbit22
 Version:        2.2.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Apache Jackrabbit JCR 2.0 Implementation
 License:        Apache Software License 2.0
@@ -50,6 +50,8 @@
 Source4:        %{name}.conf
 Source5:        %{name}.wrapper
 
+Patch0:         %{name}-BasicCredentialsProviderTest.patch
+
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  java-devel >= 0:1.6.0
 BuildRequires:  apache-rat
@@ -75,7 +77,7 @@
 BuildRequires:  oss-parent
 BuildRequires:  tomcat6
 BuildRequires:  tomcat6-lib
-BuildRequires:  tomcat6-servlet-2.5-api
+BuildRequires:  geronimo-servlet-2.5-api
 
 BuildRequires:  apache-mime4j
 BuildRequires:  apache-pdfbox
@@ -92,7 +94,7 @@
 BuildRequires:  lucene24
 BuildRequires:  netcdf-java
 BuildRequires:  rome
-BuildRequires:  servlet_2_5_api
+BuildRequires:  servlet_2_3_api
 BuildRequires:  simple-jndi
 BuildRequires:  slf4j
 BuildRequires:  stax_1_0_api
@@ -147,6 +149,7 @@
 %setup -q -n jackrabbit-%{version}
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
+%patch0 -b .sav0
 
 %build
 cp %{SOURCE1} maven2-settings.xml
@@ -378,6 +381,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 21 2013 Ralph Apel <r.apel at r-apel.de> 0:2.2.13-4
+- Fix "library hell" with servlet api
+
 * Sun Feb 17 2013 Ralph Apel <r.apel at r-apel.de> 0:2.2.13-2
 - Create and use "jackrabbit" OS user
 - Add start script for standalone server


_______________________________________________
JPackage-announce mailing list
JPackage-announce@zarb.org
https://www.zarb.org/mailman/listinfo/jpackage-announce
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic