X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=d6b784f4dbcb7664c1166607535bb8419044b78f;hb=68d99cd12b5709625db4d4955e7ad75cdcb65c5a;hp=ffaf2218ffecd83255545af28d889846d6a22bac;hpb=321877a65a79a874e3a1f59ee6b62b089749750d;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index ffaf2218f..d6b784f4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?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>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
@@ -9,7 +11,7 @@
 	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
 	<properties>
 		<version.argeo-commons>2.1.81-SNAPSHOT</version.argeo-commons>
-		<version.argeo-tp>2.1.24</version.argeo-tp>
+		<version.argeo-tp>2.1.25-SNAPSHOT</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -36,13 +38,11 @@
 		<!-- CMS E4 -->
 		<module>org.argeo.cms.e4</module>
 		<module>org.argeo.cms.e4.rap</module>
-		<!-- CMS Workbench -->
-		<module>org.argeo.cms.ui.workbench</module>
-		<module>org.argeo.cms.ui.workbench.rap</module>
 		<!-- Third Parties Extensions -->
 		<module>org.argeo.ext.jackrabbit</module>
 		<module>org.argeo.ext.equinox.jetty</module>
-		<module>org.argeo.ext.rap.ui.workbench</module>
+		<!-- Legacy -->
+		<module>legacy</module>
 		<!-- Distribution -->
 		<module>maven</module>
 		<module>dep</module>
@@ -238,7 +238,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>3.0.1</version>
+					<version>4.2.1</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
@@ -372,6 +372,10 @@ limitations under the License.
 					<groupId>org.argeo.tp.apache</groupId>
 					<artifactId>org.apache.xerces</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.sdk</groupId>
+					<artifactId>biz.aQute.bnd</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
@@ -508,8 +512,10 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -534,8 +540,10 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>