incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r916927 [2/2] - in /incubator/aries/trunk: ./ application/ application/application-converters/ application/application-install/ application/application-itests/ application/application-management/ application/application-obr-resolver/ applic...
Date Sat, 27 Feb 2010 08:34:08 GMT
Modified: incubator/aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-manager/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-manager/pom.xml Sat Feb 27 08:34:07 2010
@@ -89,8 +89,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Import-Package>

Modified: incubator/aries/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/util/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/util/pom.xml (original)
+++ incubator/aries/trunk/util/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,61 +16,66 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<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>
-  <parent>
-    <groupId>org.apache.aries</groupId>
-    <artifactId>java5-parent</artifactId>
+<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>
+    <parent>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>org.apache.aries.util</artifactId>
+    <packaging>bundle</packaging>
     <version>1.0.0-incubating-SNAPSHOT</version>
-  </parent>
+    <name>Apache Aries Util</name>
+    <description>
+        This bundle contains the OSGi common util for Apache Aries
+    </description>
 
-  <artifactId>org.apache.aries.util</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache Aries Util</name>
-  <description>
-      This bundle contains the OSGi common util for Apache Aries
-  </description>
-  
-  <dependencies>
-      <dependency>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-          <version>4.2.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.compendium</artifactId>
-          <version>4.2.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.eclipse</groupId>
-          <artifactId>osgi</artifactId>
-          <version>3.5.0.v20090520</version>
-          <scope>provided</scope>
-      </dependency>      
-      <dependency>
-          <groupId>org.apache.aries.testsupport</groupId>
-          <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>${version}</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.5</version>
-          <scope>test</scope>
-      </dependency>
-  </dependencies>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/util</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/util</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/util</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>4.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>4.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.testsupport</groupId>
+            <artifactId>org.apache.aries.testsupport.unit</artifactId>
+            <version>1.0.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
@@ -79,7 +84,8 @@
                         </Export-Package>
                         <!--  let's make org.osgi.service.framework optional as this is
proposed API 
                         may not be avail depends on the OSGi framework -->
-                        <Import-Package>!org.apache.aries.util*,org.osgi.service.framework;resolution:=optional,*</Import-Package>
+                        <Import-Package>!org.apache.aries.util*,org.osgi.service.framework;resolution:=optional,*
+                        </Import-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                         <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
                     </instructions>
@@ -87,5 +93,5 @@
             </plugin>
         </plugins>
     </build>
-  
+
 </project>

Modified: incubator/aries/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/web/pom.xml (original)
+++ incubator/aries/trunk/web/pom.xml Sat Feb 27 08:34:07 2010
@@ -31,6 +31,12 @@
     <name>Apache Aries Web Component</name>
     <version>1.0.0-incubating-SNAPSHOT</version>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/web</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/web</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/web</url>
+    </scm>
+    
     <modules>
         <module>web-urlhandler</module>
         <module>web-itests</module>

Modified: incubator/aries/trunk/web/web-urlhandler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/pom.xml (original)
+++ incubator/aries/trunk/web/web-urlhandler/pom.xml Sat Feb 27 08:34:07 2010
@@ -55,7 +55,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>



Mime
View raw message