projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into v2.x
[gpl/argeo-suite.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 9ea641c166d39fe9f903cd63d692e7a80da501cc..7c1ba6d78a1944797e504e963ca0c056e2777c75 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,4
+1,6
@@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.maven</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.maven</groupId>
@@
-7,15
+9,17
@@
</parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
</parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <
packaging>pom</packaging
>
+ <
version>2.1.23-SNAPSHOT</version
>
<name>Argeo Suite</name>
<name>Argeo Suite</name>
- <
description /
>
- <
version>2.1.18-SNAPSHOT</version
>
+ <
packaging>pom</packaging
>
+ <
url>http://www.argeo.org/</url
>
<properties>
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
<properties>
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
- <version.argeo-commons>2.1.100</version.argeo-commons>
+ <version.argeo-commons>2.1.103</version.argeo-commons>
+ <!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
+ <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
<git.rw />
<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
<git.rw />
@@
-174,6
+178,11
@@
</plugins>
</reporting>
<distributionManagement>
</plugins>
</reporting>
<distributionManagement>
+ <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>
<site>
<id>staging</id>
<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>