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]
/
dep
/
org.argeo.suite.dep.ui.rap
/
pom.xml
diff --git
a/dep/org.argeo.suite.dep.ui.rap/pom.xml
b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index 4b60442c701adbb3025418beb3be7e05a558ce8e..d2058163a04fe69c738f9f0bbedc366d8dbad773 100644
(file)
--- a/
dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/
dep/org.argeo.suite.dep.ui.rap/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dep</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dep</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@
-15,84
+15,91
@@
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.api</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.api</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.ui</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.ui</artifactId>
- <version>2.1.18</version>
+ <version>2.1.21-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Argeo Suite Icons -->
+ <dependency>
+ <groupId>org.argeo.suite.icons</groupId>
+ <artifactId>org.argeo.suite.icons.default</artifactId>
+ <version>${version.argeo-suite-icons}</version>
</dependency>
<!-- Argeo Suite -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
</dependency>
<!-- Argeo Suite -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.theme.default</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.theme.default</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui.rap</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui.rap</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<!-- Argeo People -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.people.ui</artifactId>
</dependency>
<!-- Argeo People -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.people.ui</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<!-- Argeo Library -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.documents.ui</artifactId>
</dependency>
<!-- Argeo Library -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.documents.ui</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<!-- Argeo Environment -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.geo.ui</artifactId>
</dependency>
<!-- Argeo Environment -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.geo.ui</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<!-- Argeo Publishing -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.publishing.ui</artifactId>
</dependency>
<!-- Argeo Publishing -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.publishing.ui</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<!-- Argeo Knowledge -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.xforms</artifactId>
</dependency>
<!-- Argeo Knowledge -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.xforms</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.odk</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.odk</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.geonames</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.geonames</artifactId>
- <version>2.1.
18
</version>
+ <version>2.1.
21-SNAPSHOT
</version>
</dependency>
<!-- Additional Third Parties -->
</dependency>
<!-- Additional Third Parties -->