X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=b14b4282c56a95f231a2916128f3d8358d2e39fe;hb=76b53a8fdeb0e9180f6ca41517022e0c322bac86;hp=50cc2e4878badffbda38eab4748b9f9d7f3217a3;hpb=fb03545c79b1b2f1f3c433cf275da4e7cb29a296;p=lgpl%2Fargeo-commons.git
diff --git a/pom.xml b/pom.xml
index 50cc2e487..b14b4282c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.argeo.commons
argeo-commons
- 1.1.2-SNAPSHOT
+ 1.1.6-SNAPSHOT
Argeo Commons
Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring
pom
@@ -11,7 +11,7 @@
1.1
2012-06-19
1.3.1
- 1.1.2
+ [1.1,1.2)
file:///srv/projects/www/commons/site
http://projects.argeo.org/commons/site
@@ -21,10 +21,8 @@
UTF-8
- basic
- osgi
+ base
server
- eclipse
security
@@ -47,7 +45,7 @@
maven-clean-plugin
2.4.1
+
+
+
+ META-INF
+
+ MANIFEST.MF
+
+
+
+
maven-surefire-plugin
@@ -160,6 +168,10 @@ limitations under the License.
true
+
+ maven-javadoc-plugin
+ 2.8.1
+
org.apache.felix
@@ -172,6 +184,8 @@ limitations under the License.
${project.version}-r${timestamp}
${project.artifactId}
JavaSE-1.6
+
+ ${project.groupId}
@@ -202,6 +216,7 @@ limitations under the License.
mbaudier@argeo.org
Applications/System
/usr
+ 2012 Argeo GmbH and others
@@ -213,7 +228,7 @@ limitations under the License.
org.argeo.maven.plugins
maven-argeo-osgi-plugin
- 1.0.33
+ 1.1.2
@@ -255,6 +270,8 @@ limitations under the License.
*.demo.*:*.internal.*
true
+
+ http://docs.oracle.com/javase/6/docs/api
http://www.osgi.org/javadoc/r4v42
@@ -322,6 +339,26 @@ limitations under the License.
+
+
+ src/main/resources
+
+
+ .
+
+ plugin.xml
+ META-INF/**
+ WEB-INF/**
+ icons/**
+ branding/**
+ *.properties
+ p2.inf
+
+
+ build.properties
+
+
+
org.codehaus.mojo
@@ -340,6 +377,25 @@ limitations under the License.
yyMMdd_HHmm
+
+ maven-clean-plugin
+
+
+
+ META-INF
+
+ MANIFEST.MF
+
+
+
+
+
+
+ maven-javadoc-plugin
+
+ true
+
+
maven-resources-plugin
@@ -357,7 +413,7 @@ limitations under the License.
maven-release-plugin
deploy
- rpmbuild,rpmbuild-tp,el5
+ rpmbuild,rpmbuild-tp
@@ -398,17 +454,12 @@ limitations under the License.
argeo-tp
- http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1
+ http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1
true
daily
- fail
+ warn
-
- false
- never
- fail
-
@@ -418,35 +469,24 @@ limitations under the License.
true
daily
- fail
+ warn
-
- false
- never
- fail
-
- argeo
- http://maven.argeo.org/argeo
+ argeo-maven-plugins
+ http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.maven.plugins-1.1.x
true
daily
- fail
+ warn
-
- false
- never
- fail
-
+ staging
+ dav:https://repo.argeo.org/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x
false
- argeo-commons-restricted
- Argeo FOSS Repository
- dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}
argeo-commons-site
@@ -461,13 +501,12 @@ limitations under the License.
localrepo
Internal Release Repository
- dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-
+ dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x
localrepo.snapshots
Internal Snapshot Repository
- dav:http://localhost:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}
+ dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x
@@ -475,8 +514,7 @@ limitations under the License.
el5
5
- /srv/rpmfactory/argeo-osgi-staging/5/x86_64
-
+ /srv/rpmfactory/argeo-osgi-staging/5/x86_64