Adapt to changes in Argeo Commons.

[gpl/argeo-slc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 070d7b688bf296f7ded0648177498062a0a5be73..a82726ca6ed7dbafe55729c47323c8cb154fece7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
        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>
-               <version>2.1.86-SNAPSHOT</version>
+               <groupId>org.argeo.maven</groupId>
+               <artifactId>argeo-osgi-parent</artifactId>
+               <version>2.1.2</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
@@ -13,13 +13,16 @@
        <name>Argeo SLC</name>
        <version>2.1.17-SNAPSHOT</version>
        <properties>
+               <version.argeo-tp>2.1.27</version.argeo-tp>
+               <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+               <version.argeo-commons>2.1.88-SNAPSHOT</version.argeo-commons>
+               
                <version.slc>2.1.17-SNAPSHOT</version.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
                <developmentCycle.slc>2.1</developmentCycle.slc>
-
-               <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-
                <version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
+
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
        </properties>
        <modules>
                <module>org.argeo.slc.api</module>
@@ -114,8 +117,45 @@ limitations under the License.
                        </roles>
                </developer>
        </developers>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.apache</groupId>
+                                       <artifactId>org.apache.xerces</artifactId>
+                               </exclusion>
+                               <!-- Avoid slf4j implementations lurking in the classpath. -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.sdk</groupId>
+                                       <artifactId>biz.aQute.bndlib</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.misc</groupId>
+                                       <artifactId>slf4j.osgi</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
        <dependencyManagement>
                <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp</artifactId>
+                               <version>${version.argeo-tp}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e4</artifactId>
+                               <version>${version.argeo-tp}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.tp.extras</groupId>
                                <artifactId>argeo-tp-extras</artifactId>