sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r576780 - /incubator/sling/trunk/obr/pom.xml
Date Tue, 18 Sep 2007 08:49:39 GMT
Author: fmeschbe
Date: Tue Sep 18 01:49:39 2007
New Revision: 576780

URL: http://svn.apache.org/viewvc?rev=576780&view=rev
Log:
Fix version numbers (self and parent) and make self-contained

Modified:
    incubator/sling/trunk/obr/pom.xml

Modified: incubator/sling/trunk/obr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/obr/pom.xml?rev=576780&r1=576779&r2=576780&view=diff
==============================================================================
--- incubator/sling/trunk/obr/pom.xml (original)
+++ incubator/sling/trunk/obr/pom.xml Tue Sep 18 01:49:39 2007
@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    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">
+<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.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>1-SNAPSHOT</version>
+        <version>1-incubator-SNAPSHOT</version>
     </parent>
 
     <artifactId>sling-obr</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>2.0.0-incubator-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Sling - OSGi Bundle Repository</name>
     <description>
-      This bundle provides a servlet, which implements an OSGi Bundle Repository with the
following functionality: Upload of bundles, browsing the repository, accessing the repository
using the Felix bundlerepository bundle.
+        This bundle provides a servlet, which implements an OSGi Bundle
+        Repository with the following functionality: Upload of bundles,
+        browsing the repository, accessing the repository using the
+        Felix bundlerepository bundle.
     </description>
 
     <scm>
@@ -45,13 +50,17 @@
             http://svn.apache.org/viewvc/incubator/sling/trunk/obr
         </url>
     </scm>
-     
+
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-sling-plugin</artifactId>
-	        </plugin>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -59,17 +68,28 @@
                 <configuration>
                     <instructions>
                         <Private-Package>
-                            org.apache.sling.obr.*,
-                            aQute.lib.*,
-                            
+                            org.apache.sling.obr.*, aQute.lib.*,
+
                             org.apache.felix.bundlerepository,
                             org.apache.felix.bundlerepository.metadataparser,
                             org.apache.felix.bundlerepository.metadataparser.kxmlsax,
-                            org.kxml2.io,
+                            org.kxml2.io;-split-package:=merge-first,
                             org.osgi.service.obr,
-                            org.xmlpull.v1
+                            org.xmlpull.v1;-split-package:=merge-first,
+
+                            org.apache.commons.fileupload,
+                            org.apache.commons.fileupload.disk,
+                            org.apache.commons.fileupload.servlet,
+                            org.apache.commons.io,
+                            org.apache.commons.io.filefilter,
+                            org.apache.commons.io.output
                         </Private-Package>
-                        <DynamicImport-Package>org.apache.felix.shell</DynamicImport-Package>
+                        <Import-Package>
+                            !javax.xml.*, !org.xml.sax.*, *
+                        </Import-Package>
+                        <DynamicImport-Package>
+                            org.apache.felix.shell
+                        </DynamicImport-Package>
                     </instructions>
                 </configuration>
             </plugin>
@@ -81,7 +101,7 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.1.1</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -107,7 +127,7 @@
             <artifactId>org.apache.felix.bundlerepository</artifactId>
             <version>1.0.0</version>
         </dependency>
-        
+
         <!-- OSGi Libraries -->
         <dependency>
             <groupId>org.osgi</groupId>
@@ -123,7 +143,7 @@
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
-    
+
     <repositories>
         <repository>
             <id>aQute</id>



Mime
View raw message