From 36862e777231ee8beecf4d5c7081fdfb8e28cfbd Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 8 Dec 2011 23:06:39 +0000 Subject: [PATCH] commons: improve maven, new RPM structure git-svn-id: https://svn.argeo.org/commons/trunk@4915 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- basic/runtime/org.argeo.basic.nodeps/pom.xml | 2 +- basic/runtime/org.argeo.support.junit/pom.xml | 2 +- basic/runtime/pom.xml | 2 +- eclipse/features/pom.xml | 2 +- .../runtime/org.argeo.eclipse.ui.jcr/pom.xml | 2 +- .../runtime/org.argeo.eclipse.ui.rap/pom.xml | 2 +- .../runtime/org.argeo.eclipse.ui.rcp/pom.xml | 2 +- eclipse/runtime/org.argeo.eclipse.ui/pom.xml | 2 +- eclipse/runtime/pom.xml | 2 +- osgi/dist/osgi-boot/pom.xml | 87 ++++++-- .../src/main/rpm/usr/sbin/osgi-service | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../org.argeo.osgi.ui.explorer/pom.xml | 6 + .../osgi/ui/explorer/views/BundlesView.java | 11 +- osgi/runtime/org.argeo.osgi.boot/pom.xml | 2 +- pom.xml | 77 +++++-- .../org.argeo.sandbox.jackrabbit/pom.xml | 2 +- .../dep/org.argeo.security.dep.node/pom.xml | 150 ++++++++++++++ .../org.argeo.security.dep.node.rap/pom.xml | 194 +++++++++++++++++- .../org.argeo.security.dep.node.rcp/pom.xml | 85 ++++++++ security/features/pom.xml | 1 - .../org.argeo.security.equinox/pom.xml | 1 - .../org.argeo.security.ui.admin/pom.xml | 1 - .../plugins/org.argeo.security.ui.rap/pom.xml | 1 - .../plugins/org.argeo.security.ui.rcp/pom.xml | 1 - .../plugins/org.argeo.security.ui/pom.xml | 1 - security/pom.xml | 3 +- .../org.argeo.security.activemq/pom.xml | 2 +- .../runtime/org.argeo.security.core/pom.xml | 2 +- .../org.argeo.security.jackrabbit/pom.xml | 2 +- .../runtime/org.argeo.security.ldap/pom.xml | 2 +- .../runtime/org.argeo.security.mvc/pom.xml | 2 +- security/runtime/pom.xml | 1 - server/runtime/org.argeo.server.ads/pom.xml | 2 +- server/runtime/org.argeo.server.core/pom.xml | 2 +- .../org.argeo.server.hibernate/pom.xml | 2 +- .../org.argeo.server.jackrabbit/pom.xml | 1 - .../runtime/org.argeo.server.jcr.mvc/pom.xml | 2 +- server/runtime/org.argeo.server.jcr/pom.xml | 2 +- server/runtime/org.argeo.server.json/pom.xml | 2 +- server/runtime/org.argeo.server.jxl/pom.xml | 2 +- .../org.argeo.server.modeshape/pom.xml | 2 +- .../org.argeo.server.webextender/pom.xml | 2 +- 43 files changed, 594 insertions(+), 85 deletions(-) diff --git a/basic/runtime/org.argeo.basic.nodeps/pom.xml b/basic/runtime/org.argeo.basic.nodeps/pom.xml index 7e32af4f4..e7ca2bdac 100644 --- a/basic/runtime/org.argeo.basic.nodeps/pom.xml +++ b/basic/runtime/org.argeo.basic.nodeps/pom.xml @@ -13,7 +13,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/basic/runtime/org.argeo.support.junit/pom.xml b/basic/runtime/org.argeo.support.junit/pom.xml index 635c2b6f3..cb3408105 100644 --- a/basic/runtime/org.argeo.support.junit/pom.xml +++ b/basic/runtime/org.argeo.support.junit/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/basic/runtime/pom.xml b/basic/runtime/pom.xml index 3ee7f177f..f4159c3fd 100644 --- a/basic/runtime/pom.xml +++ b/basic/runtime/pom.xml @@ -61,7 +61,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + true META-INF diff --git a/eclipse/features/pom.xml b/eclipse/features/pom.xml index f43d9223c..9f0046170 100644 --- a/eclipse/features/pom.xml +++ b/eclipse/features/pom.xml @@ -43,7 +43,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + META-INF diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml index e5abe2c05..7c817080c 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml @@ -26,7 +26,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + lazy diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml index 0a0c34672..8f9f0b15a 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml +++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml @@ -26,7 +26,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + lazy diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml index d3e6ff740..61cee8274 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml +++ b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml @@ -26,7 +26,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + lazy diff --git a/eclipse/runtime/org.argeo.eclipse.ui/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui/pom.xml index edcdd0ddf..88917115d 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui/pom.xml +++ b/eclipse/runtime/org.argeo.eclipse.ui/pom.xml @@ -27,7 +27,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + ${project.artifactId};singleton:=true diff --git a/eclipse/runtime/pom.xml b/eclipse/runtime/pom.xml index 04207a73b..fa9ed5293 100644 --- a/eclipse/runtime/pom.xml +++ b/eclipse/runtime/pom.xml @@ -63,7 +63,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + true META-INF diff --git a/osgi/dist/osgi-boot/pom.xml b/osgi/dist/osgi-boot/pom.xml index 952d3bb07..7847f0f8b 100644 --- a/osgi/dist/osgi-boot/pom.xml +++ b/osgi/dist/osgi-boot/pom.xml @@ -47,25 +47,16 @@ org.codehaus.mojo rpm-maven-plugin - 2.1-alpha-1 - true - - ${project.version} - r${buildNumber}.argeo - 2011 Argeo - argeo - mbaudier@argeo.org - Applications/System - /usr - - rpm-sdk + rpm-osgi-boot package - attached-rpm + rpm + osgi-boot + 2011 Argeo /etc/osgiboot @@ -106,14 +97,11 @@ src/main/rpm/usr/sbin - - * - - /usr/share/osgiboot/lib + /usr/share/osgi/boot root root 644 @@ -122,19 +110,80 @@ ${project.build.directory}/lib - *.jar + org.argeo.osgi.boot.jar - java + osgi-boot-equinox + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + + + rpmbuild-tp + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-osgi-boot-equinox + package + + rpm + + + osgi-boot-equinox + ${version.argeo-distribution} + + + /usr/share/osgi/boot + root + root + 644 + false + + + ${project.build.directory}/lib + + org.eclipse.osgi.jar + + + + + + + + + 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 27f6824b9..5c37f9c82 100644 --- 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 c37dfbcca..1f19d9fa8 100644 --- 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 9571ff057..57d908381 100644 --- a/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml +++ b/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml @@ -23,5 +23,11 @@ 0.3.4-SNAPSHOT provided + + org.argeo.commons.eclipse + org.argeo.eclipse.ui.rcp + 0.3.4-SNAPSHOT + provided + 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 291887f93..4b9339a79 100644 --- 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 59a436300..0816d9d33 100644 --- a/osgi/runtime/org.argeo.osgi.boot/pom.xml +++ b/osgi/runtime/org.argeo.osgi.boot/pom.xml @@ -22,7 +22,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + org.argeo.osgi.boot.Activator diff --git a/pom.xml b/pom.xml index eef8f5722..d0cc2be86 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ 1.1.6-SNAPSHOT 0.3.4-SNAPSHOT 3.6.2 - - - 2.2.0 + 1.0.33 1.1.1 + file:///srv/projects/www/commons/site http://projects.argeo.org/commons/site + /srv/rpmfactory/argeo-osgi-staging/6/x86_64 basic @@ -88,8 +88,8 @@ limitations under the License. + - org.apache.maven.plugins maven-compiler-plugin 2.3.2 @@ -98,7 +98,6 @@ limitations under the License. - org.apache.maven.plugins maven-source-plugin 2.1.2 @@ -112,20 +111,13 @@ limitations under the License. - org.apache.maven.plugins maven-clean-plugin 2.4.1 - org.apache.maven.plugins maven-surefire-plugin 2.7.1 - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - ${version.maven-argeo-osgi} - maven-jar-plugin 2.3.1 @@ -135,10 +127,27 @@ limitations under the License. + + maven-antrun-plugin + 1.7 + + + maven-resources-plugin + 2.4.3 + + + maven-site-plugin + 2.1.1 + + + maven-release-plugin + 2.1 + + org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + 2.2.0 true META-INF @@ -159,13 +168,49 @@ limitations under the License. + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0-beta-4 + + + org.codehaus.mojo + rpm-maven-plugin + 2.1-alpha-1 + true + + ${project.version} + r${buildNumber}.el6 + argeo6 + mbaudier@argeo.org + Applications/System + /usr + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + ${version.maven-argeo-osgi} + + + + com.mycila.maven-license-plugin + maven-license-plugin + 1.8.0 + org.codehaus.mojo buildnumber-maven-plugin - 1.0-beta-4 generate-resources @@ -190,7 +235,6 @@ limitations under the License. org.apache.maven.plugins maven-resources-plugin - 2.4.3 UTF-8 @@ -198,12 +242,10 @@ limitations under the License. org.apache.maven.plugins maven-site-plugin - 2.1.1 org.apache.maven.plugins maven-release-plugin - 2.1 true release @@ -213,7 +255,6 @@ limitations under the License. com.mycila.maven-license-plugin maven-license-plugin - 1.8.0
license-apache2-header.txt
true diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml index e7972be7d..deae4b62f 100644 --- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml +++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml @@ -46,7 +46,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + true diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml index 9a24af670..0c44338c6 100644 --- a/security/dep/org.argeo.security.dep.node/pom.xml +++ b/security/dep/org.argeo.security.dep.node/pom.xml @@ -130,6 +130,16 @@ com.springsource.javax.xml.bind + + + org.apache.commons + com.springsource.org.apache.commons.vfs + + + org.argeo.dep.osgi + org.argeo.dep.osgi.commons.exec + + org.argeo.commons.security @@ -231,4 +241,144 @@ 0.3.4-SNAPSHOT + + + rpmbuild + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-node + package + + copy-dependencies + + + jar + org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security + org.argeo.osgi.boot + ${project.build.directory}/node + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-node + package + + rpm + + + argeo-node + 2011 Argeo + + + /usr/share/osgi + root + root + 644 + false + + + ${project.build.directory}/node + + + + + + argeo-node-tp + + + + + + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + + + rpmbuild-tp + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-tp + package + + copy-dependencies + + + jar + org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security + org.eclipse.osgi + ${project.build.directory}/node-tp + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-node-tp + package + + rpm + + + argeo-node-tp + rpm-tp + ${version.argeo-distribution} + + + /usr/share/osgi + root + root + 644 + false + + + ${project.build.directory}/node-tp + + + + + + + + + + + + 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 01b1ca5d3..8e93697bf 100644 --- 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 @@ org.argeo.security.dep.node.rap Commons Node RAP Dependencies jar + + 1.3.2 + @@ -55,6 +58,195 @@ org.argeo.server.rap.webapp 0.3.4-SNAPSHOT - + + + rpmbuild + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-argeo-eclipse + package + + copy-dependencies + + + jar + org.argeo.commons.eclipse + org.argeo.eclipse.ui.rap + ${project.build.directory}/argeo-node-eclipse + + + + copy-direct + package + + copy-dependencies + + + jar + true + org.argeo.security.ui.rap,org.argeo.server.rap.webapp + ${project.build.directory}/argeo-node-eclipse + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-node-rap + package + + rpm + + + argeo-node-rap + 2011 Argeo + + + /usr/share/osgi/rap + root + root + 644 + false + + + org.argeo.commons.eclipse:org.argeo.eclipse.ui.rap + org.argeo.commons.server:org.argeo.server.rap.webapp + org.argeo.commons.security:org.argeo.security.ui.rap + + + + + + argeo-node + argeo-node-eclipse + eclipse-rap + + + + + rpm-node-eclipse + package + + rpm + + + argeo-node-eclipse + 2011 Argeo + rpm-eclipse + + + /usr/share/osgi/eclipse + root + root + 644 + false + + + org.argeo.commons.eclipse:org.argeo.eclipse.ui + org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr + org.argeo.commons.security:org.argeo.security.equinox + org.argeo.commons.security:org.argeo.security.ui + org.argeo.commons.security:org.argeo.security.ui.admin + + + + + ${project.build.directory}/argeo-node-eclipse + + + + + + + + + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + + + rpmbuild-tp + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-rap + package + + copy-dependencies + + + jar + org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu + ${project.build.directory}/eclipse-rap + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-rap + package + + rpm + + + eclipse-rap + ${version.rap} + + + /usr/share/eclipse-rap + root + root + 644 + false + + + ${project.build.directory}/eclipse-rap + + + + + + + + + + + + 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 e9e488b59..281755cb8 100644 --- 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 @@ 0.3.4-SNAPSHOT + + + rpmbuild + + + + org.codehaus.mojo + rpm-maven-plugin + + + + + rpm-node-rcp + package + + rpm + + + argeo-node-rcp + + + /usr/share/osgi/rcp + root + root + 644 + false + + + org.argeo.commons.eclipse:org.argeo.eclipse.ui.rcp + org.argeo.commons.security:org.argeo.security.ui.rcp + + + + + + argeo-node + argeo-node-eclipse + eclipse-rcp + + + + + + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/security/features/pom.xml b/security/features/pom.xml index 6c2715200..d393a6fcc 100644 --- a/security/features/pom.xml +++ b/security/features/pom.xml @@ -43,7 +43,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} META-INF diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml index a830d6485..2b43f1701 100644 --- a/security/plugins/org.argeo.security.equinox/pom.xml +++ b/security/plugins/org.argeo.security.equinox/pom.xml @@ -27,7 +27,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} *, diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml index 5e09329cc..4a4e0be59 100644 --- a/security/plugins/org.argeo.security.ui.admin/pom.xml +++ b/security/plugins/org.argeo.security.ui.admin/pom.xml @@ -26,7 +26,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} lazy diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml index 647c94a70..cfd6121cb 100644 --- a/security/plugins/org.argeo.security.ui.rap/pom.xml +++ b/security/plugins/org.argeo.security.ui.rap/pom.xml @@ -26,7 +26,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} org.argeo.security.ui.rap.SecureRapActivator diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml index c4b502c6d..968063af3 100644 --- a/security/plugins/org.argeo.security.ui.rcp/pom.xml +++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml @@ -26,7 +26,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} org.argeo.security.ui.rcp.SecureApplicationActivator diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml index 2a19bd78c..dd85204cc 100644 --- a/security/plugins/org.argeo.security.ui/pom.xml +++ b/security/plugins/org.argeo.security.ui/pom.xml @@ -26,7 +26,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} lazy diff --git a/security/pom.xml b/security/pom.xml index 293913539..9f7925a76 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo.commons diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml index 554de670f..1720c10b5 100644 --- a/security/runtime/org.argeo.security.activemq/pom.xml +++ b/security/runtime/org.argeo.security.activemq/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml index 53f58dea8..c4a2c98e0 100644 --- a/security/runtime/org.argeo.security.core/pom.xml +++ b/security/runtime/org.argeo.security.core/pom.xml @@ -26,7 +26,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/security/runtime/org.argeo.security.jackrabbit/pom.xml b/security/runtime/org.argeo.security.jackrabbit/pom.xml index 0b3b147be..ce4ab2ac2 100644 --- a/security/runtime/org.argeo.security.jackrabbit/pom.xml +++ b/security/runtime/org.argeo.security.jackrabbit/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + org.argeo.dep.osgi.jackrabbit diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/security/runtime/org.argeo.security.ldap/pom.xml index ee96e85b9..d951025a5 100644 --- a/security/runtime/org.argeo.security.ldap/pom.xml +++ b/security/runtime/org.argeo.security.ldap/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/security/runtime/org.argeo.security.mvc/pom.xml b/security/runtime/org.argeo.security.mvc/pom.xml index 5ac1ce341..552f86921 100644 --- a/security/runtime/org.argeo.security.mvc/pom.xml +++ b/security/runtime/org.argeo.security.mvc/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml index 7bc86bc7b..fbe66b119 100644 --- a/security/runtime/pom.xml +++ b/security/runtime/pom.xml @@ -59,7 +59,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} true diff --git a/server/runtime/org.argeo.server.ads/pom.xml b/server/runtime/org.argeo.server.ads/pom.xml index db69fe659..fd6b76a3e 100644 --- a/server/runtime/org.argeo.server.ads/pom.xml +++ b/server/runtime/org.argeo.server.ads/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml index 0d62e662f..b07104cf3 100644 --- a/server/runtime/org.argeo.server.core/pom.xml +++ b/server/runtime/org.argeo.server.core/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.hibernate/pom.xml b/server/runtime/org.argeo.server.hibernate/pom.xml index 32caab11e..857b773ab 100644 --- a/server/runtime/org.argeo.server.hibernate/pom.xml +++ b/server/runtime/org.argeo.server.hibernate/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml index 62056ecf7..970414312 100644 --- a/server/runtime/org.argeo.server.jackrabbit/pom.xml +++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml @@ -26,7 +26,6 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} diff --git a/server/runtime/org.argeo.server.jcr.mvc/pom.xml b/server/runtime/org.argeo.server.jcr.mvc/pom.xml index 64870ffea..d0aedc725 100644 --- a/server/runtime/org.argeo.server.jcr.mvc/pom.xml +++ b/server/runtime/org.argeo.server.jcr.mvc/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml index b394dddcc..6e4230364 100644 --- a/server/runtime/org.argeo.server.jcr/pom.xml +++ b/server/runtime/org.argeo.server.jcr/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + org.argeo.jcr.* diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml index 815eed519..db4dc81af 100644 --- a/server/runtime/org.argeo.server.json/pom.xml +++ b/server/runtime/org.argeo.server.json/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml index 3b0216ebf..9676c9744 100644 --- a/server/runtime/org.argeo.server.jxl/pom.xml +++ b/server/runtime/org.argeo.server.jxl/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml index bf76356ad..3ef9143f6 100644 --- a/server/runtime/org.argeo.server.modeshape/pom.xml +++ b/server/runtime/org.argeo.server.modeshape/pom.xml @@ -25,7 +25,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + diff --git a/server/runtime/org.argeo.server.webextender/pom.xml b/server/runtime/org.argeo.server.webextender/pom.xml index 599c7e132..5af4b1033 100644 --- a/server/runtime/org.argeo.server.webextender/pom.xml +++ b/server/runtime/org.argeo.server.webextender/pom.xml @@ -26,7 +26,7 @@ org.apache.felix maven-bundle-plugin - ${version.maven-bundle-plugin} + org.springframework.osgi.web.extender -- 2.30.2