wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r1057239 - in /incubator/wink/trunk: pom.xml wink-client/pom.xml wink-common/pom.xml wink-json4j/pom.xml wink-server/pom.xml
Date Mon, 10 Jan 2011 15:28:23 GMT
Author: bluk
Date: Mon Jan 10 15:28:23 2011
New Revision: 1057239

URL: http://svn.apache.org/viewvc?rev=1057239&view=rev
Log:
Change slf4j-api import to a range

See [WINK-330]

Thanks to Shawn Jiang for the patch.

Modified:
    incubator/wink/trunk/pom.xml
    incubator/wink/trunk/wink-client/pom.xml
    incubator/wink/trunk/wink-common/pom.xml
    incubator/wink/trunk/wink-json4j/pom.xml
    incubator/wink/trunk/wink-server/pom.xml

Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=1057239&r1=1057238&r2=1057239&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Mon Jan 10 15:28:23 2011
@@ -35,6 +35,8 @@
         <javadoc.exclude.patterns>*.internal:org.apache.wink.example.*:org.apache.wink.example:org.apache.wink.itest.*:org.apache.wink.itest:org.apache.wink.jaxrs.test.*:org.apache.wink.jaxrs.test:org.slf4j.impl.*:org.apache.wink.test.*:org.apache.wink.logging.*</javadoc.exclude.patterns>
         <maven.compile.source>1.5</maven.compile.source>
         <maven.compile.target>1.5</maven.compile.target>
+        <!--WINK-330 Change slf4j api import to a range to make it more user friendly.-->
+        <slf4j.osgi.import.instruction>org.slf4j.*;version="[1.5,1.7)"</slf4j.osgi.import.instruction>
     </properties>
     <modules>
         <module>wink-component-test-support</module>

Modified: incubator/wink/trunk/wink-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/pom.xml?rev=1057239&r1=1057238&r2=1057239&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/pom.xml (original)
+++ incubator/wink/trunk/wink-client/pom.xml Mon Jan 10 15:28:23 2011
@@ -107,7 +107,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>org.apache.commons.codec.*;resolution:=optional,org.apache.wink.common.internal.providers.entity.xml,org.apache.wink.common.internal.providers.entity.atom,org.apache.wink.common.internal.providers.entity.csv,org.apache.wink.common.internal.providers.multipart,org.apache.wink.common.internal.providers.entity.json,org.apache.wink.common.internal.providers.entity.app,*</Import-Package>
+                        <Import-Package>${slf4j.osgi.import.instruction},org.apache.commons.codec.*;resolution:=optional,org.apache.wink.common.internal.providers.entity.xml,org.apache.wink.common.internal.providers.entity.atom,org.apache.wink.common.internal.providers.entity.csv,org.apache.wink.common.internal.providers.multipart,org.apache.wink.common.internal.providers.entity.json,org.apache.wink.common.internal.providers.entity.app,*</Import-Package>
                         <Export-Package>
                             <!--
                                 !org.apache.wink.client.internal.*,

Modified: incubator/wink/trunk/wink-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/pom.xml?rev=1057239&r1=1057238&r2=1057239&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/pom.xml (original)
+++ incubator/wink/trunk/wink-common/pom.xml Mon Jan 10 15:28:23 2011
@@ -136,6 +136,9 @@
                             -->
                             org.apache.wink.common.*
                         </Export-Package>
+                        <Import-Package>
+                            ${slf4j.osgi.import.instruction},*
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: incubator/wink/trunk/wink-json4j/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/pom.xml?rev=1057239&r1=1057238&r2=1057239&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/pom.xml (original)
+++ incubator/wink/trunk/wink-json4j/pom.xml Mon Jan 10 15:28:23 2011
@@ -66,6 +66,9 @@
                             -->
                             org.apache.wink.json4j.*
                         </Export-Package>
+                        <Import-Package>
+                            ${slf4j.osgi.import.instruction},*
+                        </Import-Package>                        
                     </instructions>
                 </configuration>
             </plugin>

Modified: incubator/wink/trunk/wink-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/pom.xml?rev=1057239&r1=1057238&r2=1057239&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/pom.xml (original)
+++ incubator/wink/trunk/wink-server/pom.xml Mon Jan 10 15:28:23 2011
@@ -148,7 +148,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>org.apache.wink.common.internal.providers.entity.xml,org.apache.wink.common.internal.providers.entity.atom,org.apache.wink.common.internal.providers.entity.csv,org.apache.wink.common.internal.providers.multipart,org.apache.wink.common.internal.providers.entity.json,org.apache.wink.common.internal.providers.entity.app,*</Import-Package>
+                        <Import-Package>${slf4j.osgi.import.instruction},org.apache.wink.common.internal.providers.entity.xml,org.apache.wink.common.internal.providers.entity.atom,org.apache.wink.common.internal.providers.entity.csv,org.apache.wink.common.internal.providers.multipart,org.apache.wink.common.internal.providers.entity.json,org.apache.wink.common.internal.providers.entity.app,*</Import-Package>
                         <Export-Package>
                             <!--
                                 !org.apache.wink.server.internal.*,



Mime
View raw message