projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/unstable' into testing
[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 22c08d3a5e3d246de596ada20cb9a5ed00a3c2c3..1740dd37e4d899519064093c13d26b121da3920f 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
.24
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@
-29,17
+29,17
@@
<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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Suite Icons -->
</dependency>
<!-- Argeo Suite Icons -->
@@
-53,67
+53,67
@@
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
- <version>2.1
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Library -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.library.ui</artifactId>
</dependency>
<!-- Argeo Library -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.library.ui</artifactId>
- <version>2.1
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-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
.24
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<!-- PDFBox -->
</dependency>
<!-- PDFBox -->
@@
-147,13
+147,6
@@
<groupId>org.argeo.tp.apache</groupId>
<artifactId>org.apache.poi.scratchpad</artifactId>
</dependency>
<groupId>org.argeo.tp.apache</groupId>
<artifactId>org.apache.poi.scratchpad</artifactId>
</dependency>
-
- <!-- Argeo TP Extras -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.payment</groupId> -->
- <!-- <artifactId>com.stripe</artifactId> -->
- <!-- </dependency> -->
-
</dependencies>
<profiles>
<profile>
</dependencies>
<profiles>
<profile>
@@
-188,7
+181,7
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-suite-ui-rap</name>
+ <name>argeo-suite-ui-rap
${argeo.rpm.suffix}
</name>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-207,8
+200,8
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-ui-rap</require>
- <require>argeo-suite-ui-rap-tp</require>
+ <require>argeo-cms-ui-rap
${argeo.rpm.suffix}
</require>
+ <require>argeo-suite-ui-rap-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>
@@
-249,9
+242,9
@@
<goal>rpm</goal>
</goals>
<configuration>
<goal>rpm</goal>
</goals>
<configuration>
- <name>argeo-suite-ui-rap-tp</name>
+ <name>argeo-suite-ui-rap-tp
${argeo.rpm.suffix}
</name>
<version>${version.argeo-tp}</version>
<version>${version.argeo-tp}</version>
- <release>${
maven.build.timestam
p}</release>
+ <release>${
argeo.rpm.release.t
p}</release>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
<mappings>
<mapping>
<directory>/usr/share/osgi</directory>
@@
-270,7
+263,7
@@
</mapping>
</mappings>
<requires>
</mapping>
</mappings>
<requires>
- <require>argeo-cms-ext-tp</require>
+ <require>argeo-cms-ext-tp
${argeo.rpm.suffix}
</require>
</requires>
</configuration>
</execution>
</requires>
</configuration>
</execution>