commons: improve maven, new RPM structure

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

diff --git a/basic/runtime/org.argeo.basic.nodeps/pom.xml b/basic/runtime/org.argeo.basic.nodeps/pom.xml
index 7e32af4f4906fcb2c456e3d525fa791f89c575fe..e7ca2bdacd2ac8f7a91a60cdb832e666957b736a 100644 (file)
--- a/basic/runtime/org.argeo.basic.nodeps/pom.xml
+++ b/basic/runtime/org.argeo.basic.nodeps/pom.xml
@@ -13,7 +13,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/basic/runtime/org.argeo.support.junit/pom.xml b/basic/runtime/org.argeo.support.junit/pom.xml
index 635c2b6f3a35f18ccb6d735f69dd67ec06fc5f8a..cb34081053ed0b17efce7003c06bd74490a6f955 100644 (file)
--- a/basic/runtime/org.argeo.support.junit/pom.xml
+++ b/basic/runtime/org.argeo.support.junit/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/basic/runtime/pom.xml b/basic/runtime/pom.xml
index 3ee7f177f9b366f6ca780f659038388d7778ff88..f4159c3fd632ca9da0008eafcbfdc08808d2642e 100644 (file)
--- a/basic/runtime/pom.xml
+++ b/basic/runtime/pom.xml
@@ -61,7 +61,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <extensions>true</extensions>
                                <configuration>
                                        <manifestLocation>META-INF</manifestLocation>

diff --git a/eclipse/features/pom.xml b/eclipse/features/pom.xml
index f43d9223c44a1386fb5806272c961988d2cf4877..9f00461708675ea1c0f46e2a1926fc36eba2f455 100644 (file)
--- a/eclipse/features/pom.xml
+++ b/eclipse/features/pom.xml
@@ -43,7 +43,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <manifestLocation>META-INF</manifestLocation>
                                </configuration>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml
index e5abe2c05d29e6190645ee6798bb09d627715cae..7c817080c2c2ac9405a77234c5f01be185d7f6dd 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml
@@ -26,7 +26,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
index 0a0c346728b95d4674b526783c65009e6ce98ff5..8f9f0b15a1c998b8103b651151d50bfff89d0d0e 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
@@ -26,7 +26,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml
index d3e6ff7404d8c720d60c3419eb05a66b33977d1b..61cee827420d275a7c8ab84ab041fb3d603ae868 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml
@@ -26,7 +26,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui/pom.xml
index edcdd0ddf7530547ea3b80d429e2b6fb65a743d0..88917115d01ec9126a402fc8f2785f7f21ade8bb 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui/pom.xml
@@ -27,7 +27,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>

diff --git a/eclipse/runtime/pom.xml b/eclipse/runtime/pom.xml
index 04207a73b0b0fc9ec9bf278c0c2b7bbd64fee9d6..fa9ed529387e67f231eebc7b078829422743f517 100644 (file)
--- a/eclipse/runtime/pom.xml
+++ b/eclipse/runtime/pom.xml
@@ -63,7 +63,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <extensions>true</extensions>
                                <configuration>
                                        <manifestLocation>META-INF</manifestLocation>

diff --git a/osgi/dist/osgi-boot/pom.xml b/osgi/dist/osgi-boot/pom.xml
index 952d3bb07adc8a8d74056de11f3e40207933372c..7847f0f8bed1a607269d49b2a606118507b8f2bc 100644 (file)
--- a/osgi/dist/osgi-boot/pom.xml
+++ b/osgi/dist/osgi-boot/pom.xml
@@ -47,25 +47,16 @@
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
-                                               <version>2.1-alpha-1</version>
-                                               <extensions>true</extensions>
-                                               <configuration>
-                                                       <version>${project.version}</version>
-                                                       <release>r${buildNumber}.argeo</release>
-                                                       <copyright>2011 Argeo</copyright>
-                                                       <distribution>argeo</distribution>
-                                                       <packager>mbaudier@argeo.org</packager>
-                                                       <group>Applications/System</group>
-                                                       <prefix>/usr</prefix>
-                                               </configuration>
                                                <executions>
                                                        <execution>
-                                                               <id>rpm-sdk</id>
+                                                               <id>rpm-osgi-boot</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>attached-rpm</goal>
+                                                                       <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
+                                                                       <name>osgi-boot</name>
+                                                                       <copyright>2011 Argeo</copyright>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/etc/osgiboot</directory>
@@ -106,14 +97,11 @@
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>src/main/rpm/usr/sbin</location>
-                                                                                                       <includes>
-                                                                                                               <include>*</include>
-                                                                                                       </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <mapping>
-                                                                                       <directory>/usr/share/osgiboot/lib</directory>
+                                                                                       <directory>/usr/share/osgi/boot</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
@@ -122,19 +110,80 @@
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib</location>
                                                                                                        <includes>
-                                                                                                               <include>*.jar</include>
+                                                                                                               <include>org.argeo.osgi.boot.jar</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>java</require>
+                                                                               <require>osgi-boot-equinox</require>
                                                                        </requires>
                                                                </configuration>
                                                        </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>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-osgi-boot-equinox</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>osgi-boot-equinox</name>
+                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/boot</directory>
+                                                                                       <username>root</username>
+                                                                                       <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>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
                                </plugins>
                        </build>
                </profile>

diff --git a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
index 27f6824b92a16ba959577eb96b9d0c2fc6b93348..5c37f9c82f028dd9137559fc03a7fa6b111559ec 100644 (file)
--- a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -24,7 +24,7 @@ RUN_DIR=/var/run/$APP
 PID_FILE=$RUN_DIR/$APP.pid
 SHUTDOWN_FILE=$RUN_DIR/$APP.shutdown
 
-OSGI_INSTALL_AREA=/usr/share/osgiboot/lib
+OSGI_INSTALL_AREA=/usr/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 
 RETVAL=0
@@ -48,8 +48,6 @@ start() {
        touch $SHUTDOWN_FILE
        cd $EXEC_DIR
        $JVM \
-               -Dosgi.bundles="org.argeo.osgi.boot.jar@start" \
-               -Dargeo.osgi.bundles="$CONF_DIR/modules;in=*,$LIB_DIR;in=*" \
                -Dargeo.osgi.shutdownFile="$SHUTDOWN_FILE" \
                -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
                $JAVA_OPTS -jar $OSGI_FRAMEWORK \

diff --git a/osgi/plugins/org.argeo.osgi.ui.explorer/META-INF/MANIFEST.MF b/osgi/plugins/org.argeo.osgi.ui.explorer/META-INF/MANIFEST.MF
index c37dfbccab4c0ea68c88ad34138530f71c3a9092..1f19d9fa84ecb9b4e30cf992a98cca28716eab5b 100644 (file)
--- a/osgi/plugins/org.argeo.osgi.ui.explorer/META-INF/MANIFEST.MF
+++ b/osgi/plugins/org.argeo.osgi.ui.explorer/META-INF/MANIFEST.MF
@@ -10,4 +10,6 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.logging;version="1.1.1",
- org.argeo.eclipse.ui
+ org.argeo,
+ org.argeo.eclipse.ui,
+ org.argeo.eclipse.ui.specific

diff --git a/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml b/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml
index 9571ff057be7a3095c095191d95abf3d990ff2a4..57d9083813d45f3871001d023dc36014a81b5fb0 100644 (file)
--- a/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml
+++ b/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml
@@ -23,5 +23,11 @@
                        <version>0.3.4-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <scope>provided</scope>
+               </dependency>
        </dependencies>
 </project>

diff --git a/osgi/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java b/osgi/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java
index 291887f93d87f51c207529d3921983f24101c4ce..4b9339a79be0f1c39287cf13e40da15e3832e912 100644 (file)
--- a/osgi/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java
+++ b/osgi/plugins/org.argeo.osgi.ui.explorer/src/main/java/org/argeo/osgi/ui/explorer/views/BundlesView.java
@@ -3,10 +3,10 @@ package org.argeo.osgi.ui.explorer.views;
 import java.util.Comparator;
 
 import org.argeo.eclipse.ui.ColumnViewerComparator;
+import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.argeo.osgi.ui.explorer.OsgiExplorerImages;
 import org.argeo.osgi.ui.explorer.OsgiExplorerPlugin;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -32,14 +32,7 @@ public class BundlesView extends ViewPart {
                viewer.setContentProvider(new BundleContentProvider());
                viewer.getTable().setHeaderVisible(true);
 
-               // FIXME methodNotFound issue in RAP when built in Maven against RCP
-               try {
-                       ColumnViewerToolTipSupport.enableFor(viewer);
-               } catch (Error e) {
-                       //String prop = Table.ENABLE_CELL_TOOLTIP;
-                       String prop = "org.eclipse.swt.widgets.Table#enableCellToolTip";
-                       viewer.getControl().setData(prop, Boolean.TRUE);
-               }
+               EclipseUiSpecificUtils.enableToolTipSupport(viewer);
 
                // ID
                TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);

diff --git a/osgi/runtime/org.argeo.osgi.boot/pom.xml b/osgi/runtime/org.argeo.osgi.boot/pom.xml
index 59a436300fcfe612eef0961e04be0919fc09baba..0816d9d337df7016e5025d3724f4f2a45b2a62ab 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/pom.xml
+++ b/osgi/runtime/org.argeo.osgi.boot/pom.xml
@@ -22,7 +22,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-Activator>org.argeo.osgi.boot.Activator</Bundle-Activator>

diff --git a/pom.xml b/pom.xml
index eef8f572226ba9a195fc43429dcc31b400ee6f02..d0cc2be8637624e7ee35fab1f9e2a34c5b3a0882 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,13 @@
                <version.argeo-distribution>1.1.6-SNAPSHOT</version.argeo-distribution>
                <version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
                <version.equinox>3.6.2</version.equinox>
-               <!-- Maven -->
-               <!-- Using version 2.3.4 causes package use conflict. To be investigated. -->
-               <version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
+               <!-- maven -->
                <version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
+               <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
        </properties>
        <modules>
                <module>basic</module>
@@ -88,8 +88,8 @@ limitations under the License.
                </extensions>
                <pluginManagement>
                        <plugins>
+                               <!-- Maven -->
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>2.3.2</version>
                                        <configuration>
@@ -98,7 +98,6 @@ limitations under the License.
                                        </configuration>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-source-plugin</artifactId>
                                        <version>2.1.2</version>
                                        <executions>
@@ -112,20 +111,13 @@ limitations under the License.
                                        </executions>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>2.4.1</version>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.7.1</version>
                                </plugin>
-                               <plugin>
-                                       <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>${version.maven-argeo-osgi}</version>
-                               </plugin>
                                <plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <version>2.3.1</version>
@@ -135,10 +127,27 @@ limitations under the License.
                                                </archive>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-antrun-plugin</artifactId>
+                                       <version>1.7</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-resources-plugin</artifactId>
+                                       <version>2.4.3</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-site-plugin</artifactId>
+                                       <version>2.1.1</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-release-plugin</artifactId>
+                                       <version>2.1</version>
+                               </plugin>
+                               <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>${version.maven-bundle-plugin}</version>
+                                       <version>2.2.0</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
@@ -159,13 +168,49 @@ limitations under the License.
                                                </execution>
                                        </executions>
                                </plugin>
+                               <!-- Codehaus -->
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>buildnumber-maven-plugin</artifactId>
+                                       <version>1.0-beta-4</version>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>rpm-maven-plugin</artifactId>
+                                       <version>2.1-alpha-1</version>
+                                       <extensions>true</extensions>
+                                       <configuration>
+                                               <version>${project.version}</version>
+                                               <release>r${buildNumber}.el6</release>
+                                               <distribution>argeo6</distribution>
+                                               <packager>mbaudier@argeo.org</packager>
+                                               <group>Applications/System</group>
+                                               <prefix>/usr</prefix>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>exec-maven-plugin</artifactId>
+                                       <version>1.2.1</version>
+                               </plugin>
+                               <!-- Argeo -->
+                               <plugin>
+                                       <groupId>org.argeo.maven.plugins</groupId>
+                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <version>${version.maven-argeo-osgi}</version>
+                               </plugin>
+                               <!-- Others -->
+                               <plugin>
+                                       <groupId>com.mycila.maven-license-plugin</groupId>
+                                       <artifactId>maven-license-plugin</artifactId>
+                                       <version>1.8.0</version>
+                               </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>buildnumber-maven-plugin</artifactId>
-                               <version>1.0-beta-4</version>
                                <executions>
                                        <execution>
                                                <phase>generate-resources</phase>
@@ -190,7 +235,6 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.4.3</version>
                                <configuration>
                                        <encoding>UTF-8</encoding>
                                </configuration>
@@ -198,12 +242,10 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
-                               <version>2.1.1</version>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-release-plugin</artifactId>
-                               <version>2.1</version>
                                <configuration>
                                        <autoVersionSubmodules>true</autoVersionSubmodules>
                                        <releaseProfiles>release</releaseProfiles>
@@ -213,7 +255,6 @@ limitations under the License.
                        <plugin>
                                <groupId>com.mycila.maven-license-plugin</groupId>
                                <artifactId>maven-license-plugin</artifactId>
-                               <version>1.8.0</version>
                                <configuration>
                                        <header>license-apache2-header.txt</header>
                                        <failIfMissing>true</failIfMissing>

diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
index e7972be7dedfe406fc17856dcec16fab3f8f7f4c..deae4b62fdfa130035ccaec0ef013140d2415e22 100644 (file)
--- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
+++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
@@ -46,7 +46,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <extensions>true</extensions>
                        </plugin>
                </plugins>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 9a24af670644f2693eb4e74d66e9702ab722d7c8..0c44338c6c5cf544369eef915d49cf1078e9d579 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -130,6 +130,16 @@
                        <artifactId>com.springsource.javax.xml.bind</artifactId>
                </dependency>
 
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.vfs</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
+               </dependency>
+
                <!-- Security (LDAP) -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
@@ -231,4 +241,144 @@
                        <version>0.3.4-SNAPSHOT</version>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-node</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</includeGroupIds>
+                                                                       <excludeArtifactIds>org.argeo.osgi.boot</excludeArtifactIds>
+                                                                       <outputDirectory>${project.build.directory}/node</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/node</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-node-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </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>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <excludeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</excludeGroupIds>
+                                                                       <excludeArtifactIds>org.eclipse.osgi</excludeArtifactIds>
+                                                                       <outputDirectory>${project.build.directory}/node-tp</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node-tp</name>
+                                                                       <classifier>rpm-tp</classifier>
+                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/node-tp</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>

diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 01b1ca5d3cc76197577dd7faf1af691147865888..8e93697bff7102f8218b49159ba4a605cb45b8ac 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -10,6 +10,9 @@
        <artifactId>org.argeo.security.dep.node.rap</artifactId>
        <name>Commons Node RAP Dependencies</name>
        <packaging>jar</packaging>
+       <properties>
+               <version.rap>1.3.2</version.rap>
+       </properties>
        <build>
                <plugins>
                        <plugin>
@@ -55,6 +58,195 @@
                        <artifactId>org.argeo.server.rap.webapp</artifactId>
                        <version>0.3.4-SNAPSHOT</version>
                </dependency>
-
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-argeo-eclipse</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeGroupIds>org.argeo.commons.eclipse</includeGroupIds>
+                                                                       <excludeArtifactIds>org.argeo.eclipse.ui.rap</excludeArtifactIds>
+                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>copy-direct</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <excludeArtifactIds>org.argeo.security.ui.rap,org.argeo.server.rap.webapp</excludeArtifactIds>
+                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node-rap</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/rap</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.rap</include>
+                                                                                                       <include>org.argeo.commons.server:org.argeo.server.rap.webapp</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.rap</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-node</require>
+                                                                               <require>argeo-node-eclipse</require>
+                                                                               <require>eclipse-rap</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>rpm-node-eclipse</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node-eclipse</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <classifier>rpm-eclipse</classifier>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/eclipse</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui</include>
+                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.equinox</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.admin</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/argeo-node-eclipse</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </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>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds>
+                                                                       <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>eclipse-rap</name>
+                                                                       <projversion>${version.rap}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/eclipse-rap</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/eclipse-rap</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>

diff --git a/security/features/org.argeo.security.dep.node.rcp/pom.xml b/security/features/org.argeo.security.dep.node.rcp/pom.xml
index e9e488b596fd8f0c9e138958c874e158be469ea7..281755cb820debeda5703964ff3b29faf2c84528 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rcp/pom.xml
@@ -49,4 +49,89 @@
                        <version>0.3.4-SNAPSHOT</version>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <configuration>
+                                               </configuration>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node-rcp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node-rcp</name>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/rcp</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.rcp</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.rcp</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-node</require>
+                                                                               <require>argeo-node-eclipse</require>
+                                                                               <require>eclipse-rcp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </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>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.codehaus.mojo</groupId> -->
+<!--                                           <artifactId>exec-maven-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <phase>install</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>exec</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <executable>createrepo</executable> -->
+<!--                                                                   <arguments> -->
+<!--                                                                           <argument>${rpm.stagingRepository}</argument> -->
+<!--                                                                   </arguments> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>

diff --git a/security/features/pom.xml b/security/features/pom.xml
index 6c27152000683f0ca04760752a4172c405cc2710..d393a6fcc7b165f5f7940b5802a5a368554b2507 100644 (file)
--- a/security/features/pom.xml
+++ b/security/features/pom.xml
@@ -43,7 +43,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <manifestLocation>META-INF</manifestLocation>
                                </configuration>

diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml
index a830d6485ae741ba4fabd21a8fb99af6c4ae226b..2b43f1701276c8d87e1f836d0c935e6dddb7a249 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/pom.xml
+++ b/security/plugins/org.argeo.security.equinox/pom.xml
@@ -27,7 +27,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Import-Package>*,

diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml
index 5e09329cc5fed015d1065e792a233d00774d5547..4a4e0be59bd1985b12b3cada31abae186aa4e7c5 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/pom.xml
+++ b/security/plugins/org.argeo.security.ui.admin/pom.xml
@@ -26,7 +26,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>

diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index 647c94a70382b92d4dd62f0b90528154e395f621..cfd6121cbec001a41294db04bb3d574f70d18016 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -26,7 +26,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Bundle-Activator>org.argeo.security.ui.rap.SecureRapActivator</Bundle-Activator>

diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml
index c4b502c6db9be10d71ad58d710a1d7223582783a..968063af31bf38a01a70ccb49f24490b305e1bb9 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rcp/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml
@@ -26,7 +26,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Bundle-Activator>org.argeo.security.ui.rcp.SecureApplicationActivator</Bundle-Activator>

diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml
index 2a19bd78cdbbed8ccb033d8016cc9363827d2b74..dd85204cc7febffde356d234102996bdb1bfb69c 100644 (file)
--- a/security/plugins/org.argeo.security.ui/pom.xml
+++ b/security/plugins/org.argeo.security.ui/pom.xml
@@ -26,7 +26,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>

diff --git a/security/pom.xml b/security/pom.xml
index 293913539722fdeae15f292b7d0d33a9c7518942..9f7925a7652981398c431d3108a57a614f3274ce 100644 (file)
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.argeo.commons</groupId>

diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml
index 554de670f3bc2516d6ad106bbb0a1b3f8f70b349..1720c10b589976d622b920cc58af8506ddb13ca6 100644 (file)
--- a/security/runtime/org.argeo.security.activemq/pom.xml
+++ b/security/runtime/org.argeo.security.activemq/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 53f58dea8756fcfb58506bca5af2b33803f69fc2..c4a2c98e06e3ae3f84e3a40d95a162e1e06309ac 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -26,7 +26,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/security/runtime/org.argeo.security.jackrabbit/pom.xml b/security/runtime/org.argeo.security.jackrabbit/pom.xml
index 0b3b147be815a4a148bfd023b5a690e6fc756498..ce4ab2ac24a11014ea67ecb0dd4e0a990ca6e0c3 100644 (file)
--- a/security/runtime/org.argeo.security.jackrabbit/pom.xml
+++ b/security/runtime/org.argeo.security.jackrabbit/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Fragment-Host>org.argeo.dep.osgi.jackrabbit</Fragment-Host>

diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/security/runtime/org.argeo.security.ldap/pom.xml
index ee96e85b90d094bdb5c5ac1fdc33ad24d0060f2d..d951025a5ab721c86f6a2c189d2c05979496c4c5 100644 (file)
--- a/security/runtime/org.argeo.security.ldap/pom.xml
+++ b/security/runtime/org.argeo.security.ldap/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/security/runtime/org.argeo.security.mvc/pom.xml b/security/runtime/org.argeo.security.mvc/pom.xml
index 5ac1ce3416f4c311851da073449af05863fd13f2..552f8692181952ed3cfa371f1ab8074ae50c53f0 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/pom.xml
+++ b/security/runtime/org.argeo.security.mvc/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 7bc86bc7b1b233d9abb41be42e5f4dfbac6b83b1..fbe66b11942a5346f82d7bcdf40c5a8a2092eaeb 100644 (file)
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -59,7 +59,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <extensions>true</extensions>
                        </plugin>
                </plugins>

diff --git a/server/runtime/org.argeo.server.ads/pom.xml b/server/runtime/org.argeo.server.ads/pom.xml
index db69fe65922738a7b47d5e5994d2646cb533e937..fd6b76a3efe768bdd1b9f4bce29eb47b58cea8b5 100644 (file)
--- a/server/runtime/org.argeo.server.ads/pom.xml
+++ b/server/runtime/org.argeo.server.ads/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml
index 0d62e662f44c177cf46587b600acaa90f03ebef8..b07104cf31c48661f75631f46c55e40454c14be6 100644 (file)
--- a/server/runtime/org.argeo.server.core/pom.xml
+++ b/server/runtime/org.argeo.server.core/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.hibernate/pom.xml b/server/runtime/org.argeo.server.hibernate/pom.xml
index 32caab11e0bc2f432b59fa36ead9e19013a36a95..857b773aba99bc95dfd42803be249705ad156eb4 100644 (file)
--- a/server/runtime/org.argeo.server.hibernate/pom.xml
+++ b/server/runtime/org.argeo.server.hibernate/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml
index 62056ecf7b71e072b6b5dc6d671f6739bae4d4ef..970414312d1d7eccd689ffbeac4026a301f3c076 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -26,7 +26,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.jcr.mvc/pom.xml b/server/runtime/org.argeo.server.jcr.mvc/pom.xml
index 64870ffeae78156860c9a0c10f42c87041725c39..d0aedc72523bad2cbaa00a23e951106495d67673 100644 (file)
--- a/server/runtime/org.argeo.server.jcr.mvc/pom.xml
+++ b/server/runtime/org.argeo.server.jcr.mvc/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index b394dddcc8880e744efbc28abe63edf664c6cd65..6e42303644e2822ac8f9764dd474792cd1643061 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>org.argeo.jcr.*</Export-Package>

diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml
index 815eed51920da3e2faabf596a4b974b90ba6753c..db4dc81afb7c2dcc468e332b96e3bd302f3fdf6c 100644 (file)
--- a/server/runtime/org.argeo.server.json/pom.xml
+++ b/server/runtime/org.argeo.server.json/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml
index 3b0216ebff65ab5261fa6f45290811f28ebfbbdc..9676c9744d126b81aa69560b76ea5667fa5a8e55 100644 (file)
--- a/server/runtime/org.argeo.server.jxl/pom.xml
+++ b/server/runtime/org.argeo.server.jxl/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml
index bf76356ad6edfabacfdcb7a6c00ac1dd3ea41d2a..3ef9143f6db76fca4fe97e7ef78da372173e10d8 100644 (file)
--- a/server/runtime/org.argeo.server.modeshape/pom.xml
+++ b/server/runtime/org.argeo.server.modeshape/pom.xml
@@ -25,7 +25,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>

diff --git a/server/runtime/org.argeo.server.webextender/pom.xml b/server/runtime/org.argeo.server.webextender/pom.xml
index 599c7e132686dfd27c5c3bf91f9abee6b345ad61..5af4b1033dec1b85a58435023859114b9f000d10 100644 (file)
--- a/server/runtime/org.argeo.server.webextender/pom.xml
+++ b/server/runtime/org.argeo.server.webextender/pom.xml
@@ -26,7 +26,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Fragment-Host>org.springframework.osgi.web.extender</Fragment-Host>