[jboss-osgi-commits] JBoss-OSGI SVN: r86736 - in projects/jboss-osgi/trunk: runtime/equinox and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-03 06:35:38 -0400 (Fri, 03 Apr 2009) New Revision: 86736 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/service/webconsole/pom.xml Log: Clean equinox dependencies Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-03 10:35:38 UTC (rev 86736) @@ -36,6 +36,7 @@ <!-- Properties --> <properties> <version.aqute.bnd>0.0.249</version.aqute.bnd> + <version.eclipse.osgi>3.4.2</version.eclipse.osgi> <version.felix.configadmin>1.0.10</version.felix.configadmin> <version.felix.framework>1.4.1</version.felix.framework> <version.felix.http.jetty>0.9.0-20090218-R745505</version.felix.http.jetty> @@ -45,6 +46,7 @@ <version.felix.osgi.core>1.2.0</version.felix.osgi.core> <version.felix.webconsole>1.2.8</version.felix.webconsole> <version.izpack>4.2.0</version.izpack> + <version.javax.servlet>2.4</version.javax.servlet> <version.jbossas>5.0.1.GA</version.jbossas> <version.jboss.aop>2.0.1.GA</version.jboss.aop> <version.jboss.common.core>2.2.11.GA</version.jboss.common.core> @@ -71,6 +73,11 @@ <version>${version.aqute.bnd}</version> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.javax.servlet}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${version.junit}</version> @@ -86,6 +93,16 @@ <version>${version.izpack}</version> </dependency> <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>${version.eclipse.osgi}</version> + </dependency> + <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.osgi.services</artifactId> + <version>${version.eclipse.osgi}</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>${version.jboss.common.core}</version> Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 10:35:38 UTC (rev 86736) @@ -23,15 +23,23 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-spi</artifactId> <version>${version}</version> </dependency> <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - <version>3.4.3.R34x_v20081215-1030</version> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.osgi</artifactId> </dependency> + <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.osgi.services</artifactId> + </dependency> <!-- Test Dependencies --> <dependency> Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) +++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-03 10:35:38 UTC (rev 86736) @@ -14,6 +14,63 @@ <version>1.0.0.Beta1</version> </parent> + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20070829</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>1.0.3</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + </dependencies> + + <!-- Build --> <build> <plugins> <plugin> @@ -85,59 +142,4 @@ </plugins> </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.webconsole</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr</artifactId> - <version>1.0.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>1.0.3</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - </dependencies> </project>