X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=ab843a29285b85cc44d76242f4b32206b6628aff;hb=8dbd5164c7614779f592c502aac46f1579ffed93;hp=180e8c1d6044ca69ec1d987fb9747ddbc8eb1d00;hpb=f3a038cae10077d7c48ef99aa51fa63fa03a1c0a;p=lgpl%2Fargeo-commons.git
diff --git a/pom.xml b/pom.xml
index 180e8c1d6..ab843a292 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,16 +4,14 @@
4.0.0
org.argeo.commons
argeo-commons
- 2.1.12-SNAPSHOT
+ 2.1.17-SNAPSHOT
Argeo Commons
pom
- 2.1.12
+ 2.1.17-SNAPSHOT
2.1
2012-12-19
- 1.4.0
- 2.2.0-R-20131204-0942
- 0.5.0.argeo.20141029
+ 2.1.7
6
/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64
@@ -25,43 +23,21 @@
org.argeo.util
org.argeo.osgi.boot
org.argeo.server.jcr
-
- org.argeo.eclipse.ui
- 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.eclipse.ui
+ org.argeo.eclipse.ui.rap
+
org.argeo.cms
-
+
org.argeo.eclipse.ui.workbench
- org.argeo.security.equinox
+ org.argeo.eclipse.ui.workbench.rap
org.argeo.security.ui
org.argeo.security.ui.admin
-
org.argeo.security.ui.rap
- org.argeo.security.ui.rcp
-
- org.argeo.server.core
- org.argeo.ext.jdbm
-
+
dep
dist
@@ -153,9 +129,11 @@ limitations under the License.
maven-compiler-plugin
3.2
-
- 1.6
+
+ 1.7
eclipse
+
+ true
target/classes
target/test-classes
@@ -250,7 +228,7 @@ limitations under the License.
<_include>bnd.bnd
${project.version}-r${tstamp}
${project.artifactId}
- JavaSE-1.6
+ JavaSE-1.7
<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
${project.groupId}
@@ -270,10 +248,12 @@ limitations under the License.
org.codehaus.mojo
rpm-maven-plugin
- 2.1
+ 2.1-alpha-1
true
${project.version}
+ 1.el${rpm.release}
+ argeo${rpm.release}
Applications/System
/usr
@@ -287,7 +267,7 @@ limitations under the License.
org.argeo.maven.plugins
maven-argeo-osgi-plugin
- 1.1.3
+ 1.1.4
@@ -413,61 +393,18 @@ limitations under the License.
-
-
-
-
-
-
-
-
-
-
-
-
- org.argeo.tp
- binaries
- ${version.argeo-distribution}
- 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
-
-
-
+
+
+ org.argeo.tp
+ argeo-tp
+ ${version.argeo-distribution}
+ provided
+
+
argeo-tp
- 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
+ https://forge.argeo.org/data/public/java/argeo-tp-2.1/
true
daily
@@ -501,9 +438,28 @@ limitations under the License.
dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}
false
-
- site
- dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}
-
+
+
+ localrepo
+
+
+ argeo-tp
+ http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/
+
+ true
+ daily
+ warn
+
+
+
+
+
+ staging
+ Internal Release Repository
+ dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}
+
+
+
+