From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 14 Sep 2009 10:37:19 +0000 (+0000)
Subject: Properly build OSGI Boot
X-Git-Tag: argeo-commons-2.1.30~1835
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=763f4942f6a9d8164d1fba6dc9880d8e377baccb;p=lgpl%2Fargeo-commons.git

Properly build OSGI Boot

git-svn-id: https://svn.argeo.org/commons/trunk@2904 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/pom.xml b/pom.xml
index c54c9d93d..e842232d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,37 @@ limitations under the License.
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
 					<version>${version.maven-argeo-osgi}</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<configuration>
+						<archive>
+							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+						</archive>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>${version.maven-bundle-plugin}</version>
+					<extensions>true</extensions>
+					<configuration>
+						<manifestLocation>target/classes/META-INF</manifestLocation>
+						<instructions>
+							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+							<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+							<_removeheaders>Bnd-LastModified</_removeheaders>
+						</instructions>
+					</configuration>
+					<executions>
+						<execution>
+							<id>bundle-manifest</id>
+							<phase>process-classes</phase>
+							<goals>
+								<goal>manifest</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
diff --git a/server/demo/pom.xml b/server/demo/pom.xml
index 76f5720eb..8c80ce2e4 100644
--- a/server/demo/pom.xml
+++ b/server/demo/pom.xml
@@ -26,6 +26,7 @@
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<configuration>
 					<execDir>target/exec/server</execDir>
+					<osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
 					<systemProperties>
 						<slc.osgi.start>
 							org.springframework.osgi.extender,
@@ -51,9 +52,9 @@
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>0.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Logging -->