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 c54c9d93d521a2c291214735b14ba7b269cb423d..e842232d350aa6583a404cf707566e42b018237a 100644 (file)
--- 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 76f5720eb84cc25659454b16025f9866e7da6387..8c80ce2e473a49189cdfaae1e236d481b5934a58 100644 (file)
--- 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 -->