[ARIES-2026] Update/unify integrations into the main build
Signed-off-by: Raymond Auge <rotty3000@apache.org>
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index da12af3..dc5b778 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
@@ -50,12 +49,12 @@
-runbundles: \
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- org.apache.aries.jax.rs.itests-fragment;version='[1.0.9,1.0.10)',\
- org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.jaxb.json.cxf-jettison;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
+ org.apache.aries.jax.rs.itests-fragment;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.jaxb.json.cxf-jettison;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
- org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
+ org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
@@ -66,4 +65,8 @@
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
+
-include: -personal.bnd
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
index 8edb85b..c120fea 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
@@ -21,18 +21,13 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>cxf-jettison-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest</artifactId>
<description>Apache Aries JAX-RS CXF Jettison JAXB-JSON Integration Tests</description>
<name>Apache Aries JAX-RS CXF Jettison JAXB-JSON Integration Tests</name>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -82,13 +77,13 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>${aries.jaxrs.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.itests-fragment</artifactId>
- <version>${aries.jaxrs.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
index fea117a..70843d9 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
@@ -17,10 +17,12 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>cxf-jettison-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>${revision}</version>
+ <relativePath>../../..</relativePath>
</parent>
<artifactId>org.apache.aries.jax.rs.jaxb.json.cxf-jettison</artifactId>
diff --git a/integrations/cxf-jettison/pom.xml b/integrations/cxf-jettison/pom.xml
index 15184d6..70741cf 100644
--- a/integrations/cxf-jettison/pom.xml
+++ b/integrations/cxf-jettison/pom.xml
@@ -22,8 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>cxf-jettison-integration</artifactId>
@@ -42,36 +41,4 @@
<module>cxf-jettison-itest</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore>
- </ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
\ No newline at end of file
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index 06db0ae..0cad5a5 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
@@ -51,11 +50,11 @@
com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.9.6,2.9.7)',\
com.fasterxml.jackson.module.jackson-module-jaxb-annotations;version='[2.9.6,2.9.7)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- org.apache.aries.jax.rs.jackson.itest;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.jackson;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
+ org.apache.aries.jax.rs.jackson;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.jackson.itest;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
- org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
+ org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
@@ -66,4 +65,8 @@
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
+
-include: -personal.bnd
diff --git a/integrations/jackson/jackson-itest/pom.xml b/integrations/jackson/jackson-itest/pom.xml
index a6375d8..da878a8 100644
--- a/integrations/jackson/jackson-itest/pom.xml
+++ b/integrations/jackson/jackson-itest/pom.xml
@@ -23,19 +23,13 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>jackson-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.jackson.itest</artifactId>
<description>Apache Aries JAX-RS Jackson JAXB-JSON Integration Tests</description>
<name>Apache Aries JAX-RS Jackson JAXB-JSON Integration Tests</name>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -85,7 +79,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>${aries.jaxrs.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/integrations/jackson/jackson-jaxrs/pom.xml b/integrations/jackson/jackson-jaxrs/pom.xml
index 64e8961..21dc990 100644
--- a/integrations/jackson/jackson-jaxrs/pom.xml
+++ b/integrations/jackson/jackson-jaxrs/pom.xml
@@ -19,10 +19,12 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>jackson-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>${revision}</version>
+ <relativePath>../../..</relativePath>
</parent>
<artifactId>org.apache.aries.jax.rs.jackson</artifactId>
diff --git a/integrations/jackson/pom.xml b/integrations/jackson/pom.xml
index c46519b..85a8597 100644
--- a/integrations/jackson/pom.xml
+++ b/integrations/jackson/pom.xml
@@ -24,18 +24,13 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>jackson-integration</artifactId>
<name>Apache Aries JAX-RS Jackson JAXB-JSON Integration Project</name>
<packaging>pom</packaging>
- <properties>
- <jackson.version>2.9.6</jackson.version>
- </properties>
-
<scm>
<connection>scm:git:http://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git</developerConnection>
@@ -48,36 +43,4 @@
<module>jackson-itest</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore>
- </ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
\ No newline at end of file
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index e96d8b3..e09405f 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
@@ -58,12 +57,12 @@
io.swagger.core.v3.swagger-models;version='[2.1.0,2.1.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
javax.validation.api;version='[1.1.0,1.1.1)',\
- org.apache.aries.jax.rs.openapi.itest;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.openapi.resource;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
+ org.apache.aries.jax.rs.openapi.itest;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.openapi.resource;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
org.apache.commons.lang3;version='[3.10.0,3.10.1)',\
- org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
+ org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
@@ -75,4 +74,8 @@
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
+
-include: -personal.bnd
diff --git a/integrations/openapi/openapi-itest/pom.xml b/integrations/openapi/openapi-itest/pom.xml
index 640d312..eb439bf 100644
--- a/integrations/openapi/openapi-itest/pom.xml
+++ b/integrations/openapi/openapi-itest/pom.xml
@@ -23,19 +23,13 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>openapi-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.openapi.itest</artifactId>
<description>Apache Aries Open API JAX-RS Integration Tests</description>
<name>Apache Aries JAX-RS Open API Integration Tests</name>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -87,13 +81,13 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>${aries.jaxrs.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.openapi.resource</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/integrations/openapi/openapi-resource/pom.xml b/integrations/openapi/openapi-resource/pom.xml
index c1c380c..70c81cf 100644
--- a/integrations/openapi/openapi-resource/pom.xml
+++ b/integrations/openapi/openapi-resource/pom.xml
@@ -19,10 +19,12 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>openapi-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>${revision}</version>
+ <relativePath>../../..</relativePath>
</parent>
<artifactId>org.apache.aries.jax.rs.openapi.resource</artifactId>
@@ -47,7 +49,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>${aries.jaxrs.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.component-dsl</groupId>
diff --git a/integrations/openapi/pom.xml b/integrations/openapi/pom.xml
index 9ccb880..d680e57 100644
--- a/integrations/openapi/pom.xml
+++ b/integrations/openapi/pom.xml
@@ -22,18 +22,13 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>openapi-integration</artifactId>
<name>Apache Aries JAX-RS Open API Integration Project</name>
<packaging>pom</packaging>
- <properties>
- <openapi.version>2.1.0</openapi.version>
- </properties>
-
<scm>
<connection>scm:git:http://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git</developerConnection>
@@ -46,36 +41,4 @@
<module>openapi-itest</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore>
- </ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
\ No newline at end of file
diff --git a/integrations/pom.xml b/integrations/pom.xml
index e48842e..d6bea7c 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -21,21 +21,19 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>integration</artifactId>
- <name>Apache Aries JAX-RS Integration Projects Reactor</name>
- <version>1.0.3-SNAPSHOT</version>
- <packaging>pom</packaging>
-
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
+ <artifactId>integration</artifactId>
+ <name>Apache Aries JAX-RS Integration Projects Reactor</name>
+ <packaging>pom</packaging>
+
<properties>
- <aries.jaxrs.version>1.0.11-SNAPSHOT</aries.jaxrs.version>
- <dsl.version>1.2.2</dsl.version>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
</properties>
<scm>
diff --git a/integrations/shiro/pom.xml b/integrations/shiro/pom.xml
index 9ca502a..b53f658 100644
--- a/integrations/shiro/pom.xml
+++ b/integrations/shiro/pom.xml
@@ -20,20 +20,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <groupId>org.apache.aries.jax.rs</groupId>
+ <artifactId>integration</artifactId>
+ <version>${revision}</version>
</parent>
<artifactId>shiro-integration</artifactId>
<name>Apache Aries JAX-RS Shiro Integration Project</name>
<packaging>pom</packaging>
- <properties>
- <shiro.version>1.4.0</shiro.version>
- </properties>
-
<scm>
<connection>scm:git:http://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git</developerConnection>
@@ -47,36 +42,4 @@
<module>shiro-itest</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore>
- </ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>
\ No newline at end of file
diff --git a/integrations/shiro/shiro-authc/pom.xml b/integrations/shiro/shiro-authc/pom.xml
index 57c4d5c..22f9de4 100644
--- a/integrations/shiro/shiro-authc/pom.xml
+++ b/integrations/shiro/shiro-authc/pom.xml
@@ -19,10 +19,12 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>shiro-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>${revision}</version>
+ <relativePath>../../..</relativePath>
</parent>
<artifactId>org.apache.aries.jax.rs.shiro.authc</artifactId>
diff --git a/integrations/shiro/shiro-authz/pom.xml b/integrations/shiro/shiro-authz/pom.xml
index 35ea879..d1fa7ea 100644
--- a/integrations/shiro/shiro-authz/pom.xml
+++ b/integrations/shiro/shiro-authz/pom.xml
@@ -19,10 +19,12 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>shiro-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>${revision}</version>
+ <relativePath>../../..</relativePath>
</parent>
<artifactId>org.apache.aries.jax.rs.shiro.authz</artifactId>
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index abf5f97..9d6c4c7 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
@@ -45,18 +44,18 @@
-runbundles: \
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- org.apache.aries.jax.rs.shiro.authc;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.shiro.authz;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.shiro.itest;version='[1.0.3,1.0.4)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
+ org.apache.aries.jax.rs.shiro.authc;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.shiro.authz;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.shiro.itest;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
org.apache.commons.configuration;version='[2.2.0,2.2.1)',\
org.apache.commons.lang3;version='[3.6.0,3.6.1)',\
org.apache.commons.logging;version='[1.2.0,1.2.1)',\
- org.apache.felix.configadmin;version='[1.8.14,1.8.15)',\
- org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
- org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
- org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
+ org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
+ org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
@@ -69,4 +68,8 @@
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
+
-include: -personal.bnd
diff --git a/integrations/shiro/shiro-itest/pom.xml b/integrations/shiro/shiro-itest/pom.xml
index 1529b93..3b70bca 100644
--- a/integrations/shiro/shiro-itest/pom.xml
+++ b/integrations/shiro/shiro-itest/pom.xml
@@ -23,18 +23,13 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>shiro-integration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.shiro.itest</artifactId>
<description>Apache Aries JAX-RS Shiro Integration Tests</description>
<name>Apache Aries JAX-RS Shiro Integration Tests</name>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -82,7 +77,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
- <version>${aries.jaxrs.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index 3b2dd8c..f2d0f31 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
@@ -52,8 +51,8 @@
-runbundles: \
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- org.apache.aries.jax.rs.example;version='[1.0.10,1.0.11)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.10,1.0.11)',\
+ org.apache.aries.jax.rs.example;version='[1.0.11,1.0.12)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 96ffec2..7bfb546 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
@@ -52,7 +51,7 @@
-runbundles: \
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- org.apache.aries.jax.rs.whiteboard;version='[1.0.10,1.0.11)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
@@ -63,8 +62,8 @@
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.0,1.1.1)'
--include: -personal.bnd
-
-runstartlevel: \
order=sortbynameversion,\
begin=-1
+
+-include: -personal.bnd
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index d4dd963..95caaeb 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.example</artifactId>
diff --git a/jax-rs.features/pom.xml b/jax-rs.features/pom.xml
index d700702..6175872 100644
--- a/jax-rs.features/pom.xml
+++ b/jax-rs.features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.features</artifactId>
diff --git a/jax-rs.itests-fragment/pom.xml b/jax-rs.itests-fragment/pom.xml
index 2f44a82..402190a 100644
--- a/jax-rs.itests-fragment/pom.xml
+++ b/jax-rs.itests-fragment/pom.xml
@@ -18,18 +18,23 @@
under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jax.rs.itests-fragment</artifactId>
<description>Apache Aries JAX-RS Whiteboard Integration Tests Fragment</description>
<name>Apache Aries JAX-RS Whiteboard Integration Tests Fragment</name>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -39,8 +44,4 @@
</plugins>
</build>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- </properties>
-
</project>
\ No newline at end of file
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 1d2f26e..798bca5 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -22,11 +22,10 @@
org.apache.felix.logback,\
slf4j.api
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.event;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25,\
- ${bndjava15temorarysupplementalpackages}
+ org.slf4j;version=${slf4j.version},\
+ org.slf4j.event;version=${slf4j.version},\
+ org.slf4j.helpers;version=${slf4j.version},\
+ org.slf4j.spi;version=${slf4j.version}
-runfw: org.eclipse.osgi
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 2b48f6a..6d9203a 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.itests</artifactId>
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 4afe594..9e57efa 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
@@ -116,7 +116,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/org.apache.aries.jax.rs.cxf.repackage/pom.xml b/org.apache.aries.jax.rs.cxf.repackage/pom.xml
index eea2dd6..9988062 100644
--- a/org.apache.aries.jax.rs.cxf.repackage/pom.xml
+++ b/org.apache.aries.jax.rs.cxf.repackage/pom.xml
@@ -1,9 +1,9 @@
<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jax.rs</groupId>
- <artifactId>org.apache.aries.jax.rs</artifactId>
- <version>1.0.11-SNAPSHOT</version>
+ <groupId>org.apache.aries.jax.rs</groupId>
+ <artifactId>org.apache.aries.jax.rs</artifactId>
+ <version>${revision}</version>
</parent>
<groupId>org.apache.aries.jax.rs.cxf.repackage</groupId>
@@ -11,6 +11,11 @@
<description>This project extracts and repackages CXF so that the whiteboard can be more easily built</description>
<name>Apache Aries JAX-RS Whiteboard CXF dependency repackaging</name>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.component-dsl</groupId>
diff --git a/pom.xml b/pom.xml
index 8656a75..0399f9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,66 +24,31 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>23</version>
<relativePath />
</parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<name>Apache Aries JAX-RS Whiteboard Integration Project</name>
- <version>1.0.11-SNAPSHOT</version>
+ <version>${revision}</version>
<packaging>pom</packaging>
+
<properties>
+ <revision>1.0.11-SNAPSHOT</revision>
<java.build.version>1.8</java.build.version>
- <!-- <maven.compiler.release>${java.build.version}</maven.compiler.release> -->
<maven.compiler.source>${java.build.version}</maven.compiler.source>
<maven.compiler.target>${java.build.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <bnd.version>5.1.2</bnd.version>
<cxf.version>3.2.14</cxf.version>
- <bnd.version>5.1.0</bnd.version>
<dsl.version>1.2.2</dsl.version>
+ <jackson.version>2.9.6</jackson.version>
<jaxb.version>2.3.3</jaxb.version>
- <bndjava15temorarysupplementalpackages><![CDATA[
- javax.crypto,
- javax.crypto.spec,
- javax.imageio,
- javax.imageio.stream,
- javax.management,
- javax.management.modelmbean,
- javax.management.remote,
- javax.naming,
- javax.naming.directory,
- javax.naming.ldap,
- javax.net.ssl,
- javax.rmi.ssl,
- javax.security.auth,
- javax.security.auth.callback,
- javax.security.auth.login,
- javax.security.auth.x500,
- javax.sql,
- javax.swing,
- javax.swing.border,
- javax.swing.tree,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.stream,
- javax.xml.stream.events,
- javax.xml.stream.util,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stax,
- javax.xml.transform.stream,
- javax.xml.validation,
- javax.xml.xpath,
- org.w3c.dom,
- org.w3c.dom.bootstrap,
- org.w3c.dom.ls,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
- ]]></bndjava15temorarysupplementalpackages>
+ <openapi.version>2.1.0</openapi.version>
+ <shiro.version>1.4.0</shiro.version>
+ <slf4j.version>1.7.30</slf4j.version>
</properties>
<scm>
@@ -100,7 +65,7 @@
<module>jax-rs.itests</module>
<module>jax-rs.features</module>
<module>jax-rs.example</module>
- <!--<module>integrations</module>-->
+ <module>integrations</module>
</modules>
<dependencyManagement>
@@ -524,6 +489,21 @@
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>java-release</id>
+ <activation>
+ <jdk>9,)</jdk>
+ </activation>
+ <properties>
+ <java.build.version>${java.specification.version}</java.build.version>
+ <maven.compiler.release>${java.build.version}</maven.compiler.release>
+ <maven.compiler.source>${java.build.version}</maven.compiler.source>
+ <maven.compiler.target>${java.build.version}</maven.compiler.target>
+ </properties>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
<plugin>
