[jboss-cvs] JBossAS SVN: r95219 - in projects/jboss-osgi/trunk: reactor/blueprint/testsuite and 5 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-10-20 18:33:29 -0400 (Tue, 20 Oct 2009)
New Revision: 95219

Removed:
   projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml
   projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml
   projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml
Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/pom.xml
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Felix uses org.osgi.core-4.2.0, we do as well

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/pom.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -70,7 +70,7 @@
     <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
     <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web>
-    <version.osgi>r4v42</version.osgi>
+    <version.osgi>4.2.0</version.osgi>
   </properties>
 
   <!-- DependencyManagement -->

Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -208,7 +208,7 @@
                   <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
-                    <descriptor>scripts/assembly-compendium-felix.xml</descriptor>
+                    <descriptor>scripts/assembly-compendium.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>

Deleted: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -1,25 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
-  <formats>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <!-- Dependency Sets -->
-  <dependencySets>
-  
-    <!-- bundles -->
-    <dependencySet>
-      <outputDirectory>bundles</outputDirectory>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      <includes>
-        <include>org.apache.felix:org.osgi.compendium:jar</include>
-      </includes>
-      <useStrictFiltering>false</useStrictFiltering>
-      <scope>provided</scope>
-      <unpack>false</unpack>
-    </dependencySet>
-    
-  </dependencySets>
-</assembly>

Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -226,7 +226,7 @@
                   <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
-                    <descriptor>scripts/assembly-compendium-felix.xml</descriptor>
+                    <descriptor>scripts/assembly-compendium.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>

Deleted: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -1,26 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
-  <id>compendium</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <!-- Dependency Sets -->
-  <dependencySets>
-  
-    <!-- bundles -->
-    <dependencySet>
-      <outputDirectory>bundles</outputDirectory>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      <includes>
-        <include>org.apache.felix:org.osgi.compendium:jar</include>
-      </includes>
-      <useStrictFiltering>false</useStrictFiltering>
-      <scope>provided</scope>
-      <unpack>false</unpack>
-    </dependencySet>
-    
-  </dependencySets>
-</assembly>

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -196,7 +196,7 @@
                   <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
-                    <descriptor>scripts/assembly-compendium-felix.xml</descriptor>
+                    <descriptor>scripts/assembly-compendium.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>

Deleted: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml	2009-10-20 22:33:05 UTC (rev 95218)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml	2009-10-20 22:33:29 UTC (rev 95219)
@@ -1,26 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
-  <id>compendium</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <!-- Dependency Sets -->
-  <dependencySets>
-  
-    <!-- bundles -->
-    <dependencySet>
-      <outputDirectory>bundles</outputDirectory>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      <includes>
-        <include>org.apache.felix:org.osgi.compendium:jar</include>
-      </includes>
-      <useStrictFiltering>false</useStrictFiltering>
-      <scope>provided</scope>
-      <unpack>false</unpack>
-    </dependencySet>
-    
-  </dependencySets>
-</assembly>