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]
/
org.argeo.entity.ui
/
pom.xml
diff --git
a/org.argeo.entity.ui/pom.xml
b/org.argeo.entity.ui/pom.xml
index f2399cf01442827b78c1e2ee53726aa0231069a6..d53f0d005482a27facaa34eb74961147c9c10c93 100644
(file)
--- a/
org.argeo.entity.ui/pom.xml
+++ b/
org.argeo.entity.ui/pom.xml
@@
-1,12
+1,10
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<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.suite</groupId>
<artifactId>argeo-suite</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1
.18
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.entity.ui</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.entity.ui</artifactId>
@@
-16,7
+14,7
@@
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
- <version>2.1
.18
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
</dependency>
<!-- Argeo Commons -->
@@
-30,8
+28,7
@@
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.eclipse.ui.rap</artifactId>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.eclipse.ui.rap</artifactId>
- <version>2.1.91-SNAPSHOT</version>
- <scope>provided</scope>
+ <version>${version.argeo-commons}</version>
</dependency>
<!-- Eclipse E4 -->
</dependency>
<!-- Eclipse E4 -->