projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/unstable' into testing
[lgpl/argeo-commons.git]
/
dist
/
pom.xml
diff --git
a/dist/pom.xml
b/dist/pom.xml
index 52ed45d55b89d15926e692061e0f4c3b5bed1d91..f6b9917e090e3f1e61426c1c681ee12f13b91b1a 100644
(file)
--- a/
dist/pom.xml
+++ b/
dist/pom.xml
@@
-1,7
+1,5
@@
<?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.commons</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
@@
-14,7
+12,7
@@
<packaging>pom</packaging>
<modules>
<module>osgi-boot</module>
<packaging>pom</packaging>
<modules>
<module>osgi-boot</module>
- <
module>argeo-cli</module
>
+ <
!-- <module>argeo-cli</module> --
>
<module>argeo-node</module>
<module>containers</module>
</modules>
<module>argeo-node</module>
<module>containers</module>
</modules>