[maven-release-plugin] prepare release argeo-commons-2.1.85

[lgpl/argeo-commons.git] / dist / osgi-boot / pom.xml

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 1a80e24c17be174dd386208ac0cd8dfe3f944294..880c420a100d6087d2ab55bcaa304a6d4d257a90 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.20</version>
+               <version>2.1.85</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -12,43 +12,52 @@
        <properties>
                <version.equinox>3.10.1.v20140909-1633</version.equinox>
        </properties>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-tp}</version>
+               </dependency>
+
+               <!-- OSGi Boot (and Equinox) -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>2.1.85</version>
+               </dependency>
+       </dependencies>
        <profiles>
                <profile>
-                       <id>rpmbuild</id>
+                       <id>dist</id>
                        <build>
                                <plugins>
                                        <plugin>
                                                <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <configuration>
+                                                       <finalName>osgi-boot-${project.version}</finalName>
+                                                       <appendAssemblyId>false</appendAssemblyId>
+                                                       <descriptors>
+                                                               <descriptor>assembly/osgi-boot.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
                                                <executions>
                                                        <execution>
-                                                               <id>copy-dependencies</id>
+                                                               <id>assembly-base</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy</goal>
+                                                                       <goal>single</goal>
                                                                </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <stripVersion>true</stripVersion>
-                                                                       <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                                                       <artifactItems>
-                                                                               <artifactItem>
-                                                                                       <groupId>org.argeo.commons</groupId>
-                                                                                       <artifactId>org.argeo.osgi.boot</artifactId>
-                                                                                       <version>${version.argeo-commons}</version>
-                                                                                       <type>jar</type>
-                                                                               </artifactItem>
-                                                                               <artifactItem>
-                                                                                       <groupId>org.argeo.tp.equinox</groupId>
-                                                                                       <artifactId>org.eclipse.osgi</artifactId>
-                                                                                       <version>${version.equinox}</version>
-                                                                                       <type>jar</type>
-                                                                               </artifactItem>
-                                                                       </artifactItems>
-                                                               </configuration>
                                                        </execution>
                                                </executions>
                                        </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -88,37 +97,63 @@
                                                                                                <source>
                                                                                                        <location>src/main/rpm/etc/osgiboot</location>
                                                                                                        <includes>
+                                                                                                               <include>*.policy</include>
                                                                                                                <include>*-functions.sh</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <mapping>
-                                                                                       <directory>/usr/sbin</directory>
+                                                                                       <directory>/usr/bin</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>755</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>src/main/rpm/usr/sbin</location>
+                                                                                                       <includes>
+                                                                                                               <include>*</include>
+                                                                                                       </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <mapping>
-                                                                                       <directory>/usr/share/osgi/boot</directory>
+                                                                                       <directory>/usr/sbin</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
+                                                                                       <filemode>755</filemode>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib</location>
+                                                                                                       <location>src/main/rpm/usr/sbin</location>
                                                                                                        <includes>
-                                                                                                               <include>org.argeo.osgi.boot.jar</include>
+                                                                                                               <include>osgi-service</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/boot</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <stripVersion>true</stripVersion>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.commons:org.argeo.osgi.boot</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                                       <!-- <sources> -->
+                                                                                       <!-- <source> -->
+                                                                                       <!-- <location>${project.build.directory}/lib</location> -->
+                                                                                       <!-- <includes> -->
+                                                                                       <!-- <include>org.argeo.osgi.boot.jar</include> -->
+                                                                                       <!-- </includes> -->
+                                                                                       <!-- </source> -->
+                                                                                       <!-- </sources> -->
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>osgi-boot-equinox</require>
@@ -127,25 +162,6 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
-                                       <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <phase>install</phase>
-                                                               <goals>
-                                                                       <goal>run</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
                                </plugins>
                        </build>
                </profile>
@@ -165,7 +181,7 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>osgi-boot-equinox</name>
-                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <projversion>${version.argeo-tp}</projversion>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/boot</directory>
@@ -173,14 +189,20 @@
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
                                                                                        <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/lib</location>
-                                                                                                       <includes>
-                                                                                                               <include>org.eclipse.osgi.jar</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
+                                                                                       <dependency>
+                                                                                               <stripVersion>true</stripVersion>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.tp.equinox:org.eclipse.osgi</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                                       <!-- <sources> -->
+                                                                                       <!-- <source> -->
+                                                                                       <!-- <location>${project.build.directory}/lib</location> -->
+                                                                                       <!-- <includes> -->
+                                                                                       <!-- <include>org.eclipse.osgi.jar</include> -->
+                                                                                       <!-- </includes> -->
+                                                                                       <!-- </source> -->
+                                                                                       <!-- </sources> -->
                                                                                </mapping>
                                                                        </mappings>
                                                                </configuration>