projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
631d62e
0869861
)
Merge master into v2.x, without modifying versions in Maven pom files.
author
Mathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:04:32 +0000
(21:04 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:04:32 +0000
(21:04 +0100)
1
2
pom.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
pom.xml
index 2a2d5f53cf0844a37a5ae1344a523ff7a7d1a44b,98437907d3966f657a1fbf367e938b02d09f55d0..f85bda54e08ed482e236b3f23fafadaebe68f84c
---
1
/
pom.xml
---
2
/
pom.xml
+++ b/
pom.xml
@@@
-174,6
-186,11
+174,11
@@@
</plugins>
</reporting>
<distributionManagement>
- <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+ <repository>
+ <id>staging</id>
++ <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
<site>
<id>staging</id>
<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>