geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r941410 - in /geronimo/server/trunk: framework/configs/karaf-framework/pom.xml framework/modules/geronimo-pax-logging/pom.xml pom.xml
Date Wed, 05 May 2010 18:16:51 GMT
Author: gawor
Date: Wed May  5 18:16:51 2010
New Revision: 941410

URL: http://svn.apache.org/viewvc?rev=941410&view=rev
Log:
use released version of pax logging

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=941410&r1=941409&r2=941410&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Wed May  5 18:16:51 2010
@@ -62,7 +62,6 @@
         <maven.version>2.0.9</maven.version>
         <mina.version>2.0.0-RC1</mina.version>
         <pax.exam.version>1.1.0</pax.exam.version>
-        <pax.logging.version>1.4.1-SNAPSHOT</pax.logging.version>
         <pax.runner.version>1.2.1</pax.runner.version>
         <pax.url.version>1.1.2</pax.url.version>
         <pax.web.version>0.7.1</pax.web.version>

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=941410&r1=941409&r2=941410&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Wed May  5 18:16:51
2010
@@ -63,7 +63,10 @@
                     <instructions>
                         <Embed-Dependency>pax-logging-service;inline=true</Embed-Dependency>
  
-                        <Import-Package>com.sun.jdmk.comm;resolution:=optional,
+                        <Import-Package>
+                            com.ibm.uvm.tools;resolution:=optional,
+                            com.sun.jdmk.comm;resolution:=optional,
+                            javax.jmdns;resolution:=optional,
                             javax.jms;resolution:=optional,
                             javax.mail;resolution:=optional,
                             javax.mail.internet;resolution:=optional,
@@ -75,25 +78,32 @@
                             javax.swing.table;resolution:=optional,
                             javax.swing.text;resolution:=optional,
                             javax.swing.tree;resolution:=optional,
+                            org.osgi.service.event;resolution:=optional;version="[1.0.0,2.0.0)",
+
                             javax.xml.parsers,
+                            org.apache.avalon.framework.logger;version="4.3.0",
+                            org.apache.commons.logging;version="1.1.0",
+                            org.apache.juli.logging;version="1.0.0",
                             org.knopflerfish.service.log;provider=paxlogging;version="[1.1.0,2.0.0)",
                             org.ops4j.pax.logging;version="[0.9.5,2.0.0)",
-                            org.ops4j.pax.logging.spi;provider=paxlogging;version="1.4",
+                            org.ops4j.pax.logging.avalon;version="1.5.0",
+                            org.ops4j.pax.logging.slf4j;version="1.5.0",
+                            org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5.0",
                             org.osgi.framework;version="[1.0.0,2.0.0)",
                             org.osgi.service.cm;version="[1.0.0,2.0.0)",
-                            org.osgi.service.event;resolution:=optional,
                             org.osgi.service.log;version="[1.3.0,2.0.0)",
                             org.osgi.util.tracker;version="[1.3.0,2.0.0)",
+                            org.slf4j;version="1.5.0",
                             org.w3c.dom,
                             org.xml.sax,
                             org.xml.sax.helpers,
-                            *</Import-Package>
-                        <Export-Package>org.apache.geronimo.logging,org.ops4j.pax.logging.spi;provider=paxlogging;version="1.4"</Export-Package>
-                        <!--
-                        <Bundle-Activator>org.ops4j.pax.logging.internal.Activator</Bundle-Activator>
-                        -->
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.geronimo.logging;version="${pom.version}",
+                            org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5"
+                        </Export-Package>
                         <Bundle-Activator>org.apache.geronimo.logging.impl.LoggingServiceActivator</Bundle-Activator>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=941410&r1=941409&r2=941410&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed May  5 18:16:51 2010
@@ -83,7 +83,7 @@
         <txmanagerVersion>3.0-SNAPSHOT</txmanagerVersion>
 
         <monitoringConsoleVersion>${version}</monitoringConsoleVersion>
-        <pax.logging.version>1.4.1-SNAPSHOT</pax.logging.version>
+        <pax.logging.version>1.5.0</pax.logging.version>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car
@@ -2402,21 +2402,6 @@ only found in cxf
                 </repository>
 
                 <repository>
-                    <id>ops4j.snapshots</id>
-                    <name>OPS4J Snapshots Repository</name>
-                    <layout>default</layout>
-                    <url>http://repository.ops4j.org/mvn-snapshots/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>daily</updatePolicy>
-                        <checksumPolicy>warn</checksumPolicy>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-
-                <repository>
                     <!-- org.eclipse.jetty routing -->
                     <id>jetty.oss.sonatype.org</id>
                     <name>Jetty Repository</name>



Mime
View raw message