You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/04/06 23:04:16 UTC
[aries-jax-rs-whiteboard] branch master updated (afe6ec3 -> 1dc2c24)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from afe6ec3 update java matrix
new 8aad692 ignore vscode files
new 0e7a625 centralize dependency version management
new 3c9ba0e update junit jupiter/platform versions 5.7.1/1.7.1 respectively
new d731423 update actions/setup-java@v2
new 92067dd use snapshot of spifly on Java 17
new 1dc2c24 increase test timeout on JaxrsServiceRuntime service
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 4 +-
.gitignore | 1 +
.../cxf-jettison/cxf-jettison-itest/pom.xml | 8 +-
.../cxf-jettison/cxf-jettison-jaxrs/pom.xml | 1 -
integrations/jackson/jackson-itest/pom.xml | 8 +-
integrations/openapi/openapi-itest/itest.bndrun | 2 +-
integrations/openapi/openapi-itest/pom.xml | 10 +-
.../rest-management-itest/itest.bndrun | 18 +--
.../jax/rs/rest/management/test/TestUtil.java | 2 +-
integrations/shiro/shiro-itest/pom.xml | 8 +-
jax-rs.itests/pom.xml | 8 +-
jax-rs.whiteboard/pom.xml | 1 -
pom.xml | 148 ++++++++++++++-------
13 files changed, 138 insertions(+), 81 deletions(-)
[aries-jax-rs-whiteboard] 06/06: increase test timeout on
JaxrsServiceRuntime service
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 1dc2c24fdb18f3a56c1caa274b721cacb3f896d8
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Tue Apr 6 19:01:00 2021 -0400
increase test timeout on JaxrsServiceRuntime service
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java b/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
index e543a9f..6b0864d 100644
--- a/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
+++ b/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
@@ -59,7 +59,7 @@ public class TestUtil {
@InjectService(
filter = "(%s=*)",
filterArguments = JAX_RS_SERVICE_ENDPOINT,
- timeout = 400l
+ timeout = 800l
)
public ServiceAware<JaxrsServiceRuntime> jaxrsServiceRuntimeAware;
[aries-jax-rs-whiteboard] 03/06: update junit jupiter/platform
versions 5.7.1/1.7.1 respectively
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 3c9ba0e9ebb0184dead67dad3d46808490caa09c
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Tue Apr 6 18:43:17 2021 -0400
update junit jupiter/platform versions 5.7.1/1.7.1 respectively
Signed-off-by: Raymond Auge <ro...@apache.org>
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b8e3fc6..5a2267d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,8 @@
<jettison.version>1.4.1</jettison.version>
<json.unit.assertj.version>2.25.0</json.unit.assertj.version>
<junit.version>4.13.2</junit.version>
+ <junit.jupiter.version>5.7.1</junit.jupiter.version>
+ <junit.platform.version>1.7.1</junit.platform.version>
<logback.version>1.2.3</logback.version>
<openapi.version>2.1.7</openapi.version>
<osgi.annotation.version>8.0.0</osgi.annotation.version>
@@ -80,8 +82,6 @@
<osgi.test.version>0.10.0</osgi.test.version>
<shiro.version>1.7.1</shiro.version>
<slf4j.version>1.7.30</slf4j.version>
- <junit.jupiter.version>5.6.0</junit.jupiter.version>
- <junit.platform.version>1.6.0</junit.platform.version>
<spifly.extension.version>1.3.2</spifly.extension.version>
<xmlunit.assertj3.version>2.8.2</xmlunit.assertj3.version>
</properties>
[aries-jax-rs-whiteboard] 04/06: update actions/setup-java@v2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit d7314235818ca0dd86edd4acabd275a7d0690582
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Tue Apr 6 18:49:20 2021 -0400
update actions/setup-java@v2
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.github/workflows/maven.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6f023d5..0ea546b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -38,8 +38,10 @@ jobs:
- name: Git Checkout
uses: actions/checkout@v2
- name: Set up Java
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
+ distribution: 'zulu'
+ check-latest: ${{ endsWith(matrix.java, '-ea') }}
java-version: ${{ matrix.java }}
- name: Build
continue-on-error: ${{contains(matrix.java, '-ea')}}
[aries-jax-rs-whiteboard] 05/06: use snapshot of spifly on Java 17
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 92067dd5fa1456d5ce94c6950a776546c42fd923
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Tue Apr 6 18:55:56 2021 -0400
use snapshot of spifly on Java 17
Signed-off-by: Raymond Auge <ro...@apache.org>
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index 5a2267d..d87124b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -722,6 +722,15 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>java-release-17+</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+ <spifly.extension.version>1.3.3-SNAPSHOT</spifly.extension.version>
+ </properties>
+ </profile>
</profiles>
<reporting>
[aries-jax-rs-whiteboard] 02/06: centralize dependency version
management
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 0e7a625117fdedebac5d43b75ada4747a34ebc5c
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Tue Apr 6 18:42:27 2021 -0400
centralize dependency version management
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../cxf-jettison/cxf-jettison-itest/pom.xml | 8 +-
.../cxf-jettison/cxf-jettison-jaxrs/pom.xml | 1 -
integrations/jackson/jackson-itest/pom.xml | 8 +-
integrations/openapi/openapi-itest/itest.bndrun | 2 +-
integrations/openapi/openapi-itest/pom.xml | 10 +-
.../rest-management-itest/itest.bndrun | 18 +--
integrations/shiro/shiro-itest/pom.xml | 8 +-
jax-rs.itests/pom.xml | 8 +-
jax-rs.whiteboard/pom.xml | 1 -
pom.xml | 135 ++++++++++++++-------
10 files changed, 122 insertions(+), 77 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
index 47ffc9b..ba852af 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
@@ -76,12 +76,12 @@
<artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
index 7441a20..d1f8a7c 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.4.1</version>
</dependency>
</dependencies>
diff --git a/integrations/jackson/jackson-itest/pom.xml b/integrations/jackson/jackson-itest/pom.xml
index fc38c5b..d7311cb 100644
--- a/integrations/jackson/jackson-itest/pom.xml
+++ b/integrations/jackson/jackson-itest/pom.xml
@@ -82,12 +82,12 @@
<artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index 890fcba..0158f61 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -67,7 +67,7 @@
org.apache.aries.jax.rs.openapi.resource;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
- org.apache.commons.lang3;version='[3.11.0,3.11.1)',\
+ org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
diff --git a/integrations/openapi/openapi-itest/pom.xml b/integrations/openapi/openapi-itest/pom.xml
index 8001ce0..ba9b2c6 100644
--- a/integrations/openapi/openapi-itest/pom.xml
+++ b/integrations/openapi/openapi-itest/pom.xml
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -93,13 +92,12 @@
<artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index 9ee94b7..3e772e3 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -75,14 +75,14 @@
io.swagger.core.v3.swagger-models;version='[2.1.7,2.1.8)',\
jakarta.validation.jakarta.validation-api;version='[2.0.2,2.0.3)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- junit-jupiter-api;version='[5.6.0,5.6.1)',\
- junit-jupiter-engine;version='[5.6.0,5.6.1)',\
- junit-platform-commons;version='[1.6.0,1.6.1)',\
- junit-platform-engine;version='[1.6.0,1.6.1)',\
- junit-platform-launcher;version='[1.6.0,1.6.1)',\
- net.javacrumbs.json-unit.json-unit-assertj;version='[2.24.0,2.24.1)',\
- net.javacrumbs.json-unit.json-unit-core;version='[2.24.0,2.24.1)',\
- net.javacrumbs.json-unit.json-unit-json-path;version='[2.24.0,2.24.1)',\
+ junit-jupiter-api;version='[5.7.1,5.7.2)',\
+ junit-jupiter-engine;version='[5.7.1,5.7.2)',\
+ junit-platform-commons;version='[1.7.1,1.7.2)',\
+ junit-platform-engine;version='[1.7.1,1.7.2)',\
+ junit-platform-launcher;version='[1.7.1,1.7.2)',\
+ net.javacrumbs.json-unit.json-unit-assertj;version='[2.25.0,2.25.1)',\
+ net.javacrumbs.json-unit.json-unit-core;version='[2.25.0,2.25.1)',\
+ net.javacrumbs.json-unit.json-unit-json-path;version='[2.25.0,2.25.1)',\
net.minidev.accessors-smart;version='[1.2.0,1.2.1)',\
net.minidev.json-smart;version='[2.3.0,2.3.1)',\
org.apache.aries.jax.rs.openapi.resource;version='[2.0.0,2.0.1)',\
@@ -90,7 +90,7 @@
org.apache.aries.jax.rs.rest.management.itest;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
- org.apache.commons.lang3;version='[3.7.0,3.7.1)',\
+ org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
diff --git a/integrations/shiro/shiro-itest/pom.xml b/integrations/shiro/shiro-itest/pom.xml
index 6d09acf..23a8948 100644
--- a/integrations/shiro/shiro-itest/pom.xml
+++ b/integrations/shiro/shiro-itest/pom.xml
@@ -89,12 +89,12 @@
<artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 5b29791..298ca9f 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -89,12 +89,12 @@
<artifactId>org.osgi.util.promise</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 7c683d6..7cff2f1 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index ae84cbc..b8e3fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,16 +41,49 @@
<maven.compiler.target>${java.build.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <assertj.core.version>3.19.0</assertj.core.version>
<bnd.version>5.3.0</bnd.version>
+ <commons.lang3.version>3.12.0</commons.lang3.version>
<cxf.version>3.4.2</cxf.version>
<dsl.version>1.2.2</dsl.version>
+ <eclipse.osgi.version>3.16.200</eclipse.osgi.version>
+ <felix.configadmin.version>1.9.20</felix.configadmin.version>
+ <felix.gogo.bom.version>1.0.6</felix.gogo.bom.version>
+ <felix.http.jetty.version>4.1.4</felix.http.jetty.version>
+ <felix.http.servlet-api.version>1.1.2</felix.http.servlet-api.version>
+ <felix.logback.version>1.0.2</felix.logback.version>
+ <felix.scr.version>2.1.26</felix.scr.version>
+ <geronimo.activation.version>1.1</geronimo.activation.version>
+ <geronimo.annotation.version>1.3</geronimo.annotation.version>
+ <geronimo.jaxrs.version>1.1</geronimo.jaxrs.version>
+ <geronimo.json.version>1.5</geronimo.json.version>
+ <hamcrest.version>2.2</hamcrest.version>
+ <johnzon.version>1.2.10</johnzon.version>
<jackson.version>2.12.1</jackson.version>
<jaxb.version>2.3.3</jaxb.version>
+ <jettison.version>1.4.1</jettison.version>
+ <json.unit.assertj.version>2.25.0</json.unit.assertj.version>
+ <junit.version>4.13.2</junit.version>
+ <logback.version>1.2.3</logback.version>
<openapi.version>2.1.7</openapi.version>
+ <osgi.annotation.version>8.0.0</osgi.annotation.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
+ <osgi.namespace.extender.version>1.0.1</osgi.namespace.extender.version>
+ <osgi.namespace.implementation.version>1.0.0</osgi.namespace.implementation.version>
+ <osgi.namespace.service.version>1.0.0</osgi.namespace.service.version>
+ <osgi.service.cm.version>1.5.0</osgi.service.cm.version>
+ <osgi.service.component.annotations.version>1.4.0</osgi.service.component.annotations.version>
+ <osgi.service.http.whiteboard.version>1.0.0</osgi.service.http.whiteboard.version>
+ <osgi.service.jaxrs.version>1.0.0</osgi.service.jaxrs.version>
+ <osgi.util.function.version>1.1.0</osgi.util.function.version>
+ <osgi.util.promise.version>1.1.1</osgi.util.promise.version>
+ <osgi.test.version>0.10.0</osgi.test.version>
<shiro.version>1.7.1</shiro.version>
<slf4j.version>1.7.30</slf4j.version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
<junit.platform.version>1.6.0</junit.platform.version>
+ <spifly.extension.version>1.3.2</spifly.extension.version>
+ <xmlunit.assertj3.version>2.8.2</xmlunit.assertj3.version>
</properties>
<scm>
@@ -79,7 +112,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
+ <version>${logback.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -89,9 +122,20 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-assertj</artifactId>
- <version>2.25.0</version>
+ <version>${json.unit.assertj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -203,25 +247,25 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- <version>1.3.2</version>
+ <version>${spifly.extension.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.20</version>
+ <version>${felix.configadmin.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>4.1.4</version>
+ <version>${felix.http.jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.1.2</version>
+ <version>${felix.http.servlet-api.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
@@ -232,60 +276,70 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback</artifactId>
- <version>1.0.2</version>
+ <version>${felix.logback.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.1.26</version>
+ <version>${felix.scr.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
+ <version>${geronimo.activation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.3</version>
+ <version>${geronimo.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrs_2.1_spec</artifactId>
- <version>1.1</version>
+ <version>${geronimo.jaxrs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.5</version>
+ <version>${geronimo.json.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.10</version>
+ <version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.10</version>
+ <version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.19.0</version>
+ <version>${assertj.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.16.200</version>
+ <version>${eclipse.osgi.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>2.2</version>
+ <version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -317,65 +371,65 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>8.0.0</version>
+ <version>${osgi.annotation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>${osgi.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
- <version>1.0.1</version>
+ <version>${osgi.namespace.extender.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.implementation</artifactId>
- <version>1.0.0</version>
+ <version>${osgi.namespace.implementation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
- <version>1.0.0</version>
+ <version>${osgi.namespace.service.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <version>1.5.0</version>
+ <version>${osgi.service.cm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.4.0</version>
+ <version>${osgi.service.component.annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.0.0</version>
+ <version>${osgi.service.http.whiteboard.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jaxrs</artifactId>
- <version>1.0.0</version>
+ <version>${osgi.service.jaxrs.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
+ <version>${osgi.util.function.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.1</version>
+ <version>${osgi.util.promise.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -385,37 +439,32 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.test.junit4</artifactId>
- <version>0.10.0</version>
+ <version>${osgi.test.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.test.junit5</artifactId>
- <version>0.10.0</version>
+ <version>${osgi.test.version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
- <version>4.12.0</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
- <version>1.3.0</version>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-assertj3</artifactId>
+ <version>${xmlunit.assertj3.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.bom</artifactId>
- <version>1.0.6</version>
+ <version>${felix.gogo.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-assertj3</artifactId>
- <version>2.8.2</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</dependencyManagement>
[aries-jax-rs-whiteboard] 01/06: ignore vscode files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 8aad6928ce00725cb2fb0898b2e81789bf91bdc4
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Tue Apr 6 18:25:20 2021 -0400
ignore vscode files
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index f01ca9b..4438544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
.project
.flattened-pom.xml
.settings/
+.vscode/
*/bin/
**/build/
**/generated/