geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1102133 [2/2] - in /geronimo/server/branches/3.0-osgi/framework: buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenp...
Date Wed, 11 May 2011 23:17:45 GMT
Modified: geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml Wed May 11 23:17:44
2011
@@ -37,153 +37,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework.feature</groupId>
-            <artifactId>declarative-services</artifactId>
+            <artifactId>core</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-config-groovy-transformer</artifactId>
-            <version>${project.version}</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-crypto</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-obr</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
-            <version>${project.version}</version>
-
-            <!-- exclude transitive deps -->
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                    <!--<artifactId>geronimo-crypto</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                    <!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
-        </dependency>
-
-        <!-- Used by TemporaryClassLoader in kernel -->
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-runtime</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-            <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-
-        <!-- used by plugin installer -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>jaxb-impl</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>woodstox</artifactId>-->
-        <!--</dependency>-->
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.logging</groupId>-->
-            <!--<artifactId>pax-logging-api</artifactId>-->
-        <!--</dependency>-->
-
-        <!-- TODO figure out if this is the best way to implement what we want. Consider
a fragment? -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-pax-logging</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
-        <!--</dependency>-->
-
-        <dependency>
+      <dependency>
             <groupId>org.apache.geronimo.framework.config</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${project.version}</version>
@@ -225,6 +84,7 @@
                     <startLevel>50</startLevel>
                     <features>
                         <feature>declarative-services</feature>
+                        <feature>core</feature>
                     </features>
                     <aggregateFeatures>true</aggregateFeatures>
 

Modified: geronimo/server/branches/3.0-osgi/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/features/pom.xml?rev=1102133&r1=1102132&r2=1102133&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/features/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/features/pom.xml Wed May 11 23:17:44 2011
@@ -39,6 +39,7 @@
         <!--<module>client-system</module>-->
         <!--<module>j2ee-security</module>-->
         <module>declarative-services</module>
+        <module>core</module>
         <module>j2ee-system</module>
         <!--<module>jsr88-cli</module>-->
         <!--<module>jsr88-deploymentfactory</module>-->



Mime
View raw message