projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Base Maven version on major.minor.
[lgpl/argeo-commons.git]
/
dep
/
pom.xml
diff --git
a/dep/pom.xml
b/dep/pom.xml
index 4580394564f8c68c7ba12eb5d07ca6f7869eab75..334d1960331b26ee88e202bf3013ac79227ee8bd 100644
(file)
--- a/
dep/pom.xml
+++ b/
dep/pom.xml
@@
-6,7
+6,7
@@
<parent>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
<parent>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
- <version>2.
1.74
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
@@
-15,12
+15,22
@@
<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.
platform
</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>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <files>
+ <file>../../cnf/unstable.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>
@@
-32,7
+42,7
@@
</plugin>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
</plugin>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
- <artifactId>
maven-
argeo-osgi-plugin</artifactId>
+ <artifactId>argeo-osgi-plugin</artifactId>
<executions>
<execution>
<id>generate-descriptors</id>
<executions>
<execution>
<id>generate-descriptors</id>
@@
-45,13
+55,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.74-SNAPSHOT</version>
- </dependency>
- </dependencies>
<configuration>
<attach>false</attach>
</configuration>
<configuration>
<attach>false</attach>
</configuration>
@@
-69,15
+72,35
@@
<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>
</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>
<plugins>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
<profile>
<id>check-osgi</id>
<build>
<plugins>
<plugin>
<groupId>org.argeo.maven.plugins</groupId>
- <artifactId>
maven-
argeo-osgi-plugin</artifactId>
+ <artifactId>argeo-osgi-plugin</artifactId>
<executions>
<execution>
<id>check-osgi</id>
<executions>
<execution>
<id>check-osgi</id>
@@
-97,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.74
-SNAPSHOT</version>
+ <version>2.
3
-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>