X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=dbd3ed3cff8ab7492887862d662e3d5ebc6d80c5;hb=075368d6da2e88d05bdd3d047cd4e17617176afa;hp=64f3d8c1a9ed1983e1f8f2086fabf189fe649067;hpb=1a852f19eb861cdb95da819dbb6b1e437532c91c;p=lgpl%2Fargeo-commons.git diff --git a/pom.xml b/pom.xml index 64f3d8c1a..dbd3ed3cf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,25 +4,68 @@ 4.0.0 org.argeo.commons argeo-commons - 1.1.9-SNAPSHOT + 2.1.12-SNAPSHOT Argeo Commons - Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring pom - 1.1 - 2012-06-19 + 2.1.12-SNAPSHOT + 2.1 + 2012-12-19 1.4.0 - 1.1.9-SNAPSHOT + 2.2.0-R-20131204-0942 + 0.5.0.argeo.20141029 6 - /srv/rpmfactory/argeo-osgi-1-staging/6/x86_64 + /srv/rpmfactory/argeo-osgi-2-staging/6/x86_64 UTF-8 - base - server - security + + org.argeo.util + org.argeo.osgi.boot + org.argeo.server.jcr + + org.argeo.eclipse.ui + org.argeo.eclipse.ui.jcr + org.argeo.eclipse.ui.rap + org.argeo.eclipse.ui.rcp + + org.argeo.security.core + org.argeo.security.jackrabbit + org.argeo.security.ldap + org.argeo.security.mvc + + org.argeo.security.auth.ldap + org.argeo.security.dao.ldap + org.argeo.security.dao.cli + org.argeo.security.dao.os + org.argeo.security.dao.jackrabbit + + org.argeo.server.jcr.mvc + org.argeo.server.jackrabbit + org.argeo.jackrabbit.webapp + org.argeo.server.ads + org.argeo.server.ads.server + org.argeo.server.rap.webapp + + org.argeo.node.repo.jackrabbit + + org.argeo.osgi.ui.explorer + org.argeo.jcr.ui.explorer + org.argeo.security.equinox + org.argeo.security.ui + org.argeo.security.ui.admin + + org.argeo.security.ui.rap + org.argeo.security.ui.rcp + + org.argeo.support.junit + org.argeo.server.core + org.argeo.ext.jdbm + + dep + dist Argeo @@ -93,7 +136,7 @@ limitations under the License. org.apache.maven.wagon wagon-webdav-jackrabbit - 2.2 + 2.8 @@ -103,17 +146,18 @@ limitations under the License. . - plugin.xml - META-INF/** - WEB-INF/** - icons/** - branding/** - *.properties - properties/*.properties - p2.inf + ** + .* + .*/** + src/** + target/** + bin/** + pom.xml build.properties + *.bnd + *.target @@ -122,7 +166,7 @@ limitations under the License. maven-compiler-plugin - 2.3.2 + 3.2 1.6 1.6 @@ -130,7 +174,7 @@ limitations under the License. maven-source-plugin - 2.1.2 + 2.4 attach-sources @@ -140,10 +184,17 @@ limitations under the License. + + + + plugin.xml + META-INF/MANIFEST.MF + + maven-clean-plugin - 2.4.1 + 2.6.1 @@ -157,11 +208,11 @@ limitations under the License. maven-surefire-plugin - 2.12 + 2.18 maven-jar-plugin - 2.4 + 2.5 META-INF/MANIFEST.MF @@ -174,22 +225,22 @@ limitations under the License. maven-resources-plugin - 2.5 + 2.7 maven-dependency-plugin - 2.4 + 2.9 maven-release-plugin - 2.2.2 + 2.5.1 true maven-javadoc-plugin - 2.8.1 + 2.10.1 @@ -205,6 +256,7 @@ limitations under the License. JavaSE-1.6 ${project.groupId} + <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By @@ -226,7 +278,7 @@ limitations under the License. org.codehaus.mojo rpm-maven-plugin - 2.1-alpha-1 + 2.1 true ${project.version} @@ -241,13 +293,13 @@ limitations under the License. org.codehaus.mojo exec-maven-plugin - 1.2.1 + 1.3.2 org.argeo.maven.plugins maven-argeo-osgi-plugin - 1.1.2 + 1.1.3-SNAPSHOT @@ -255,11 +307,11 @@ limitations under the License. maven-license-plugin 1.9.0 - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.14 - + + + + + maven-site-plugin @@ -442,34 +494,34 @@ limitations under the License. - - com.agilejava.docbkx - docbkx-maven-plugin - - doc/reference - target/site/reference - css/style.css - - - - - - - - - - - - - - - generate-html - generate-pdf - - pre-site - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -481,18 +533,52 @@ limitations under the License. pom import + + + org.argeo.tp.rap + binaries + ${version.argeo-distribution} + pom + import + + + org.argeo.tp.rap.addons + binaries + ${version.rap.addons} + pom + import + + + org.argeo.tp.rap.platform + binaries + ${version.rap} + pom + import + argeo-tp - http://repo.argeo.org/data/public/java/org.argeo.tp-1.4.x + http://repo.argeo.org/data/public/java/argeo-tp-1.4 + + true + daily + warn + + + + argeo-tp-rap + http://repo.argeo.org/data/public/java/eclipse-rap-2.2 true daily warn + @@ -506,7 +592,7 @@ limitations under the License. argeo-maven-plugins - http://repo.argeo.org/data/public/java/org.argeo.maven.plugins-1.1.x + http://repo.argeo.org/data/public/java/argeo-maven-1.1 true daily @@ -517,13 +603,12 @@ limitations under the License. staging - dav:https://repo.argeo.org/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x + dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons} false site - Argeo Commons Site - dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x + dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons} @@ -533,12 +618,12 @@ limitations under the License. localrepo Internal Release Repository - dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x + dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons} site Argeo Commons Site - dav:http://localhost:7070/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x + dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}