Update to latest parent pom

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1828327 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 4, 2018 · 398f864 · 398f864
1 parent cc6d160
commit 398f864
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
@@ -69,7 +69,6 @@
                         <instructions>
                             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                             <Bundle-Version>${project.version}</Bundle-Version>
-                            <Implementation-URL>https://felix.apache.org/documentation/subprojects/apache-felix-http-service.html</Implementation-URL>
                         </instructions>                        
                     </configuration>
                 </plugin>

diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
@@ -22,31 +22,27 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>9</version>
+        <version>10-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Whiteboard</name>
+    <description>This is an implementation of the proprietary Apache Felix whiteboard support</description>
     <artifactId>org.apache.felix.http.whiteboard</artifactId>
     <version>3.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/whiteboard</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http/whiteboard</developerConnection>
         <url>http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/</url>
     </scm>
 
-    <properties>
-        <felix.java.version>7</felix.java.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.3.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/osgi-r7/http/bridge/pom.xml b/osgi-r7/http/bridge/pom.xml
@@ -22,14 +22,15 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.parent</artifactId>
-        <version>9</version>
+        <version>10-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bridge</name>
+    <description>This is an implementation of the OSGi Http Service and the OSGi Http Whiteboard Specification used when run as a web application</description>
     <artifactId>org.apache.felix.http.bridge</artifactId>
     <version>3.0.19-R7-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/bridge</connection>
@@ -42,6 +43,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-Activator>
@@ -91,12 +93,12 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.3.2</version>
+            <version>1.3.3</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>

diff --git a/osgi-r7/http/jetty/pom.xml b/osgi-r7/http/jetty/pom.xml
@@ -27,9 +27,11 @@
     </parent>
 
     <name>Apache Felix Http Jetty</name>
+    <description>This is an implementation of the OSGi Http Service and the OSGi Http Whiteboard Specification</description>
+
     <artifactId>org.apache.felix.http.jetty</artifactId>
     <version>3.4.7-R7-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/jetty</connection>
@@ -49,6 +51,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                     	<X-Jetty-Version>