projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/v2.x'
[lgpl/argeo-commons.git]
/
dep
/
pom.xml
diff --git
a/dep/pom.xml
b/dep/pom.xml
index 75dede6a1d05f9d2be1c6405ba994f1ab6900c56..37e847f05211fee0697bbe68623d0feb506a5444 100644
(file)
--- a/
dep/pom.xml
+++ b/
dep/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
<parent>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
- <version>2.
1.8
1-SNAPSHOT</version>
+ <version>2.
3.
1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
@@
-13,8
+13,9
@@
<modules>
<module>org.argeo.dep.cms.client</module>
<module>org.argeo.dep.cms.node</module>
<modules>
<module>org.argeo.dep.cms.client</module>
<module>org.argeo.dep.cms.node</module>
+ <module>org.argeo.dep.cms.ui.rap</module>
<module>org.argeo.dep.cms.e4.rap</module>
<module>org.argeo.dep.cms.e4.rap</module>
- <module>org.argeo.dep.cms.
sdk
</module>
+ <module>org.argeo.dep.cms.
ext
</module>
</modules>
<build>
<plugins>
</modules>
<build>
<plugins>
@@
-42,13
+43,6
@@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.argeo.commons</groupId>
- <artifactId>assembly-descriptors</artifactId>
- <version>2.1.81-SNAPSHOT</version>
- </dependency>
- </dependencies>
<configuration>
<attach>false</attach>
</configuration>
<configuration>
<attach>false</attach>
</configuration>
@@
-66,6
+60,11
@@
<artifactId>org.junit</artifactId>
<scope>test</scope>
</dependency>
<artifactId>org.junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.argeo.tp.sdk</groupId>
+ <artifactId>org.hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
</dependencies>
<profiles>
<profile>
@@
-94,7
+93,7
@@
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.osgi.boot</artifactId>
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.osgi.boot</artifactId>
- <version>2.
1.8
1-SNAPSHOT</version>
+ <version>2.
3.
1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>