X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=c55050c33827f1195d1f21b4ed894d388fde010d;hb=aa5b1ad913de3cbb33e60804388ba21b5df45734;hp=e181b8ec4f3fc3a5f45bd96b85ccc6292e562e14;hpb=5ed4921fe8031b4ded9e967d4777af3bbdd27103;p=gpl%2Fargeo-tp.git

diff --git a/pom.xml b/pom.xml
index e181b8e..c55050c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>1.1.19</version>
+		<version>2.1.16</version>
 	</parent>
-	<groupId>org.argeo.tp.slc</groupId>
-	<artifactId>org.argeo.tp.slc.factory</artifactId>
-	<name>Argeo Distribution Factory</name>
+	<groupId>org.argeo.tp.factory</groupId>
+	<artifactId>org.argeo.tp.factory.core</artifactId>
+	<version>2.1.27</version>
+	<name>Argeo Third Party Factory</name>
+	<description>OSGi packaging of free / open source third party libraries</description>
+	<properties>
+		<additionalImports.slc-lib>
+			javax.security.auth.callback;resolution:="optional"
+		</additionalImports.slc-lib>
+	</properties>
 	<build>
 		<resources>
 			<resource>
@@ -17,11 +25,19 @@
 					<include>META-INF/**</include>
 				</includes>
 			</resource>
+			<resource>
+				<directory>.</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>META-INF/distribution.xml</include>
+				</includes>
+			</resource>
 		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<artifactId>argeo-osgi-plugin</artifactId>
+				<version>2.1.1</version>
 				<executions>
 					<execution>
 						<id>generate-descriptors</id>
@@ -32,18 +48,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							javax.security.auth.callback;resolution:="optional",
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -54,15 +58,19 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.dep.rcp</artifactId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
 			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>
-			<id>argeo-slc</id>
-			<url>http://repo.argeo.org/data/public/java/org.argeo.slc-1.1.x</url>
+			<id>argeo</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>