projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into testing
[lgpl/argeo-commons.git]
/
dep
/
pom.xml
diff --git
a/dep/pom.xml
b/dep/pom.xml
index 3293a560c91b7665e9bb838e08188521f0261b00..7c3b04cb64cbe3fab3c1815962067ca02f7b77f1 100644
(file)
--- a/
dep/pom.xml
+++ b/
dep/pom.xml
@@
-1,10
+1,12
@@
<?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>
<artifactId>argeo-commons</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
- <version>2.1
.104
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
@@
-19,6
+21,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>
@@
-67,6
+79,21
@@
</dependency>
</dependencies>
<profiles>
</dependency>
</dependencies>
<profiles>
+ <profile>
+ <id>a2-target</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>a2-target</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>check-osgi</id>
<build>
<profile>
<id>check-osgi</id>
<build>
@@
-93,7
+120,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
.104
-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>