X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=852f310a8b13174269d7f46578077f4d4c556d05;hb=e26fbc0cfc928848ba85ffbb02e5e655cdab48b4;hp=6f17d12de125fc5069e03ec174c4f1d900598e15;hpb=4b56d461613392a3808d886d5373cf46b65a040e;p=lgpl%2Fargeo-commons.git diff --git a/pom.xml b/pom.xml index 6f17d12de..f782eac7e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,75 +1,61 @@ - 4.0.0 org.argeo.commons argeo-commons - 2.1.12-SNAPSHOT + 2.1.82-SNAPSHOT Argeo Commons pom + - 2.1.12-SNAPSHOT - 2.1 - 2012-12-19 - 2.1.2 - 3.8.2 - 2.2.0-R-20131204-0942 - 0.5.0.argeo.20141029 + 2.1.82-SNAPSHOT + 2.1.25 - 6 - /srv/rpmfactory/argeo-osgi-2-staging/6/x86_64 - + 7 + /srv/rpmfactory/argeo-osgi-2/el7 + UTF-8 + code.argeo.org org.argeo.util + org.argeo.enterprise + org.argeo.jcr org.argeo.osgi.boot - org.argeo.server.jcr - - org.argeo.security.core - org.argeo.security.jackrabbit - org.argeo.security.ldap - - - 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.core org.argeo.eclipse.ui org.argeo.eclipse.ui.rap - org.argeo.eclipse.ui.rcp - - org.argeo.node.repo.jackrabbit + + org.argeo.node.api + org.argeo.maintenance org.argeo.cms - - org.argeo.eclipse.ui.workbench - 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.cms.ui.theme + org.argeo.cms.ui + + org.argeo.cms.e4 + org.argeo.cms.e4.rap + + org.argeo.ext.jackrabbit + org.argeo.ext.equinox.jetty - - - + legacy + + maven dep - + demo + doc + dist + rcp - scm:svn:https://svn.argeo.org/commons/trunk - scm:svn:https://svn.argeo.org/commons/trunk - https://svn.argeo.org/commons/trunk + scm:git:http://git.argeo.org/apache2/argeo-commons.git + http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary + scm:git:https://code.argeo.org/git/apache2/argeo-commons.git + HEAD 2007 @@ -80,7 +66,7 @@ org.apache.maven.wagon wagon-webdav-jackrabbit - 2.8 + 2.10 src @@ -133,6 +119,7 @@ limitations under the License. build.properties *.bnd *.target + **/*.xcf @@ -152,11 +139,13 @@ limitations under the License. maven-compiler-plugin - 3.2 + 3.3 - 1.7 - 1.7 + 1.8 + 1.8 eclipse + + true target/classes target/test-classes @@ -165,30 +154,10 @@ limitations under the License. org.codehaus.plexus plexus-compiler-eclipse - 2.3 + 2.6 - - maven-source-plugin - 2.4 - - - attach-sources - package - - jar - - - - - - - plugin.xml - META-INF/MANIFEST.MF - - - maven-clean-plugin 2.6.1 @@ -216,9 +185,21 @@ limitations under the License. + + maven-source-plugin + 3.1.0 + + + **/*.class + + plugin.xml + META-INF/MANIFEST.MF + + + maven-antrun-plugin - 1.7 + 1.8 maven-resources-plugin @@ -228,6 +209,25 @@ limitations under the License. maven-dependency-plugin 2.9 + + maven-site-plugin + 3.7 + + + maven-javadoc-plugin + 3.0.0 + + false + -Xdoclint:none + *.internal.*,org.eclipse.* + UTF-8 + + + + pl.project13.maven + git-commit-id-plugin + 3.0.0 + maven-release-plugin 2.5.1 @@ -235,15 +235,10 @@ limitations under the License. true - - maven-javadoc-plugin - 2.10.1 - - org.apache.felix maven-bundle-plugin - 2.3.7 + 4.2.1 true META-INF @@ -251,10 +246,14 @@ limitations under the License. <_include>bnd.bnd ${project.version}-r${tstamp} ${project.artifactId} - JavaSE-1.7 + JavaSE-1.8 <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By - + ${project.artifactId} ${project.groupId} + + + + @@ -271,12 +270,16 @@ limitations under the License. org.codehaus.mojo rpm-maven-plugin - 2.1 + 2.1.4 true ${project.version} + argeo${argeo.rpm.release} Applications/System /usr + 755 + 644 + false @@ -287,84 +290,8 @@ limitations under the License. org.argeo.maven.plugins - maven-argeo-osgi-plugin - 1.1.3 - - - - maven-site-plugin - 3.0 - - doc/site - true - true - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - - - index - summary - license - scm - - - - - - maven-javadoc-plugin - 2.8.1 - - UTF-8 - *.demo.*:*.internal.* - true - - - http://docs.oracle.com/javase/6/docs/api - - http://www.osgi.org/javadoc/r4v42 - - http://static.springsource.org/spring/docs/2.5.x/api - http://static.springsource.org/osgi/docs/1.2.x/api - http://static.springsource.org/spring-security/site/docs/2.0.x/apidocs - - http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0 - - http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/reference/api - - - - - aggregate - - aggregate - - - - - - maven-jxr-plugin - 2.3 - - - **/demo/**/* - **/internal/**/* - - - - - aggregate - - aggregate - - - - - - + argeo-osgi-plugin + 2.1.1 @@ -382,12 +309,19 @@ limitations under the License. - - maven-javadoc-plugin - - true - - + + + + + + + + + + + + + maven-resources-plugin @@ -401,6 +335,19 @@ limitations under the License. false + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar + + + + maven-release-plugin @@ -414,65 +361,42 @@ limitations under the License. - - - - - - - - - org.argeo.tp argeo-tp - ${version.argeo-distribution} + ${version.argeo-tp} provided + + + org.argeo.tp.apache + org.apache.xerces + + + + org.argeo.tp.sdk + biz.aQute.bndlib + + + org.argeo.tp.misc + slf4j.osgi + + - - - - - - - - - - - - - - - - - - - - - - - - org.argeo.tp.rcp.platform - binaries - ${version.eclipseIde} - pom - import - - org.argeo.tp.rap.addons - binaries - ${version.rap.addons} + org.argeo.tp + argeo-tp + ${version.argeo-tp} pom import - org.argeo.tp.rap.platform - binaries - ${version.rap} + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} pom import @@ -480,78 +404,215 @@ limitations under the License. - argeo-tp - http://localhost:7080/data/public/java/argeo-tp-2.1 + argeo + http://repo.argeo.org/data/java/argeo-2.1/ true daily warn + + false + - argeo-tp-eclipseIde - http://localhost:7080/data/public/java/eclipse-ide-3.8 + argeo-snapshots + file:///srv/javafactory/argeo-2.1 - true - daily - warn + false - - - argeo-tp-rap - http://repo.argeo.org/data/public/java/eclipse-rap-2.2 - + true - daily + always warn - + - central - http://repo1.maven.org/maven2 + argeo-maven-plugins + http://repo.argeo.org/data/java/argeo-2.1 true daily warn + + false + - argeo-maven-plugins - http://repo.argeo.org/data/public/java/argeo-maven-1.1 + argeo-maven-plugins-snapshots + file:///srv/javafactory/argeo-2.1 + false + + true - daily + always warn - + staging - dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons} + dav:https://forge.argeo.org/data/java/argeo-2.1/ false + + staging + file:///srv/javafactory/argeo-2.1 + true + - site - dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons} + staging + file:///srv/docfactory/argeo-2.1/site/argeo-commons/ + + + + maven-project-info-reports-plugin + 2.9 + + + + index + summary + license + scm + + + + + + maven-javadoc-plugin + 3.0.0 + + false + -Xdoclint:none + *.internal.*,org.eclipse.* + UTF-8 + true + + http://docs.oracle.com/javase/8/docs/api + https://osgi.org/javadoc/r5/core + https://osgi.org/javadoc/r5/enterprise + https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0 + http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api + http://docs.spring.io/spring/docs/3.2.x/javadoc-api + + + + + aggregate-javadoc + false + + aggregate + + + + javadoc + + + + + + maven-jxr-plugin + 2.5 + + + aggregate-jxr + false + + aggregate + + + + jxr + + + + + + + + rpmbuild + + + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + + + rpmbuild-tp + + + + maven-antrun-plugin + + + install + + run + + + + + + + + + + + + + + + localrepo + + + argeo + http://localhost:7080/data/java/argeo-2.1 + + true + daily + warn + + + - localrepo - Internal Release Repository - dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons} + staging + dav:http://localhost:7080/data/java/argeo-2.1/ + false - - site - Argeo Commons Site - dav:http://localhost:7080/data/files/docs/argeo-commons-${developmentCycle.argeo-commons} -