Add text() utility to CMS utils.

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index fc39fa841ed1ca073c9c5b39c30c13c19f29a348..87d40790a601d47ab336911975dddba4b975cd7a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.78-SNAPSHOT</version>
+       <version>2.1.81-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
        <properties>
-               <version.argeo-commons>2.1.78-SNAPSHOT</version.argeo-commons>
-               <version.argeo-tp>2.1.24</version.argeo-tp>
+               <version.argeo-commons>2.1.81-SNAPSHOT</version.argeo-commons>
+               <version.argeo-tp>2.1.25</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -38,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>
@@ -160,26 +158,6 @@ limitations under the License.
                                                </dependency>
                                        </dependencies>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.4</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>attach-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>jar</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                                       <configuration>
-                                               <excludes>
-                                                       <!-- Prevents source jars to contain misleading data -->
-                                                       <exclude>plugin.xml</exclude>
-                                                       <exclude>META-INF/MANIFEST.MF</exclude>
-                                               </excludes>
-                                       </configuration>
-                               </plugin>
                                <plugin>
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>2.6.1</version>
@@ -207,6 +185,18 @@ limitations under the License.
                                                </archive>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-source-plugin</artifactId>
+                                       <version>3.1.0</version>
+                                       <configuration>
+                                               <excludes>
+                                                       <exclude>**/*.class</exclude>
+                                                       <!-- Prevents source jars to contain misleading data -->
+                                                       <exclude>plugin.xml</exclude>
+                                                       <exclude>META-INF/MANIFEST.MF</exclude>
+                                               </excludes>
+                                       </configuration>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-antrun-plugin</artifactId>
                                        <version>1.8</version>
@@ -248,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>
@@ -300,8 +290,8 @@ limitations under the License.
                                <!-- Argeo -->
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.2.0</version>
+                                       <artifactId>argeo-osgi-plugin</artifactId>
+                                       <version>2.1.1</version>
                                </plugin>
                        </plugins>
                </pluginManagement>
@@ -345,6 +335,19 @@ limitations under the License.
                                        <skip>false</skip>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>attach-sources</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>jar</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-release-plugin</artifactId>
                                <configuration>
@@ -369,6 +372,15 @@ limitations under the License.
                                        <groupId>org.argeo.tp.apache</groupId>
                                        <artifactId>org.apache.xerces</artifactId>
                                </exclusion>
+                               <!-- Avoid slf4j implementations lurking in the classpath. -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.sdk</groupId>
+                                       <artifactId>biz.aQute.bndlib</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.misc</groupId>
+                                       <artifactId>slf4j.osgi</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
        </dependencies>