projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change paragraph default style to DocBook.
[gpl/argeo-suite.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 36bd192644f29f7ca0bc8ca6b03dab2d27b9fbcb..bee12d0551187087f7005b79effdfd62c57ad4b3 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,31
+1,34
@@
-<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>
<artifactId>argeo-osgi-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.maven</groupId>
<artifactId>argeo-osgi-parent</artifactId>
- <version>2.1.
2
</version>
+ <version>2.1.
3
</version>
</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.3.1-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>
<properties>
- <!-- <version.argeo-suite>2.1.17-SNAPSHOT</version.argeo-suite> -->
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
<!-- 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.91-SNAPSHOT
</version.argeo-commons>
- <
!-- <version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc> --
>
+ <version.argeo-commons>
[2.1.102,2.3.0-SNAPSHOT)
</version.argeo-commons>
+ <
version.argeo-suite-icons>[2.1.1,2.3.0-SNAPSHOT)</version.argeo-suite-icons
>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/
unstable/
argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
<git.rw />
</properties>
<modules>
<module>core</module>
<!-- Functional areas -->
<git.rw />
</properties>
<modules>
<module>core</module>
<!-- Functional areas -->
+ <module>people</module>
<module>library</module>
<module>library</module>
+ <module>environment</module>
<module>publishing</module>
<module>knowledge</module>
<module>publishing</module>
<module>knowledge</module>
@@
-46,7
+49,7
@@
<inceptionYear>2014</inceptionYear>
<licenses>
<license>
<inceptionYear>2014</inceptionYear>
<licenses>
<license>
- <name>
GPL-3.0-or-later</name>
+ <name>GPL-3.0-or-later</name>
<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
<distribution>repo</distribution>
</license>
<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
<distribution>repo</distribution>
</license>
@@
-90,33
+93,32
@@
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.argeo.tp.extras</groupId>
- <artifactId>argeo-tp-extras</artifactId>
- <version>${version.argeo-tp-extras}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
<repositories>
<repository>
<id>argeo</id>
</dependencies>
</dependencyManagement>
<repositories>
<repository>
<id>argeo</id>
- <url>http://
repo.argeo.org/data/java/argeo-2.1
</url>
+ <url>http://
forge.argeo.org/data/java/argeo-2.1/
</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
</repository>
<repository>
- <id>argeo-
extras
</id>
- <url>http://
repo.argeo.org/data/java/argeo-extras-2.1
</url>
+ <id>argeo-
unstable
</id>
+ <url>http://
forge.argeo.org/data/java/argeo-2.3/
</url>
<releases>
<enabled>true</enabled>
<releases>
<enabled>true</enabled>
- <updatePolicy>
daily
</updatePolicy>
+ <updatePolicy>
never
</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<checksumPolicy>warn</checksumPolicy>
</releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
<reporting>
</repository>
</repositories>
<reporting>
@@
-187,6
+189,11
@@
</plugins>
</reporting>
<distributionManagement>
</plugins>
</reporting>
<distributionManagement>
+ <repository>
+ <id>staging</id>
+ <url>dav:https://forge.argeo.org/data/java/argeo-2.3</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>