Return-Path: 
 <commits-return-3259-apmail-clerezza-commits-archive=clerezza.apache.org@clerezza.apache.org>
X-Original-To: apmail-clerezza-commits-archive@www.apache.org
Delivered-To: apmail-clerezza-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AF981F2C9
	for <apmail-clerezza-commits-archive@www.apache.org>;
 Thu, 21 Mar 2013 20:44:13 +0000 (UTC)
Received: (qmail 86031 invoked by uid 500); 21 Mar 2013 20:44:13 -0000
Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org
Received: (qmail 85669 invoked by uid 500); 21 Mar 2013 20:44:13 -0000
Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@clerezza.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@clerezza.apache.org>
List-Post: <mailto:commits@clerezza.apache.org>
List-Id: <commits.clerezza.apache.org>
Reply-To: dev@clerezza.apache.org
Delivered-To: mailing list commits@clerezza.apache.org
Received: (qmail 85592 invoked by uid 99); 21 Mar 2013 20:44:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 20:44:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 20:44:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8FD4C2388978;
	Thu, 21 Mar 2013 20:43:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1459516 - in /clerezza/trunk:
 clerezza-jar-resource-bundle/
 ext.com.hp.hpl.jena.tdb/ ext.com.hp.hpl.jena/ ext.org.apache.lucene/
 ext.org.ops4j.pax.swissbox.tinybundles/ jaxrs.stanbol.fragments/ parent/
 platform.xhtml2html/ uima/uima.utils/
Date: Thu, 21 Mar 2013 20:43:48 -0000
To: commits@clerezza.apache.org
From: reto@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130321204348.8FD4C2388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reto
Date: Thu Mar 21 20:43:47 2013
New Revision: 1459516

URL: http://svn.apache.org/r1459516
Log:
CLEREZZA-755: update plugin versions, also taken the annotations to the global dependencies as all project should be changed to use them rather than javadoc tags

Modified:
    clerezza/trunk/clerezza-jar-resource-bundle/pom.xml
    clerezza/trunk/ext.com.hp.hpl.jena.tdb/pom.xml
    clerezza/trunk/ext.com.hp.hpl.jena/pom.xml
    clerezza/trunk/ext.org.apache.lucene/pom.xml
    clerezza/trunk/ext.org.ops4j.pax.swissbox.tinybundles/pom.xml
    clerezza/trunk/jaxrs.stanbol.fragments/pom.xml
    clerezza/trunk/parent/pom.xml
    clerezza/trunk/platform.xhtml2html/pom.xml
    clerezza/trunk/uima/uima.utils/pom.xml

Modified: clerezza/trunk/clerezza-jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/clerezza-jar-resource-bundle/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/clerezza-jar-resource-bundle/pom.xml (original)
+++ clerezza/trunk/clerezza-jar-resource-bundle/pom.xml Thu Mar 21 20:43:47 2013
@@ -49,6 +49,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-scr-plugin</artifactId>
+        <executions>
+           <execution>
+              <id>generate-scr-scrdescriptor</id>
+              <phase>none</phase>
+           </execution>
+        </executions>
+     </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file

Modified: clerezza/trunk/ext.com.hp.hpl.jena.tdb/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/ext.com.hp.hpl.jena.tdb/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/ext.com.hp.hpl.jena.tdb/pom.xml (original)
+++ clerezza/trunk/ext.com.hp.hpl.jena.tdb/pom.xml Thu Mar 21 20:43:47 2013
@@ -81,7 +81,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Embed-Dependency>*;scope=compile;artifactId=!slf4j-api</Embed-Dependency>
+                        <Embed-Dependency>*;scope=compile;artifactId=!slf4j-api|org.apache.felix.scr.annotations</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Import-Package>!com.hp.hpl.jena.*.test,
                         !org.apache.xml.resolver.*,!sun.*,

Modified: clerezza/trunk/ext.com.hp.hpl.jena/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/ext.com.hp.hpl.jena/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/ext.com.hp.hpl.jena/pom.xml (original)
+++ clerezza/trunk/ext.com.hp.hpl.jena/pom.xml Thu Mar 21 20:43:47 2013
@@ -78,7 +78,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Embed-Dependency>*;artifactId=!commons-logging</Embed-Dependency>
+                        <Embed-Dependency>*;artifactId=!slf4j-*|org.apache.felix.scr.annotations</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Import-Package>!com.hp.hpl.jena.*.test,
                         !org.apache.xml.resolver.*,!sun.*,

Modified: clerezza/trunk/ext.org.apache.lucene/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/ext.org.apache.lucene/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/ext.org.apache.lucene/pom.xml (original)
+++ clerezza/trunk/ext.org.apache.lucene/pom.xml Thu Mar 21 20:43:47 2013
@@ -70,7 +70,7 @@
                 <configuration>
                     <instructions>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Embed-Dependency>*;inline=false</Embed-Dependency>
+                        <Embed-Dependency>*;inline=false;artifactId=!org.apache.felix.scr.annotations</Embed-Dependency>
                         <Export-Package>org.apache.lucene.*</Export-Package>
                     </instructions>
                 </configuration>

Modified: clerezza/trunk/ext.org.ops4j.pax.swissbox.tinybundles/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/ext.org.ops4j.pax.swissbox.tinybundles/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/ext.org.ops4j.pax.swissbox.tinybundles/pom.xml (original)
+++ clerezza/trunk/ext.org.ops4j.pax.swissbox.tinybundles/pom.xml Thu Mar 21 20:43:47 2013
@@ -54,7 +54,7 @@
                         <Embed-Transitive>true</Embed-Transitive>
                         <Export-Package>org.ops4j.pax.swissbox.tinybundles.core;version="1.3.0"</Export-Package>
                         <!-- <Private-Package>*</Private-Package> -->
-                        <Embed-Dependency>*;artifactId=!slf4j-api;scope=compile;inline=true</Embed-Dependency>
+                        <Embed-Dependency>*;artifactId=!slf4j-*|org.apache.felix.scr.annotations;scope=compile;inline=true</Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>

Modified: clerezza/trunk/jaxrs.stanbol.fragments/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/jaxrs.stanbol.fragments/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/jaxrs.stanbol.fragments/pom.xml (original)
+++ clerezza/trunk/jaxrs.stanbol.fragments/pom.xml Thu Mar 21 20:43:47 2013
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.wink</groupId>

Modified: clerezza/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/parent/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/parent/pom.xml (original)
+++ clerezza/trunk/parent/pom.xml Thu Mar 21 20:43:47 2013
@@ -72,7 +72,7 @@
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <extensions>true</extensions>
-                    <version>2.1.0</version>
+                    <version>2.3.7</version>
                     <configuration>
                         <instructions>
                             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
@@ -82,7 +82,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.0</version>
+                    <version>1.7.4</version>
                     <executions>
                         <execution>
                             <id>generate-scr-scrdescriptor</id>
@@ -331,6 +331,10 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
@@ -432,7 +436,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.scr.annotations</artifactId>
-                <version>1.5.0</version>
+                <version>1.6.0</version>
             </dependency>
             <dependency>
                 <groupId>com.googlecode.json-simple</groupId>

Modified: clerezza/trunk/platform.xhtml2html/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/platform.xhtml2html/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/platform.xhtml2html/pom.xml (original)
+++ clerezza/trunk/platform.xhtml2html/pom.xml Thu Mar 21 20:43:47 2013
@@ -30,14 +30,14 @@
     <packaging>bundle</packaging>
     <version>0.6-SNAPSHOT</version>
     <name>Clerezza - Filter for browsers that do not support XHTML</name>
-    <description>Provides a wrhapi filter that changes the content-type of the
+    <description>Provides a servlet filter that changes the content-type of the
     response from application/xhtml+xml to text/html
     </description>
     <dependencies>
         <dependency>
-            <groupId>org.wymiwyg</groupId>
-            <artifactId>wrhapi</artifactId>
-            <version>0.9</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: clerezza/trunk/uima/uima.utils/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/uima/uima.utils/pom.xml?rev=1459516&r1=1459515&r2=1459516&view=diff
==============================================================================
--- clerezza/trunk/uima/uima.utils/pom.xml (original)
+++ clerezza/trunk/uima/uima.utils/pom.xml Thu Mar 21 20:43:47 2013
@@ -110,7 +110,7 @@
           <instructions>
             <Export-Package>org.apache.clerezza.uima.utils.*;version=0.1.0,org.apache.uima.*;version=2.3.0
             </Export-Package>
-            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Dependency>*;scope=compile|runtime;artifactId=!slf4j-*|org.apache.felix.scr.annotations</Embed-Dependency>
             <Bundle-Activator>org.apache.clerezza.uima.utils.UIMAUtilsBundleActivator</Bundle-Activator>
           </instructions>
         </configuration>