X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=33c70f142686ee658f55461de26286be5978e43b;hb=535985419fc3f71a0538d2fbcb100d542f7061da;hp=5464ba90c515dc0275d9e8afed64d0b1dea677b7;hpb=a581132b59880b93926ac7f2936409cef712f5ee;p=lgpl%2Fargeo-commons.git
diff --git a/pom.xml b/pom.xml
index 5464ba90c..33c70f142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,10 @@
Argeo Commons
pom
- 2.1.13
+ 2.1.13-SNAPSHOT
2.1
2012-12-19
- 1.4.0
- 2.2.0-R-20131204-0942
- 0.5.0.argeo.20141029
+ 2.1.5
6
/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64
@@ -24,42 +22,31 @@
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.core
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.eclipse.ui
+ org.argeo.eclipse.ui.rap
+
org.argeo.node.repo.jackrabbit
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.server.core
- org.argeo.ext.jdbm
dep
dist
@@ -152,8 +139,8 @@ limitations under the License.
maven-compiler-plugin
3.2
-
- 1.6
+
+ 1.7
eclipse
target/classes
@@ -249,7 +236,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}
@@ -269,10 +256,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
@@ -412,61 +401,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
@@ -500,9 +446,17 @@ 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
+
+
+ localrepo
+ Internal Release Repository
+ dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}
+
+
+
+