You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/28 06:15:44 UTC
svn commit: r938777 - in /geronimo/server/trunk: framework/pom.xml pom.xml
Author: gawor
Date: Wed Apr 28 04:15:44 2010
New Revision: 938777
URL: http://svn.apache.org/viewvc?rev=938777&view=rev
Log:
minor pom updates
Modified:
geronimo/server/trunk/framework/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=938777&r1=938776&r2=938777&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Wed Apr 28 04:15:44 2010
@@ -41,6 +41,7 @@
<artifactId>osgi</artifactId>
<version>3.5.1.v20090827</version>
</dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
@@ -56,6 +57,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
@@ -76,16 +78,13 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.service.obr</artifactId>
- <version>1.0.2</version>
- </dependency>
+
<dependency>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.main</artifactId>
<version>1.5.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
@@ -117,35 +116,6 @@
<version>1.1.2</version>
</dependency>
- <!-- overridden dependencies -->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.components</groupId>-->
- <!--<artifactId>geronimo-jaspi</artifactId>-->
- <!--<version>1.1-SNAPSHOT</version>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jaxb_2.1_spec</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>com.envoisolutions.sxc</groupId>-->
- <!--<artifactId>sxc-jaxb</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>org.codehaus.woodstox</groupId>-->
- <!--<artifactId>wstx-asl</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>com.sun.xml.bind</groupId>-->
- <!--<artifactId>jaxb-impl</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
@@ -173,11 +143,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
<version>2.4_3</version>
</dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jline</artifactId>
@@ -189,11 +161,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<version>1.1.4c_3</version>
</dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
@@ -220,33 +194,6 @@
</dependencies>
</dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
- <!--<configuration>-->
- <!--<instructions>-->
- <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
- <!--</instructions>-->
- <!--</configuration>-->
- </plugin>
-
- </plugins>
- </pluginManagement>
- </build>
-
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.testsupport</groupId>-->
- <!--<artifactId>testsupport-common</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
- <!--</dependencies>-->
- k,
<profiles>
<profile>
<id>default</id>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=938777&r1=938776&r2=938777&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Apr 28 04:15:44 2010
@@ -57,8 +57,6 @@
<!-- This property is required by the car:package mojo -->
<geronimoVersion>${version}</geronimoVersion>
- <!-- Additional version modifier added to all bundlized jars -->
- <bundleVersion>_1-SNAPSHOT</bundleVersion>
<geronimoSchemaVersion>1.2</geronimoSchemaVersion>
<warnOnDependencyChange>true</warnOnDependencyChange>