geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r938596 - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/buildsupport/geronimo-osgi-plugin/src/main/resources/ framework/modules/geronimo-security/ plugins/tomcat/geronimo-tomcat7/
Date Tue, 27 Apr 2010 18:33:59 GMT
Author: gawor
Date: Tue Apr 27 18:33:59 2010
New Revision: 938596

URL: http://svn.apache.org/viewvc?rev=938596&view=rev
Log:
manage org.apache.felix.karaf.jaas.boot dependency version and expose the boot package via
system bundle in geronimo-osgi-plugin

Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=938596&r1=938595&r2=938596&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Apr 27 18:33:59
2010
@@ -252,7 +252,6 @@
         <dependency>
             <groupId>org.apache.felix.karaf.jaas</groupId>
             <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=938596&r1=938595&r2=938596&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
(original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
Tue Apr 27 18:33:59 2010
@@ -139,7 +139,8 @@ org.osgi.framework.system.packages = \
  org.xml.sax.helpers
 
 org.osgi.framework.system.packages.extra = \
- sun.misc
+ sun.misc,\
+ org.apache.felix.karaf.jaas.boot;version=1.5.0
 
 org.osgi.framework.bootdelegation = \
  javax.*,\

Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=938596&r1=938595&r2=938596&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue Apr 27 18:33:59
2010
@@ -68,7 +68,6 @@
         <dependency>
             <groupId>org.apache.felix.karaf.jaas</groupId>
             <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=938596&r1=938595&r2=938596&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml Tue Apr 27 18:33:59 2010
@@ -98,7 +98,6 @@
         <dependency>
             <groupId>org.apache.felix.karaf.jaas</groupId>
             <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=938596&r1=938595&r2=938596&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 27 18:33:59 2010
@@ -1934,6 +1934,12 @@ only found in cxf
             </dependency>
 
             <dependency>
+                <groupId>org.apache.felix.karaf.jaas</groupId>
+                <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
+                <version>1.5.0-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>
                 <version>0.1-incubating-SNAPSHOT</version>



Mime
View raw message