[jboss-osgi-commits] JBoss-OSGI SVN: r89396 - in projects/jboss-osgi/branches/tdiesler: projects and 7 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Mon May 25 16:53:02 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-25 16:53:01 -0400 (Mon, 25 May 2009)
New Revision: 89396
Added:
projects/jboss-osgi/branches/tdiesler/3rdparty/
Removed:
projects/jboss-osgi/branches/tdiesler/projects/parent/
Modified:
projects/jboss-osgi/branches/tdiesler/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/husky/trunk/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/integration/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/repository/trunk/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/runtime/pom.xml
projects/jboss-osgi/branches/tdiesler/projects/spi/trunk/pom.xml
Log:
Add projects to trunk
Modified: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -9,14 +9,9 @@
<version>1.0.0.Beta2</version>
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
<!-- Modules -->
<modules>
+ <module>projects</module>
<module>testsuite</module>
</modules>
@@ -24,12 +19,25 @@
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
+ <version.aqute.bnd>0.0.323</version.aqute.bnd>
+ <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.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.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-SNAPSHOT</version.jboss.osgi.apache.xerces>
@@ -48,6 +56,8 @@
<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.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>
@@ -55,6 +65,26 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${version.javax.servlet}</version>
@@ -155,22 +185,96 @@
<version>${version.jboss.osgi.webconsole}</version>
</dependency>
- <!-- Framework Dependencies -->
+ <!-- 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>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${version.equinox}</version>
+ </dependency>
+
+ <!-- Felix Dependencies -->
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${version.felix.javax.servlet}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>${version.felix.bundlerepository}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.felix.osgi.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.felix.osgi.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${version.felix.configadmin}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${version.felix.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${version.felix.http.jetty}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.felix.log}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>${version.felix.metatype}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>${version.felix.scr}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>${version.felix.webconsole}</version>
+ </dependency>
+
+ <!-- Knopflerfish Dependencies -->
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
<version>${version.jboss.osgi.runtime.knopflerfish}</version>
</dependency>
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>org.knopflerfish.framework</artifactId>
+ <version>${version.knopflerfish}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -193,6 +297,28 @@
<!-- Plugins -->
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </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>
@@ -227,6 +353,23 @@
</plugin>
</plugins>
+ <!-- PluginManagement -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<!-- Repositories -->
@@ -243,12 +386,87 @@
<id>snapshots.jboss.org</id>
<name>JBoss Snapshots Repository</name>
<url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>aQute</id>
+ <url>http://www.aQute.biz/repo</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
+
+ <!-- PluginRepositories -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ <!-- Source Repository -->
+ <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>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt
+ </url>
+ </license>
+ </licenses>
+
+ <!-- DistributionManagement -->
+ <distributionManagement>
+ <!--
+ Add this to your ~/.m2/settings.xml <servers> <server> <id>jbpm.dyndns.org</id> <username>yourname</username> <privateKey>/home/yourname/.ssh/id_rsa</privateKey>
+ <passphrase>yourpass</passphrase> </server> </servers>
+ -->
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ <!--
+ <site>
+ <id>jbpm.dyndns.org</id>
+ <url>scp://jbpm.dyndns.org/var/www/html/jboss-osgi
+ </url>
+ </site>
+ -->
+ </distributionManagement>
+
+ <!-- Reporting -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <show>public</show>
+ <excludePackageNames>*.internal:*.incubator:*.test</excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
<!-- Profiles -->
<profiles>
Modified: projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/branches/tdiesler/projects/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/husky/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/husky/trunk/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Modules -->
Modified: projects/jboss-osgi/branches/tdiesler/projects/integration/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/integration/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/integration/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -13,7 +13,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Modules -->
Modified: projects/jboss-osgi/branches/tdiesler/projects/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -6,12 +6,10 @@
<artifactId>jboss-osgi-projects</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
-
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/branches/tdiesler/projects/repository/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/repository/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/repository/trunk/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<modules>
Modified: projects/jboss-osgi/branches/tdiesler/projects/runtime/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/runtime/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/runtime/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/branches/tdiesler/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/spi/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395)
+++ projects/jboss-osgi/branches/tdiesler/projects/spi/trunk/pom.xml 2009-05-25 20:53:01 UTC (rev 89396)
@@ -14,8 +14,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-projects</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
More information about the jboss-osgi-commits
mailing list