X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=f782eac7ebfd6dee527a47b34cbc8694042725c4;hb=e26fbc0cfc928848ba85ffbb02e5e655cdab48b4;hp=bfc3422c4d3dd7853c88ea394b887c66044a464d;hpb=0e979509f3a9ecc00a687683be99a0aa929a8e18;p=lgpl%2Fargeo-commons.git
diff --git a/pom.xml b/pom.xml
index bfc3422c4..f782eac7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
4.0.0
org.argeo.commons
argeo-commons
- 2.1.78-SNAPSHOT
+ 2.1.82-SNAPSHOT
Argeo Commons
pom
- 2.1.78-SNAPSHOT
- 2.1.24
+ 2.1.82-SNAPSHOT
+ 2.1.25
7
/srv/rpmfactory/argeo-osgi-2/el7
@@ -38,13 +38,11 @@
org.argeo.cms.e4
org.argeo.cms.e4.rap
-
- org.argeo.cms.ui.workbench
- org.argeo.cms.ui.workbench.rap
org.argeo.ext.jackrabbit
org.argeo.ext.equinox.jetty
- org.argeo.ext.rap.ui.workbench
+
+ legacy
maven
dep
@@ -160,26 +158,6 @@ limitations under the License.
-
- maven-source-plugin
- 2.4
-
-
- attach-sources
- package
-
- jar
-
-
-
-
-
-
- plugin.xml
- META-INF/MANIFEST.MF
-
-
-
maven-clean-plugin
2.6.1
@@ -207,6 +185,18 @@ limitations under the License.
+
+ maven-source-plugin
+ 3.1.0
+
+
+ **/*.class
+
+ plugin.xml
+ META-INF/MANIFEST.MF
+
+
+
maven-antrun-plugin
1.8
@@ -248,7 +238,7 @@ limitations under the License.
org.apache.felix
maven-bundle-plugin
- 3.0.1
+ 4.2.1
true
META-INF
@@ -261,9 +251,9 @@ limitations under the License.
${project.artifactId}
${project.groupId}
- ${git.commit.id}
- ${git.commit.id.describe}
- ${git.closest.tag.commit.count}
+
+
+
@@ -300,8 +290,8 @@ limitations under the License.
org.argeo.maven.plugins
- maven-argeo-osgi-plugin
- 1.2.0
+ argeo-osgi-plugin
+ 2.1.1
@@ -319,19 +309,19 @@ limitations under the License.
-
- pl.project13.maven
- git-commit-id-plugin
-
-
- get-the-git-infos
-
- revision
-
- initialize
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
maven-resources-plugin
@@ -345,6 +335,19 @@ limitations under the License.
false
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+ package
+
+ jar
+
+
+
+
maven-release-plugin
@@ -369,6 +372,15 @@ limitations under the License.
org.argeo.tp.apache
org.apache.xerces
+
+
+ org.argeo.tp.sdk
+ biz.aQute.bndlib
+
+
+ org.argeo.tp.misc
+ slf4j.osgi
+
@@ -399,6 +411,21 @@ limitations under the License.
daily
warn
+
+ false
+
+
+
+ argeo-snapshots
+ file:///srv/javafactory/argeo-2.1
+
+ false
+
+
+ true
+ always
+ warn
+
@@ -410,8 +437,39 @@ limitations under the License.
daily
warn
+
+ false
+
+
+
+ argeo-maven-plugins-snapshots
+ file:///srv/javafactory/argeo-2.1
+
+ false
+
+
+ true
+ always
+ warn
+
+
+
+ staging
+ dav:https://forge.argeo.org/data/java/argeo-2.1/
+ false
+
+
+ staging
+ file:///srv/javafactory/argeo-2.1
+ true
+
+
+ staging
+ file:///srv/docfactory/argeo-2.1/site/argeo-commons/
+
+
@@ -479,17 +537,6 @@ limitations under the License.
-
-
- staging
- dav:https://forge.argeo.org/data/java/argeo-2.1/
- false
-
-
- staging
- file:///srv/docfactory/argeo-2.1/site/argeo-commons/
-
-
rpmbuild