felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r1770790 - in /felix/trunk/httplite: complete/pom.xml core/pom.xml pom.xml
Date Tue, 22 Nov 2016 02:04:03 GMT
Author: bimargulies
Date: Tue Nov 22 02:04:03 2016
New Revision: 1770790

URL: http://svn.apache.org/viewvc?rev=1770790&view=rev
Log:
Prepare to release httplite by making it into a conventional
Maven multi-module.

Modified:
    felix/trunk/httplite/complete/pom.xml
    felix/trunk/httplite/core/pom.xml
    felix/trunk/httplite/pom.xml

Modified: felix/trunk/httplite/complete/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/complete/pom.xml?rev=1770790&r1=1770789&r2=1770790&view=diff
==============================================================================
--- felix/trunk/httplite/complete/pom.xml (original)
+++ felix/trunk/httplite/complete/pom.xml Tue Nov 22 02:04:03 2016
@@ -19,21 +19,19 @@
 <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.apache.felix</groupId>
-	    <artifactId>felix-parent</artifactId>
-	    <version>2.1</version>
-	    <relativePath>../../pom/pom.xml</relativePath>
+	    <artifactId>org.apache.felix.httplite.reactor</artifactId>
+	    <version>0.1.5-SNAPSHOT</version>
  	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>
 	<name>Apache Felix Lightweight HTTP Service Complete</name>
 	<description>A minimal HTTP Service implementation, complete bundle.</description>
-	<version>0.1.5-SNAPSHOT</version>
 	<artifactId>org.apache.felix.httplite.complete</artifactId>
 	<dependencies>		
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.httplite.core</artifactId>
-			<version>0.1.5-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
@@ -97,10 +95,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/httplite/complete</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/httplite/complete</developerConnection>
-		<url>http://svn.apache.org/repos/asf/felix/trunk/httplite/complete</url>
-	</scm>  
-	<url>http://felix.apache.org/site/apache-felix-lightweight-http-service.html</url>
+
 </project>

Modified: felix/trunk/httplite/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/core/pom.xml?rev=1770790&r1=1770789&r2=1770790&view=diff
==============================================================================
--- felix/trunk/httplite/core/pom.xml (original)
+++ felix/trunk/httplite/core/pom.xml Tue Nov 22 02:04:03 2016
@@ -19,15 +19,13 @@
 <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.apache.felix</groupId>
-		<artifactId>felix-parent</artifactId>
-		<version>2.1</version>
-		<relativePath>../../pom/pom.xml</relativePath>
+		<artifactId>org.apache.felix.httplite.reactor</artifactId>
+		<version>0.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>
 	<name>Apache Felix Lightweight HTTP Service Core</name>
 	<description>A minimal HTTP Service implementation.</description>
-	<version>0.1.5-SNAPSHOT</version>
 	<artifactId>org.apache.felix.httplite.core</artifactId>
 	<dependencies>
 		<dependency>
@@ -138,10 +136,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/httplite/core</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/httplite/core</developerConnection>
-		<url>http://svn.apache.org/repos/asf/felix/trunk/httplite/core</url>
-	</scm>
-	<url>http://felix.apache.org/site/apache-felix-lightweight-http-service.html</url>
 </project>

Modified: felix/trunk/httplite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/pom.xml?rev=1770790&r1=1770789&r2=1770790&view=diff
==============================================================================
--- felix/trunk/httplite/pom.xml (original)
+++ felix/trunk/httplite/pom.xml Tue Nov 22 02:04:03 2016
@@ -19,21 +19,26 @@
 <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.felix</groupId>
+          <artifactId>felix-parent</artifactId>
+          <version>4</version>
+          <relativePath>../pom/pom.xml</relativePath>
+       </parent>
 
-	<parent>
-		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
-		<relativePath>../pom/pom.xml</relativePath>
-	</parent>
-
-	<name>Apache Felix Lightweight HTTP Service Reactor</name>
+ 	<name>Apache Felix Lightweight HTTP Service Reactor</name>
 	<artifactId>org.apache.felix.httplite.reactor</artifactId>
-	<version>1-SNAPSHOT</version>
+	<version>0.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>	
 
 	<modules>
 		<module>core</module>
 		<module>complete</module>
 	</modules>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/httplite</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/httplite</developerConnection>
+		<url>http://svn.apache.org/repos/asf/felix/trunk/httplite</url>
+	</scm>
+	<url>http://felix.apache.org/site/apache-felix-lightweight-http-service.html</url>
 </project>



Mime
View raw message