[jboss-cvs] JBossAS SVN: r91157 - in projects/jboss-osgi/trunk: distribution and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 13 09:33:50 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-13 09:33:50 -0400 (Mon, 13 Jul 2009)
New Revision: 91157
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/docbook/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Cleanup properties and dependency management
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-13 12:23:39 UTC (rev 91156)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-13 13:33:50 UTC (rev 91157)
@@ -44,17 +44,17 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky-harness</artifactId>
+ <artifactId>jboss-osgi-husky</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky-harness</artifactId>
+ <artifactId>jboss-osgi-husky</artifactId>
<version>${version.jboss.osgi.husky}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky-harness</artifactId>
+ <artifactId>jboss-osgi-husky</artifactId>
<version>${version.jboss.osgi.husky}</version>
<classifier>javadoc</classifier>
</dependency>
Modified: projects/jboss-osgi/trunk/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/docbook/pom.xml 2009-07-13 12:23:39 UTC (rev 91156)
+++ projects/jboss-osgi/trunk/docbook/pom.xml 2009-07-13 13:33:50 UTC (rev 91157)
@@ -26,6 +26,12 @@
<version>1.0.0.Beta3</version>
</parent>
+ <!-- Properties -->
+ <properties>
+ <version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
+ <version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style>
+ </properties>
+
<!-- Plugins -->
<build>
<resources>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-07-13 12:23:39 UTC (rev 91156)
+++ projects/jboss-osgi/trunk/pom.xml 2009-07-13 13:33:50 UTC (rev 91157)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi</name>
-
+
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
<packaging>pom</packaging>
@@ -15,7 +15,7 @@
<artifactId>jboss-osgi-parent</artifactId>
<version>1.0.1-SNAPSHOT</version>
</parent>
-
+
<!-- Modules -->
<modules>
<module>testsuite</module>
@@ -23,6 +23,10 @@
<!-- Properties -->
<properties>
+ <!--
+ Here we define the version's of artefacts that we distribute.
+ Dependencies, of the individual projects are defined with the projects.
+ -->
<version.args4j>2.0.12</version.args4j>
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.core>1.2.0</version.apache.felix.core>
@@ -30,13 +34,6 @@
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.izpack>4.3.1</version.izpack>
- <version.javax.servlet>2.4</version.javax.servlet>
- <version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
- <version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style>
- <version.jboss.jbossas>5.0.1.GA</version.jboss.jbossas>
- <version.jboss.logging>2.0.5.GA</version.jboss.logging>
- <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
- <version.jboss.naming>5.0.1.GA</version.jboss.naming>
<version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0-SNAPSHOT</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
@@ -56,8 +53,10 @@
<version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webconsole>1.0.0-SNAPSHOT</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding>
+
+ <!-- Properties for test dependencies -->
+ <version.jboss.logging>2.0.5.GA</version.jboss.logging>
<version.junit>4.6</version.junit>
- <version.osgi>r4v41</version.osgi>
</properties>
<!-- DependencyManagement -->
@@ -67,11 +66,11 @@
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<version>${version.args4j}</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.javax.servlet}</version>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-standalone-compiler</artifactId>
+ <version>${version.izpack}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -104,42 +103,11 @@
<version>${version.apache.felix.core}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${version.izpack}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <version>${version.jboss.jbossas}</version>
- <type>pom</type>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${version.jboss.naming}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
- <version>${version.jboss.osgi.blueprint}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
<version>${version.jboss.osgi.deployers}</version>
@@ -181,6 +149,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
<version>${version.jboss.osgi.common}</version>
</dependency>
@@ -230,16 +203,6 @@
<version>${version.jboss.osgi.xml.binding}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
@@ -247,7 +210,7 @@
</dependencies>
</dependencyManagement>
- <!-- Dependencies -->
+ <!--Dependencies -->
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -260,7 +223,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<!-- Repositories -->
<repositories>
<repository>
@@ -296,7 +259,7 @@
scp -r docbook/target/docbook/publish/en-US/* jbmuc.dyndns.org:/var/www/html/jboss-osgi-${version}/userguide/
-->
</distributionManagement>
-
+
<!-- Profiles -->
<profiles>
@@ -321,73 +284,6 @@
</plugins>
</build>
</profile>
-
- <!--
- Name: jboss501
- Descr: Setup for jboss501 integration testing
- -->
- <profile>
- <id>jboss501</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss501</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: jboss510
- Descr: Setup for jboss510 integration testing
- -->
- <profile>
- <id>jboss510</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss510</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: jboss600
- Descr: Setup for jboss600 integration testing
- -->
- <profile>
- <id>jboss600</id>
- <activation>
- <property>
- <name>target.container</name>
- <value>jboss600</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </profile>
-
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-13 12:23:39 UTC (rev 91156)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-13 13:33:50 UTC (rev 91157)
@@ -22,16 +22,35 @@
<!-- Properties -->
<properties>
+ <version.javax.servlet>2.4</version.javax.servlet>
+ <version.jboss.naming>5.0.1.GA</version.jboss.naming>
+ <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
</properties>
-
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${version.jboss.naming}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- </dependency>
-
- <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
@@ -39,6 +58,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ </dependency>
<!-- Bundle Dependencies -->
<dependency>
@@ -62,47 +85,17 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
<scope>provided</scope>
</dependency>
@@ -111,13 +104,6 @@
<artifactId>jboss-osgi-remotelog</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
@@ -291,6 +277,72 @@
</build>
</profile>
+ <!--
+ Name: jboss501
+ Descr: Setup for jboss501 integration testing
+ -->
+ <profile>
+ <id>jboss501</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ <value>jboss501</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ Name: jboss510
+ Descr: Setup for jboss510 integration testing
+ -->
+ <profile>
+ <id>jboss510</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ <value>jboss510</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ Name: jboss600
+ Descr: Setup for jboss600 integration testing
+ -->
+ <profile>
+ <id>jboss600</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ <value>jboss600</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
More information about the jboss-cvs-commits
mailing list