projects
/
gpl
/
argeo-tp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into dev/argeo-slc-2.1
[gpl/argeo-tp.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 5d7d0c6cdf81603f48d3a1b1ab9c8d5b13fecad9..e98964270e04ca46421607f3fcb2a57db21e038c 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-4,10
+4,11
@@
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>lib</artifactId>
<parent>
<groupId>org.argeo.slc</groupId>
<artifactId>lib</artifactId>
- <version>2.1.
1
-SNAPSHOT</version>
+ <version>2.1.
2
-SNAPSHOT</version>
</parent>
<groupId>org.argeo.tp.factory</groupId>
<artifactId>org.argeo.tp.factory.core</artifactId>
</parent>
<groupId>org.argeo.tp.factory</groupId>
<artifactId>org.argeo.tp.factory.core</artifactId>
+ <version>2.1.13</version>
<name>Third Party Factory</name>
<properties>
<additionalImports.slc-lib>
<name>Third Party Factory</name>
<properties>
<additionalImports.slc-lib>
@@
-22,6
+23,13
@@
<include>META-INF/**</include>
</includes>
</resource>
<include>META-INF/**</include>
</includes>
</resource>
+ <resource>
+ <directory>.</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>META-INF/distribution.xml</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
</resources>
<plugins>
<plugin>
@@
-47,7
+55,7
@@
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
</dependency>
<dependency>
<groupId>org.argeo.slc</groupId>
- <artifactId>org.argeo.slc.dep.
rap
</artifactId>
+ <artifactId>org.argeo.slc.dep.
backend
</artifactId>
<version>${version.slc}</version>
<scope>test</scope>
</dependency>
<version>${version.slc}</version>
<scope>test</scope>
</dependency>