Skip to content
Permalink
Browse files
Merge pull request #37 from rotty3000/ARIES-2026
Aries 2026
  • Loading branch information
rotty3000 committed Dec 3, 2020
2 parents 2cc51a9 + ee74c89 commit 44dd77fc5937929b94ed55376fb651fc3e14dc9d
Showing 28 changed files with 198 additions and 332 deletions.
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -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>

0 comments on commit 44dd77f

Please sign in to comment.