[jboss-cvs] JBossAS SVN: r82649 - in projects/jboss-osgi/trunk: build and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 6 18:33:12 EST 2009


Author: pgier
Date: 2009-01-06 18:33:12 -0500 (Tue, 06 Jan 2009)
New Revision: 82649

Added:
   projects/jboss-osgi/trunk/build/src/
   projects/jboss-osgi/trunk/build/src/assembly/
   projects/jboss-osgi/trunk/build/src/assembly/dist-with-deps.xml
Removed:
   projects/jboss-osgi/trunk/build/assembly/
   projects/jboss-osgi/trunk/osgi-int/pom-jdk14.xml
   projects/jboss-osgi/trunk/osgi-repository-api/pom-jdk14.xml
Modified:
   projects/jboss-osgi/trunk/
   projects/jboss-osgi/trunk/build/
   projects/jboss-osgi/trunk/build/pom.xml
   projects/jboss-osgi/trunk/build/src/assembly/dist.xml
   projects/jboss-osgi/trunk/build/src/assembly/src.xml
   projects/jboss-osgi/trunk/osgi-int/pom.xml
   projects/jboss-osgi/trunk/osgi-repository-api/pom.xml
   projects/jboss-osgi/trunk/pom.xml
Log:
[JBBUILD-507] Updates to building the dist zips.


Property changes on: projects/jboss-osgi/trunk
___________________________________________________________________
Name: svn:ignore
   + .classpath
.project



Property changes on: projects/jboss-osgi/trunk/build
___________________________________________________________________
Name: svn:ignore
   + target


Modified: projects/jboss-osgi/trunk/build/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/pom.xml	2009-01-06 23:31:16 UTC (rev 82648)
+++ projects/jboss-osgi/trunk/build/pom.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -8,21 +8,61 @@
   - add a dependency in the dependencyManagement section which refers to
     the property
 -->
-<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">
+<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">
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
+    <artifactId>jboss-osgi-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.osgi</groupId>
-  <artifactId>jboss-osgi-dist</artifactId>
+  <artifactId>jboss-osgi</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JBoss OSGi Distribution Build</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
-  <description>
-    JBoss OSGi Distribution Build
-  </description>
+  <url>http://www.jboss.org/jbossmc</url>
+  <description> JBoss OSGi Distribution Build</description>
   
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <finalName>jboss-osgi-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/assembly/dist.xml</descriptor>
+                <descriptor>src/assembly/dist-with-deps.xml</descriptor>
+                <descriptor>src/assembly/src.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-int</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-repository-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  
 </project>

Copied: projects/jboss-osgi/trunk/build/src/assembly (from rev 82647, projects/jboss-osgi/trunk/build/assembly)


Property changes on: projects/jboss-osgi/trunk/build/src/assembly
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: projects/jboss-osgi/trunk/build/src/assembly/dist-with-deps.xml
===================================================================
--- projects/jboss-osgi/trunk/build/src/assembly/dist-with-deps.xml	                        (rev 0)
+++ projects/jboss-osgi/trunk/build/src/assembly/dist-with-deps.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -0,0 +1,11 @@
+<assembly>
+  <id>with-deps</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+</assembly>


Property changes on: projects/jboss-osgi/trunk/build/src/assembly/dist-with-deps.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: projects/jboss-osgi/trunk/build/src/assembly/dist.xml
===================================================================
--- projects/jboss-osgi/trunk/build/assembly/dist.xml	2009-01-06 23:12:35 UTC (rev 82647)
+++ projects/jboss-osgi/trunk/build/src/assembly/dist.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -1,33 +1,11 @@
 <assembly>
   <formats>
-    <!--<format>tar.gz</format>
-    <format>tar.bz2</format>-->
     <format>zip</format>
   </formats>
-  <fileSets>
-    <fileSet>
-      <directory>kernel/docs/release</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>kernel/examples</directory>
-      <outputDirectory>examples</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>docs/gettingstarted/target/docbkx</directory>
-      <outputDirectory>docs/gettingstarted/en</outputDirectory>
-    </fileSet>
-  </fileSets>
-  <moduleSets>
-    <moduleSet>
-      <binaries>
-        <outputDirectory>lib</outputDirectory>
-        <outputFileNameMapping>${groupId}-${artifactId}-${version}.${extension}</outputFileNameMapping>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
 </assembly>

Modified: projects/jboss-osgi/trunk/build/src/assembly/src.xml
===================================================================
--- projects/jboss-osgi/trunk/build/assembly/src.xml	2009-01-06 23:12:35 UTC (rev 82647)
+++ projects/jboss-osgi/trunk/build/src/assembly/src.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -1,18 +1,15 @@
 <assembly>
   <id>src</id>
   <formats>
-    <!--<format>tar.gz</format>
-    <format>tar.bz2</format>-->
     <format>zip</format>
   </formats>
-  <moduleSets>
-    <moduleSet>
-      <sources>
-        <outputDirectory></outputDirectory>
-        <excludes>
-          <exclude>target</exclude>
-        </excludes>
-      </sources>
-    </moduleSet>
-  </moduleSets>
+  <fileSets>
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory></outputDirectory>
+      <excludes>
+        <exclude>*/target/</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
 </assembly>

Deleted: projects/jboss-osgi/trunk/osgi-int/pom-jdk14.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/pom-jdk14.xml	2009-01-06 23:31:16 UTC (rev 82648)
+++ projects/jboss-osgi/trunk/osgi-int/pom-jdk14.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  - Notes for building and running tests.
-  - Do to some limitations of the maven surefire plugin, the tests must
-  - occur in a separate lifecycle from the build.
-  -
-  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
-  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
-  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
-  -->
-<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">
-  <parent>
-    <groupId>org.jboss.microcontainer-jdk14</groupId>
-    <artifactId>jboss-microcontainer-jdk14</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../build/pom-jdk14.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jboss-osgi-int-jdk14</artifactId>
-  <packaging>jar</packaging>
-  <name>JBoss Microcontainer OSGi Int</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
-  <description>JBoss Microcontainer</description>
-  <build>
-     <resources>
-       <resource>
-         <directory>src/resources/main</directory>
-       </resource>
-     </resources>
-     <testResources>
-       <testResource>
-         <directory>src/resources/tests</directory>
-       </testResource>
-     </testResources>
-    <plugins>
-      <plugin>
-	    <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javacc-maven-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>javacc</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <sourceDirectory>${basedir}/src/main</sourceDirectory>
-			    <outputDirectory>${project.build.directory}/generated-sources/javacc/</outputDirectory>
-          <packageName>org.jboss.osgi.plugins.metadata</packageName>
-        </configuration>
-      </plugin>  
-      <plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-jboss-retro-plugin</artifactId>
-        <version>1.0-beta-1</version>
-        <executions>
-          <execution>
-            <id>weave-classes</id>
-            <goals>
-              <goal>weave</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>weave-test-classes</id>
-            <goals>
-              <goal>weave-tests</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- Skip the tests here because the jdk14 tests have
-          -  to be run in a separate profile.
-          -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>              
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
-      -  of the lifecycle.  In other words it should be called directly from the command
-      -  line like this
-      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
-      -->
-    <profile>
-      <id>run-jdk14-tests</id>
-      <properties>
-        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
-        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.0-alpha-3</version>
-            <executions>
-              <execution>
-                <id>enforce-jdk14-property</id>
-                <goals>
-                  <goal>enforce-once</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireProperty>
-                      <property>java14_home</property>
-                      <message>
-                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
-                      </message>
-                    </requireProperty>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <jvm>${java14_home}/bin/java</jvm>
-              <forkMode>always</forkMode>
-              <skip>false</skip>  
-              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
-              <testFailureIgnore>true</testFailureIgnore>  
-              <useSystemClassLoader>true</useSystemClassLoader>    
-              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
-              <includes>
-                <include>**/*TestCase.java</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  
-  <!-- Do not add version information here, use ../build/pom.xml instead -->
-  <dependencies>
-    <!-- Global dependencies -->
-    <dependency>
-      <groupId>org.jboss.microcontainer-jdk14</groupId>
-      <artifactId>jboss-kernel-jdk14</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.deployers-jdk14</groupId>
-      <artifactId>jboss-deployers-vfs-spi-jdk14</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi_R4_core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-logging-spi-jdk14</artifactId>
-    </dependency>
-    <!-- Test dependencies -->
-     <dependency>
-       <groupId>org.jboss</groupId>
-       <artifactId>jboss-test-jdk14</artifactId>
-     </dependency>
-     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-     </dependency>
-  </dependencies>
-</project>

Modified: projects/jboss-osgi/trunk/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/pom.xml	2009-01-06 23:31:16 UTC (rev 82648)
+++ projects/jboss-osgi/trunk/osgi-int/pom.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -1,14 +1,14 @@
 <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">
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
+    <artifactId>jboss-osgi-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-osgi-int</artifactId>
   <packaging>jar</packaging>
   <name>JBoss OSGi Int</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
+  <url>http://www.jboss.org/jbossmc</url>
   <description>JBoss OSGi Integration</description>
   
   <build>

Deleted: projects/jboss-osgi/trunk/osgi-repository-api/pom-jdk14.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-repository-api/pom-jdk14.xml	2009-01-06 23:31:16 UTC (rev 82648)
+++ projects/jboss-osgi/trunk/osgi-repository-api/pom-jdk14.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  - Notes for building and running tests.
-  - Do to some limitations of the maven surefire plugin, the tests must
-  - occur in a separate lifecycle from the build.
-  -
-  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
-  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
-  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
-  -->
-<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">
-  <parent>
-    <groupId>org.jboss.microcontainer-jdk14</groupId>
-    <artifactId>jboss-microcontainer-jdk14</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../build/pom-jdk14.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jboss-osgi-repository-api-jdk14</artifactId>
-  <packaging>jar</packaging>
-  <name>JBoss OSGi Repository API JDK 1.4</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
-  <description>JBoss OSGi Repository API</description>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-jboss-retro-plugin</artifactId>
-        <version>1.0-beta-1</version>
-        <executions>
-          <execution>
-            <id>weave-classes</id>
-            <goals>
-              <goal>weave</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>weave-test-classes</id>
-            <goals>
-              <goal>weave-tests</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- Skip the tests here because the jdk14 tests have
-          -  to be run in a separate profile.
-          -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>              
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
-      -  of the lifecycle.  In other words it should be called directly from the command
-      -  line like this
-      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
-      -->
-    <profile>
-      <id>run-jdk14-tests</id>
-      <properties>
-        <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
-        <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.0-alpha-3</version>
-            <executions>
-              <execution>
-                <id>enforce-jdk14-property</id>
-                <goals>
-                  <goal>enforce-once</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireProperty>
-                      <property>java14_home</property>
-                      <message>
-                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
-                      </message>
-                    </requireProperty>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <jvm>${java14_home}/bin/java</jvm>
-              <forkMode>always</forkMode>
-              <skip>false</skip>  
-              <redirectTestOutputToFile>true</redirectTestOutputToFile> 
-              <testFailureIgnore>true</testFailureIgnore>  
-              <useSystemClassLoader>true</useSystemClassLoader>    
-              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
-              <includes>
-                <include>**/*TestCase.java</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  
-  <!-- Do not add version information here, use ../build/pom.xml instead -->
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi_R4_core</artifactId>
-    </dependency>
-  </dependencies>
-</project>

Modified: projects/jboss-osgi/trunk/osgi-repository-api/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-repository-api/pom.xml	2009-01-06 23:31:16 UTC (rev 82648)
+++ projects/jboss-osgi/trunk/osgi-repository-api/pom.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -1,14 +1,14 @@
 <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">
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
+    <artifactId>jboss-osgi-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-osgi-repository-api</artifactId>
   <packaging>jar</packaging>
   <name>JBoss OSGi Repository API</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
+  <url>http://www.jboss.org/jbossmc</url>
   <description>JBoss OSGi Repository API</description>
   
   <!-- Do not add version information here, use ../pom.xml instead -->

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-01-06 23:31:16 UTC (rev 82648)
+++ projects/jboss-osgi/trunk/pom.xml	2009-01-06 23:33:12 UTC (rev 82649)
@@ -16,11 +16,11 @@
     <version>4</version>
   </parent>
   <groupId>org.jboss.osgi</groupId>
-  <artifactId>jboss-osgi</artifactId>
+  <artifactId>jboss-osgi-parent</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JBoss OSGi Parent POM</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
+  <url>http://www.jboss.org/jbossmc</url>
   <description>
      JBoss OSGi
   </description>
@@ -153,6 +153,11 @@
     <dependencies>
       <dependency>
         <groupId>org.jboss.osgi</groupId>
+        <artifactId>jboss-osgi-int</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.osgi</groupId>
         <artifactId>jboss-osgi-repository-api</artifactId>
         <version>${project.version}</version>
       </dependency>




More information about the jboss-cvs-commits mailing list