[jboss-osgi-commits] JBoss-OSGI SVN: r89172 - in projects/jboss-osgi: projects/husky/trunk and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-20 08:30:05 -0400 (Wed, 20 May 2009) New Revision: 89172 Modified: projects/jboss-osgi/parent/trunk/pom.xml projects/jboss-osgi/projects/husky/trunk/pom.xml projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/build/docbook/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Installer build ok after restructure Modified: projects/jboss-osgi/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/parent/trunk/pom.xml 2009-05-20 11:53:20 UTC (rev 89171) +++ projects/jboss-osgi/parent/trunk/pom.xml 2009-05-20 12:30:05 UTC (rev 89172) @@ -150,6 +150,18 @@ </configuration> </plugin> <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <inherited>true</inherited> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <redirectTestOutputToFile>false</redirectTestOutputToFile> Modified: projects/jboss-osgi/projects/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-05-20 11:53:20 UTC (rev 89171) +++ projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-05-20 12:30:05 UTC (rev 89172) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Project - Husky Test Harness</name> + <name>JBossOSGi Project - Test Harness</name> <description>JBoss OSGi Bundle Testsuite</description> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-05-20 11:53:20 UTC (rev 89171) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-05-20 12:30:05 UTC (rev 89172) @@ -13,7 +13,7 @@ <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> - <name>JBossOSGi - Distribution</name> + <name>JBossOSGi Distribution</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-distribution</artifactId> @@ -35,42 +35,41 @@ <dependencies> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-deployer</artifactId> - <version>${version}</version> + <artifactId>jboss-osgi-deployers</artifactId> + <version>${version.jboss.osgi.deployers}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-deployer</artifactId> + <artifactId>jboss-osgi-deployers</artifactId> + <version>${version.jboss.osgi.deployers}</version> <classifier>sources</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <artifactId>jboss-osgi-integration-jbossas</artifactId> <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> - <classifier>sources</classifier> + <artifactId>jboss-osgi-integration-jbossas</artifactId> <version>${version}</version> + <classifier>sources</classifier> </dependency> <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> <classifier>sources</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> <classifier>javadoc</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> @@ -105,51 +104,44 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jmx</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jndi</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-logging</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-webconsole</artifactId> - <version>${version}</version> </dependency> <!-- Equinox Dependencies --> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version.jboss.osgi.runtime.equinox}</version> <classifier>config</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version.jboss.osgi.runtime.equinox}</version> <classifier>sources</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.eclipse.equinox</groupId> @@ -164,19 +156,18 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> <classifier>config</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> <classifier>sources</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -207,19 +198,18 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <version>${version.jboss.osgi.runtime.knopflerfish}</version> <classifier>config</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <version>${version.jboss.osgi.runtime.knopflerfish}</version> <classifier>sources</classifier> - <version>${version}</version> </dependency> <dependency> <groupId>org.knopflerfish</groupId> Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-05-20 11:53:20 UTC (rev 89171) +++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-05-20 12:30:05 UTC (rev 89172) @@ -14,7 +14,7 @@ <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> - <name>JBossOSGi - Userguide</name> + <name>JBossOSGi Userguide</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-userguide</artifactId> <packaging>jdocbook</packaging> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-05-20 11:53:20 UTC (rev 89171) +++ projects/jboss-osgi/trunk/pom.xml 2009-05-20 12:30:05 UTC (rev 89172) @@ -25,12 +25,18 @@ <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> + <version.izpack>4.2.0</version.izpack> <version.javax.servlet>2.4</version.javax.servlet> <version.jaxb.bundle>2.1.10-SNAPSHOT</version.jaxb.bundle> <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle> + <version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin> + <version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style> <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-SNAPSHOT</version.jboss.osgi.apache.xerces> <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers> + <version.jboss.osgi.jbossxb>2.0.0-SNAPSHOT</version.jboss.osgi.jbossxb> <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> <version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging> @@ -53,6 +59,11 @@ <version>${version.javax.servlet}</version> </dependency> <dependency> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-standalone-compiler</artifactId> + <version>${version.izpack}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> @@ -83,6 +94,11 @@ <!-- Bundle Dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>apache-xerces-bundle</artifactId> + <version>${version.jboss.osgi.apache.xerces}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jaxb-bundle</artifactId> <version>${version.jaxb.bundle}</version> </dependency> @@ -98,6 +114,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jbossxb-bundle</artifactId> + <version>${version.jboss.osgi.jbossxb}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jmx</artifactId> <version>${version.jboss.osgi.jmx}</version> </dependency>