JBoss-OSGI SVN: r89857 - projects/jboss-osgi/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-05 01:24:14 -0400 (Fri, 05 Jun 2009)
New Revision: 89857
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
Update to IzPack-4.3.0 to track down EOF
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-06-05 04:56:27 UTC (rev 89856)
+++ projects/jboss-osgi/trunk/pom.xml 2009-06-05 05:24:14 UTC (rev 89857)
@@ -30,7 +30,7 @@
<version.apache.felix.http.jetty>1.0.0</version.apache.felix.http.jetty>
<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.2.0</version.izpack>
+ <version.izpack>4.3.0</version.izpack>
<version.javax.servlet>2.4</version.javax.servlet>
<version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
<version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
15 years, 4 months
JBoss-OSGI SVN: r89825 - in projects/jboss-osgi/trunk: distribution and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 10:34:05 -0400 (Thu, 04 Jun 2009)
New Revision: 89825
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Fix distro build
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-06-04 14:20:48 UTC (rev 89824)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-06-04 14:34:05 UTC (rev 89825)
@@ -55,17 +55,18 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
+ <version>${version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
+ <version>${version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
@@ -140,14 +141,6 @@
<version>${version.jboss.osgi.runtime.equinox}</version>
<classifier>sources</classifier>
</dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- </dependency>
<!-- Felix Dependencies -->
<dependency>
@@ -168,10 +161,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<scope>provided</scope>
</dependency>
@@ -208,10 +197,6 @@
<version>${version.jboss.osgi.runtime.knopflerfish}</version>
<classifier>sources</classifier>
</dependency>
- <dependency>
- <groupId>org.knopflerfish</groupId>
- <artifactId>org.knopflerfish.framework</artifactId>
- </dependency>
<!-- izpack -->
<dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-06-04 14:20:48 UTC (rev 89824)
+++ projects/jboss-osgi/trunk/pom.xml 2009-06-04 14:34:05 UTC (rev 89825)
@@ -33,6 +33,8 @@
<version.izpack>4.2.0</version.izpack>
<version.javax.servlet>2.4</version.javax.servlet>
<version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
+ <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.4.GA</version.jboss.microcontainer>
15 years, 4 months
JBoss-OSGI SVN: r89823 - in projects/jboss-osgi/trunk: blueprint and 9 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 10:19:41 -0400 (Thu, 04 Jun 2009)
New Revision: 89823
Modified:
projects/jboss-osgi/trunk/blueprint/impl/pom.xml
projects/jboss-osgi/trunk/blueprint/pom.xml
projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/docbook/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/spi/pom.xml
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/trailblazer/pom.xml
Log:
Cleanup dependency management after project extraction
Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint-parent</artifactId>
- <version>1.0.0.Alpha1</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Dependencies -->
@@ -19,6 +19,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version}</version>
</dependency>
<!-- Provided Dependencies -->
Modified: projects/jboss-osgi/trunk/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/blueprint/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -7,12 +7,10 @@
<artifactId>jboss-osgi-blueprint-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.Alpha1</version>
-
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Modules -->
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -10,12 +10,19 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint-parent</artifactId>
- <version>1.0.0.Alpha1</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
@@ -46,11 +53,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Dependencies -->
Modified: projects/jboss-osgi/trunk/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/docbook/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/docbook/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Plugins -->
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Modules -->
@@ -24,30 +24,20 @@
<!-- Properties -->
<properties>
- <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
<version.args4j>2.0.12</version.args4j>
- <version.equinox>3.4.2</version.equinox>
- <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository>
- <version.felix.configadmin>1.0.10</version.felix.configadmin>
- <version.felix.framework>1.8.0</version.felix.framework>
- <version.felix.http.jetty>1.0.0</version.felix.http.jetty>
- <version.felix.javax.servlet>1.0.0</version.felix.javax.servlet>
- <version.felix.log>1.0.0</version.felix.log>
- <version.felix.metatype>1.0.2</version.felix.metatype>
- <version.felix.osgi.core>1.2.0</version.felix.osgi.core>
- <version.felix.scr>1.0.0</version.felix.scr>
- <version.felix.webconsole>1.2.8</version.felix.webconsole>
+ <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
+ <version.apache.felix.core>1.2.0</version.apache.felix.core>
+ <version.apache.felix.http.jetty>1.0.0</version.apache.felix.http.jetty>
+ <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.2.0</version.izpack>
<version.javax.servlet>2.4</version.javax.servlet>
- <version.jboss.aop>2.0.1.GA</version.jboss.aop>
<version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
- <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.4.GA</version.jboss.microcontainer>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
<version.jboss.osgi.apache.xerces>2.9.1</version.jboss.osgi.apache.xerces>
- <version.jboss.osgi.blueprint>1.0.0.Alpha1</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core>
<version.jboss.osgi.deployers>1.0.0.Beta2</version.jboss.osgi.deployers>
@@ -62,164 +52,84 @@
<version.jboss.osgi.runtime.equinox>1.0.0.Beta2</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>1.0.0.Beta2</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.knopflerfish>1.0.0.Beta2</version.jboss.osgi.runtime.knopflerfish>
- <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi>
<version.jboss.osgi.webconsole>1.0.0.Beta2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.0</version.jboss.osgi.xml.binding>
- <version.jbossas>5.0.1.GA</version.jbossas>
<version.junit>4.6</version.junit>
- <version.knopflerfish>2.2.0</version.knopflerfish>
<version.osgi>r4v41</version.osgi>
</properties>
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
-
- <!-- JBoss OSGi Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
- <version>${version.jboss.osgi.blueprint}</version>
- </dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>${version.args4j}</version>
+ </dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.deployers}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-integration-jbossas</artifactId>
- <version>${version.jboss.osgi.integration.jbossas}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${version.apache.felix.configadmin}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${version.apache.felix.http.jetty}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.apache.felix.log}</version>
</dependency>
-
- <!-- JBoss OSGi Bundle Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>${version.apache.felix.metatype}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-hotdeploy</artifactId>
- <version>${version.jboss.osgi.hotdeploy}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.apache.felix.core}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.apache.felix.core}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-remotelog</artifactId>
- <version>${version.jboss.osgi.remotelog}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
- </dependency>
-
- <!-- 3rd Party Bundle Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
- </dependency>
-
- <!-- 3rd Party Dependencies -->
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>${version.args4j}</version>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- <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>
- </dependency>
- <dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-standalone-compiler</artifactId>
<version>${version.izpack}</version>
</dependency>
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
<version>${version.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.jboss.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.deployers}</version>
+ <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-spi</artifactId>
+ <artifactId>jboss-logging-log4j</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging-spi</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
<dependency>
@@ -238,113 +148,104 @@
<version>${version.jboss.naming}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <version>${version.jbossas}</version>
- <type>pom</type>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.deployers}</version>
</dependency>
-
- <!-- OSGi Dependencies -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-integration-jbossas</artifactId>
+ <version>${version.jboss.osgi.integration.jbossas}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
</dependency>
-
- <!-- Equinox Dependencies -->
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<version>${version.jboss.osgi.runtime.equinox}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${version.equinox}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>${version.equinox}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <version>${version.jboss.osgi.runtime.knopflerfish}</version>
</dependency>
-
- <!-- Felix Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
+ <version>${version.jboss.osgi.apache.xerces}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>${version.felix.javax.servlet}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>${version.felix.bundlerepository}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.felix.osgi.core}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-hotdeploy</artifactId>
+ <version>${version.jboss.osgi.hotdeploy}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.felix.osgi.core}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${version.felix.configadmin}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${version.felix.framework}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.felix.http.jetty}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>${version.felix.log}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-remotelog</artifactId>
+ <version>${version.jboss.osgi.remotelog}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${version.felix.metatype}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>${version.felix.scr}</version>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>${version.felix.webconsole}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
</dependency>
-
- <!-- Knopflerfish Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
- <version>${version.jboss.osgi.runtime.knopflerfish}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
</dependency>
<dependency>
- <groupId>org.knopflerfish</groupId>
- <artifactId>org.knopflerfish.framework</artifactId>
- <version>${version.knopflerfish}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: projects/jboss-osgi/trunk/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/spi/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/spi/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -8,13 +8,11 @@
<artifactId>jboss-osgi-spi</artifactId>
<packaging>jar</packaging>
- <version>1.0.0.Beta2</version>
-
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Dependencies -->
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-testsuite</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-testsuite</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<modules>
@@ -29,6 +29,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -102,13 +103,6 @@
<scope>provided</scope>
</dependency>
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.naming</groupId>
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/pom.xml 2009-06-04 14:00:36 UTC (rev 89822)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/pom.xml 2009-06-04 14:19:41 UTC (rev 89823)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-testsuite</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0.Beta3</version>
</parent>
<!-- Properties -->
15 years, 4 months
JBoss-OSGI SVN: r89820 - projects/jboss-osgi/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 09:06:02 -0400 (Thu, 04 Jun 2009)
New Revision: 89820
Removed:
projects/jboss-osgi/trunk/3rdparty/
projects/jboss-osgi/trunk/bundles/
projects/jboss-osgi/trunk/husky/
projects/jboss-osgi/trunk/integration/
projects/jboss-osgi/trunk/repository/
projects/jboss-osgi/trunk/runtime/
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
Extract projects to use their own lifecycle
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-06-04 13:00:43 UTC (rev 89819)
+++ projects/jboss-osgi/trunk/pom.xml 2009-06-04 13:06:02 UTC (rev 89820)
@@ -18,12 +18,6 @@
<!-- Modules -->
<modules>
<module>spi</module>
- <module>3rdparty</module>
- <module>runtime</module>
- <module>integration</module>
- <module>repository</module>
- <module>bundles</module>
- <module>husky</module>
<module>blueprint</module>
<module>testsuite</module>
</modules>
15 years, 4 months
JBoss-OSGI SVN: r89819 - in projects/jboss-osgi/projects: husky and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 09:00:43 -0400 (Thu, 04 Jun 2009)
New Revision: 89819
Added:
projects/jboss-osgi/projects/husky/
projects/jboss-osgi/projects/husky/trunk/
projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties
Removed:
projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties
Modified:
projects/jboss-osgi/projects/husky/trunk/harness/pom.xml
projects/jboss-osgi/projects/husky/trunk/pom.xml
projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml
projects/jboss-osgi/projects/husky/trunk/testsuite/scripts/assembly-bundles.xml
Log:
Extract husky
Copied: projects/jboss-osgi/projects/husky/trunk (from rev 89750, projects/jboss-osgi/trunk/husky)
Property changes on: projects/jboss-osgi/projects/husky/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Modified: projects/jboss-osgi/projects/husky/trunk/harness/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/husky/trunk/harness/pom.xml 2009-06-04 13:00:43 UTC (rev 89819)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: projects/jboss-osgi/projects/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-06-04 13:00:43 UTC (rev 89819)
@@ -22,19 +22,72 @@
<artifactId>jboss-osgi-husky-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.Beta2</version>
-
- <!-- Parent -->
+ <version>1.0.0-SNAPSHOT</version>
+
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta2</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
+ <properties>
+ <version.felix.log>1.0.0</version.felix.log>
+ <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common>
+ <version.jboss.osgi.jmx>1.0.0.Beta2</version.jboss.osgi.jmx>
+ <version.jboss.osgi.runtime.felix>1.0.0.Beta2</version.jboss.osgi.runtime.felix>
+ <version.junit>4.6</version.junit>
+ <version.osgi>r4v41</version.osgi>
+ </properties>
+
<!-- Modules -->
<modules>
<module>harness</module>
<module>testsuite</module>
</modules>
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+
+ <!-- Bundle Dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.felix.log}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <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>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml 2009-06-04 13:00:43 UTC (rev 89819)
@@ -25,12 +25,19 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
@@ -60,16 +67,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</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-jmx</artifactId>
<scope>provided</scope>
</dependency>
@@ -116,59 +113,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
<!-- Profiles -->
<profiles>
-
- <!--
- Name: framework-equinox
- Descr: Setup for Equinox framework integration testing
- -->
- <profile>
- <id>framework-equinox</id>
- <activation>
- <property>
- <name>framework</name>
- <value>equinox</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: framework-knopflerfish
- Descr: Setup for Knopflerfish framework integration testing
- -->
- <profile>
- <id>framework-knopflerfish</id>
- <activation>
- <property>
- <name>framework</name>
- <value>knopflerfish</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
Modified: projects/jboss-osgi/projects/husky/trunk/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/husky/trunk/testsuite/scripts/assembly-bundles.xml 2009-06-04 13:00:43 UTC (rev 89819)
@@ -16,7 +16,6 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>*:jboss-osgi-common:jar</include>
- <include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-husky:jar</include>
<include>*:org.apache.felix.log:jar</include>
Deleted: projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-04 13:00:43 UTC (rev 89819)
@@ -1,38 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id$
-#
-
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${basedir}/target/osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=localhost
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# Framework bootdelegation
-# org.osgi.framework.bootdelegation=org.osgi.service.log
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.testing;version=1.0, \
- org.osgi.framework;version=1.4
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar
Copied: projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties (from rev 89750, projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties)
===================================================================
--- projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties (rev 0)
+++ projects/jboss-osgi/projects/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-06-04 13:00:43 UTC (rev 89819)
@@ -0,0 +1,38 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${basedir}/target/osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=localhost
+org.jboss.osgi.husky.runtime.connector.port=5401
+
+# Framework bootdelegation
+# org.osgi.framework.bootdelegation=org.osgi.service.log
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.testing;version=1.0, \
+ org.osgi.framework;version=1.4
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-common.jar
15 years, 4 months
JBoss-OSGI SVN: r89818 - projects/jboss-osgi/projects/parent/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 08:48:38 -0400 (Thu, 04 Jun 2009)
New Revision: 89818
Added:
projects/jboss-osgi/projects/parent/trunk/.project
Modified:
projects/jboss-osgi/projects/parent/trunk/
projects/jboss-osgi/projects/parent/trunk/pom.xml
Log:
Add bnd dependency management
Property changes on: projects/jboss-osgi/projects/parent/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/projects/parent/trunk/.project
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/.project (rev 0)
+++ projects/jboss-osgi/projects/parent/trunk/.project 2009-06-04 12:48:38 UTC (rev 89818)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-parent</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-06-04 12:34:37 UTC (rev 89817)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-06-04 12:48:38 UTC (rev 89818)
@@ -7,24 +7,28 @@
<artifactId>jboss-osgi-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
-
<url>http://www.jboss.org/community/wiki/JBossOSGi</url>
<description>JBossOSGi</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
+ <version>1.0.1-SNAPSHOT</version>
<!-- Properties -->
<properties>
<version.aqute.bnd>0.0.323</version.aqute.bnd>
</properties>
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
-
<!-- Plugins -->
<plugins>
<plugin>
@@ -132,6 +136,12 @@
</pluginRepository>
</pluginRepositories>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
+ </scm>
+
<!-- Licenses -->
<licenses>
<license>
15 years, 4 months
JBoss-OSGI SVN: r89816 - in projects/jboss-osgi/projects/bundles: webconsole and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 08:30:20 -0400 (Thu, 04 Jun 2009)
New Revision: 89816
Added:
projects/jboss-osgi/projects/bundles/webconsole/
projects/jboss-osgi/projects/bundles/webconsole/trunk/
Modified:
projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml
Log:
Extract bundles/webconsole
Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk (from rev 89750, projects/jboss-osgi/trunk/bundles/webconsole)
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/webconsole/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-06-04 12:30:20 UTC (rev 89816)
@@ -8,18 +8,22 @@
<artifactId>jboss-osgi-webconsole</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0.Beta2</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.0</version>
</parent>
<!-- Properties -->
<properties>
<version.commons.fileupload>1.1.1</version.commons.fileupload>
<version.commons.io>1.4</version.commons.io>
+ <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository>
+ <version.felix.osgi.core>1.2.0</version.felix.osgi.core>
+ <version.felix.scr>1.0.0</version.felix.scr>
+ <version.felix.webconsole>1.2.8</version.felix.webconsole>
<version.javax.servlet>2.4</version.javax.servlet>
<version.json>20070829</version.json>
</properties>
@@ -49,11 +53,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.felix.osgi.core}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
+ <version>${version.felix.webconsole}</version>
<scope>provided</scope>
</dependency>
@@ -68,12 +74,14 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
+ <version>${version.felix.scr}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>${version.felix.bundlerepository}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
15 years, 4 months
JBoss-OSGI SVN: r89815 - in projects/jboss-osgi/projects/bundles: remotelog and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 08:20:56 -0400 (Thu, 04 Jun 2009)
New Revision: 89815
Added:
projects/jboss-osgi/projects/bundles/remotelog/
projects/jboss-osgi/projects/bundles/remotelog/trunk/
Modified:
projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml
Log:
Extract bundles/remotelog
Copied: projects/jboss-osgi/projects/bundles/remotelog/trunk (from rev 89750, projects/jboss-osgi/trunk/bundles/remotelog)
Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/remotelog/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-06-04 12:20:56 UTC (rev 89815)
@@ -9,17 +9,19 @@
<artifactId>jboss-osgi-remotelog</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
- <!-- Parent -->
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0.Beta2</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.0</version>
</parent>
<!-- Properties -->
<properties>
+ <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common>
+ <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -27,27 +29,30 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
+ <!-- Bundle Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
-
- <!-- Bundle Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
<build>
15 years, 4 months
JBoss-OSGI SVN: r89814 - in projects/jboss-osgi/projects/bundles: microcontainer and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 08:17:48 -0400 (Thu, 04 Jun 2009)
New Revision: 89814
Added:
projects/jboss-osgi/projects/bundles/microcontainer/
projects/jboss-osgi/projects/bundles/microcontainer/trunk/
Modified:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
Log:
Extract bundles/microcontainer
Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk (from rev 89750, projects/jboss-osgi/trunk/bundles/microcontainer)
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-06-04 12:17:48 UTC (rev 89814)
@@ -9,65 +9,89 @@
<artifactId>jboss-osgi-microcontainer</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
- <!-- Parent -->
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0.Beta2</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+ <!-- Properties -->
+ <properties>
+ <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
+ <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
+ <version.jboss.osgi.apache.xerces>2.9.1</version.jboss.osgi.apache.xerces>
+ <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common>
+ <version.jboss.osgi.deployers>1.0.0.Beta2</version.jboss.osgi.deployers>
+ <version.jboss.osgi.jbossas>1.0.0.Beta2</version.jboss.osgi.jbossas>
+ <version.jboss.osgi.jmx>1.0.0.Beta2</version.jboss.osgi.jmx>
+ <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi>
+ <version.jboss.osgi.xml.binding>2.0.0</version.jboss.osgi.xml.binding>
+ <version.osgi>r4v41</version.osgi>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-integration-jbossas</artifactId>
+ <version>${version.jboss.osgi.jbossas}</version>
</dependency>
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
+ <version>${version.jboss.osgi.apache.xerces}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
</dependency>
<!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
15 years, 4 months
JBoss-OSGI SVN: r89813 - in projects/jboss-osgi/projects/bundles: jmx and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-06-04 08:10:34 -0400 (Thu, 04 Jun 2009)
New Revision: 89813
Added:
projects/jboss-osgi/projects/bundles/jmx/
projects/jboss-osgi/projects/bundles/jmx/trunk/
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
Log:
Extract bundles/jmx
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk (from rev 89750, projects/jboss-osgi/trunk/bundles/jmx)
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-06-04 12:10:34 UTC (rev 89813)
@@ -8,13 +8,21 @@
<artifactId>jboss-osgi-jmx</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0.Beta2</version>
+ <version>1.0.0-SNAPSHOT</version>
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0.Beta2</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+
+ <!-- Properties -->
+ <properties>
+ <version.jboss.osgi.common>1.0.0.Beta2</version.jboss.osgi.common>
+ <version.jboss.osgi.jndi>1.0.0.Beta2</version.jboss.osgi.jndi>
+ <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi>
+ <version.osgi>r4v41</version.osgi>
+ </properties>
<!-- Dependencies -->
<dependencies>
@@ -22,29 +30,34 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Bundles -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
15 years, 4 months