Update Javax APIs in order to build with Java 11 constraints. OSGi

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

diff --git a/pom.xml b/pom.xml
index dc207ecd120c08f494ec80c5380c4e6200d8b60e..9a6d490ae74d212d91dc6d49ec5476ac74dc6f98 100644 (file)
--- 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-SNAPSHOT</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.26-SNAPSHOT</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>
@@ -42,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>