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/05/14 22:59:12 UTC
svn commit: r944464 - in /geronimo/server/trunk:
framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
framework/modules/geronimo-shell-base/pom.xml
framework/modules/geronimo-shell/pom.xml pom.xml
Author: gawor
Date: Fri May 14 20:59:11 2010
New Revision: 944464
URL: http://svn.apache.org/viewvc?rev=944464&view=rev
Log:
pom updates. don't export versions, remove temporary aries repos and add a repo for xbean artifacts
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=944464&r1=944463&r2=944464&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Fri May 14 20:59:11 2010
@@ -45,12 +45,12 @@ org.osgi.framework.system.packages.extra
org.apache.yoko.osgi, \
org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
org.apache.felix.karaf.version; version=${karaf.osgi.version}, \
- org.apache.geronimo.main; version=${karaf.osgi.version}, \
- org.apache.geronimo.cli.daemon; version=${karaf.osgi.version}, \
- org.apache.geronimo.cli.client; version=${karaf.osgi.version}, \
- org.apache.geronimo.cli.shutdown; version=${karaf.osgi.version}, \
- org.apache.geronimo.cli.deployer; version=${karaf.osgi.version}, \
- org.apache.geronimo.transformer; version=${karaf.osgi.version}
+ org.apache.geronimo.main, \
+ org.apache.geronimo.cli.daemon, \
+ org.apache.geronimo.cli.client, \
+ org.apache.geronimo.cli.shutdown, \
+ org.apache.geronimo.cli.deployer, \
+ org.apache.geronimo.transformer
# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=944464&r1=944463&r2=944464&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Fri May 14 20:59:11 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml?rev=944464&r1=944463&r2=944464&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell/pom.xml Fri May 14 20:59:11 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -48,7 +48,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.felix.karaf.branding;version="${pom.version}"
+ org.apache.felix.karaf.branding
</Export-Package>
</instructions>
</configuration>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=944464&r1=944463&r2=944464&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri May 14 20:59:11 2010
@@ -77,7 +77,7 @@
<axis2Version>1.5</axis2Version>
<axiomVersion>1.2.8</axiomVersion>
<springVersion>2.5.6</springVersion>
- <xbeanVersion>3.7-SNAPSHOT</xbeanVersion>
+ <xbeanVersion>3.7</xbeanVersion>
<jetty>jetty8</jetty>
<txmanagerVersion>3.0</txmanagerVersion>
@@ -2392,36 +2392,10 @@ only found in cxf
<repositories>
<repository>
- <id>aries1</id>
- <name>aries1</name>
+ <id>xbean1</id>
+ <name>xbean1</name>
<layout>default</layout>
- <url>https://repository.apache.org/content/repositories/orgapachearies-009</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <repository>
- <id>aries2</id>
- <name>aries2</name>
- <layout>default</layout>
- <url>https://repository.apache.org/content/repositories/orgapachearies-004</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <repository>
- <id>aries3</id>
- <name>aries3</name>
- <layout>default</layout>
- <url>https://repository.apache.org/content/repositories/orgapachearies-010</url>
+ <url>https://repository.apache.org/content/repositories/orgapachegeronimo-031</url>
<snapshots>
<enabled>false</enabled>
</snapshots>