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
/
pom.xml
diff --git
a/dep/pom.xml
b/dep/pom.xml
index d2ad0bb07d2c06732df84a47abae5281d9a11fb9..d69eb9b2f01afce4b62f36c2de992a01a2799386 100644
(file)
--- a/
dep/pom.xml
+++ b/
dep/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.
3.2
-SNAPSHOT</version>
+ <version>2.
1
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
@@
-19,6
+17,16
@@
</modules>
<build>
<plugins>
</modules>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../cnf/${version.context}.bnd</file>
+ </files>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>