You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/03/11 09:49:09 UTC
svn commit: r921729 - in /geronimo/server/trunk: ./
framework/buildsupport/car-maven-plugin/ framework/configs/karaf-framework/
framework/modules/ plugins/ plugins/jaxws/ plugins/jetty8/
testsupport/testsupport-selenium/
Author: djencks
Date: Thu Mar 11 08:49:09 2010
New Revision: 921729
URL: http://svn.apache.org/viewvc?rev=921729&view=rev
Log:
Switch to using osgi rather than felix core and compendium bundles, and try to fix the build by collecting all the repositories in a profile in the root pom
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/modules/pom.xml
geronimo/server/trunk/plugins/jaxws/pom.xml
geronimo/server/trunk/plugins/jetty8/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsupport/testsupport-selenium/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=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Thu Mar 11 08:49:09 2010
@@ -216,12 +216,12 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
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=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Thu Mar 11 08:49:09 2010
@@ -72,21 +72,6 @@
<sshd.version>0.3.0</sshd.version>
</properties>
- <repositories>
- <!-- ServiceMix repo -->
- <repository>
- <id>servicemix</id>
- <name>Apache ServiceMix Repository</name>
- <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencyManagement>
<dependencies>
<!-- use versions direct from karaf -->
Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Thu Mar 11 08:49:09 2010
@@ -32,12 +32,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/pom.xml?rev=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/pom.xml Thu Mar 11 08:49:09 2010
@@ -36,20 +36,6 @@
JAXWS plugin
</description>
- <repositories>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
<modules>
<module>geronimo-jaxws</module>
<module>geronimo-jaxws-builder</module>
Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Thu Mar 11 08:49:09 2010
@@ -14,7 +14,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -109,21 +110,7 @@
<module>geronimo-jetty8-clustering-wadi</module>
<module>jetty8-clustering-builder-wadi</module>
<module>jetty8-clustering-wadi</module>
- </modules>
+ </modules>
- <repositories>
- <repository>
- <id>jetty.oss.sonatype.org</id>
- <name>Jetty Repository</name>
- <layout>default</layout>
- <url>http://oss.sonatype.org/content/repositories/jetty/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Mar 11 08:49:09 2010
@@ -36,13 +36,13 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Mar 11 08:49:09 2010
@@ -1899,25 +1899,25 @@ only found in cxf
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.2.0</version>
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>org.osgi.foundation</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>javax.servlet</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
</dependency>
</dependencies>
</dependencyManagement>
@@ -2243,23 +2243,6 @@ only found in cxf
</site>
</distributionManagement>
- <repositories>
- <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>
- </repositories>
-
<pluginRepositories>
<!-- required for clean build unless you want to bootstrap the car-maven-plugin -->
<pluginRepository>
@@ -2344,6 +2327,94 @@ only found in cxf
</build>
</profile>
+ <profile>
+ <id>explicit-repos</id>
+ <activation>
+ <property>!nexus</property>
+ </activation>
+ <repositories>
+ <repository>
+ <!-- org.ops4j routing -->
+ <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>
+ <layout>default</layout>
+ <url>http://oss.sonatype.org/content/repositories/jetty/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <!-- equinox -->
+ <!-- org.eclipse routing -->
+ <id>smx.svn</id>
+ <name>Servicemix svn Repository</name>
+ <layout>default</layout>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>openqa-releases</id>
+ <name>Openqa Release Repository</name>
+ <url>http://nexus.openqa.org/content/repositories/releases</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>openqa-snapshots</id>
+ <name>Openqa Snapshot Repository</name>
+ <url>http://nexus.openqa.org/content/repositories/snapshots</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
<!--
NOTE: The staged build is used to get around a problem with Maven
and extension plugins.
Modified: geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml?rev=921729&r1=921728&r2=921729&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml (original)
+++ geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml Thu Mar 11 08:49:09 2010
@@ -60,38 +60,5 @@
<classifier>jdk15</classifier>
</dependency>
</dependencies>
-
- <!--
- NOTE: These are needed to pull Selenium artifacts.
- -->
-
- <repositories>
- <repository>
- <id>openqa-releases</id>
- <name>Openqa Release Repository</name>
- <url>http://nexus.openqa.org/content/repositories/releases</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>openqa-snapshots</id>
- <name>Openqa Snapshot Repository</name>
- <url>http://nexus.openqa.org/content/repositories/snapshots</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>