You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2021/04/18 08:45:08 UTC
[aries-jax-rs-whiteboard] branch master updated (9e93fb9 -> 46217dd)
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from 9e93fb9 increase timeout so accommodate slowness on windows
new e0cf85a Revert "increase timeout so accommodate slowness on windows"
new 1b87ae6 Revert "re-resolve"
new abb4ca7 Revert "update to spifly 1.3.3"
new 00e425d Revert "[ARIES-JAXRS-Whiteboard][maven-release-plugin] 2.0.0 prepare for next development iteration"
new 46217dd Revert "[ARIES-JAXRS-Whiteboard][maven-release-plugin] 2.0.0 prepare release org.apache.aries.jax.rs-2.0.0"
The 5 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:
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 2 +-
integrations/cxf-jettison/cxf-jettison-itest/pom.xml | 2 +-
integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml | 2 +-
integrations/cxf-jettison/pom.xml | 2 +-
integrations/jackson/jackson-itest/itest.bndrun | 2 +-
integrations/jackson/jackson-itest/pom.xml | 2 +-
integrations/jackson/jackson-jaxrs/pom.xml | 2 +-
integrations/jackson/pom.xml | 2 +-
integrations/openapi/openapi-itest/itest.bndrun | 2 +-
integrations/openapi/openapi-itest/pom.xml | 2 +-
integrations/openapi/openapi-resource/pom.xml | 2 +-
integrations/openapi/pom.xml | 2 +-
integrations/pom.xml | 2 +-
integrations/rest-management/pom.xml | 2 +-
.../rest-management/rest-management-itest/itest.bndrun | 2 +-
integrations/rest-management/rest-management-itest/pom.xml | 2 +-
.../apache/aries/jax/rs/rest/management/test/TestUtil.java | 2 +-
integrations/rest-management/rest-management/pom.xml | 2 +-
integrations/shiro/pom.xml | 2 +-
integrations/shiro/shiro-authc/pom.xml | 2 +-
integrations/shiro/shiro-authz/pom.xml | 2 +-
integrations/shiro/shiro-itest/itest.bndrun | 2 +-
integrations/shiro/shiro-itest/pom.xml | 2 +-
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 2 +-
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 2 +-
jax-rs.example/pom.xml | 2 +-
jax-rs.features/pom.xml | 2 +-
jax-rs.itests/itest.bndrun | 2 +-
jax-rs.itests/pom.xml | 2 +-
jax-rs.whiteboard/pom.xml | 2 +-
pom.xml | 13 +++++++++++--
31 files changed, 41 insertions(+), 32 deletions(-)
[aries-jax-rs-whiteboard] 04/05: Revert
"[ARIES-JAXRS-Whiteboard][maven-release-plugin] 2.0.0 prepare for next
development iteration"
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 00e425de7911a5b1cc45bfec5fa4bd3c9a5c89b0
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Sun Apr 18 10:44:40 2021 +0200
Revert "[ARIES-JAXRS-Whiteboard][maven-release-plugin] 2.0.0 prepare for next development iteration"
This reverts commit 9fae0af6bef87b05a90a60606c90f986c5bab513.
---
integrations/cxf-jettison/cxf-jettison-itest/pom.xml | 2 +-
integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml | 2 +-
integrations/cxf-jettison/pom.xml | 4 ++--
integrations/jackson/jackson-itest/pom.xml | 2 +-
integrations/jackson/jackson-jaxrs/pom.xml | 2 +-
integrations/jackson/pom.xml | 4 ++--
integrations/openapi/openapi-itest/pom.xml | 2 +-
integrations/openapi/openapi-resource/pom.xml | 2 +-
integrations/openapi/pom.xml | 4 ++--
integrations/pom.xml | 4 ++--
integrations/rest-management/pom.xml | 4 ++--
integrations/rest-management/rest-management-itest/pom.xml | 2 +-
integrations/rest-management/rest-management/pom.xml | 2 +-
integrations/shiro/pom.xml | 4 ++--
integrations/shiro/shiro-authc/pom.xml | 2 +-
integrations/shiro/shiro-authz/pom.xml | 2 +-
integrations/shiro/shiro-itest/pom.xml | 2 +-
jax-rs.example/pom.xml | 2 +-
jax-rs.features/pom.xml | 2 +-
jax-rs.itests/pom.xml | 2 +-
jax-rs.whiteboard/pom.xml | 2 +-
pom.xml | 4 ++--
22 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
index 2170e70..45daf08 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>cxf-jettison-integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest</artifactId>
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
index 873955b..a4b2830 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/cxf-jettison/pom.xml b/integrations/cxf-jettison/pom.xml
index f308283..4b0d86f 100644
--- a/integrations/cxf-jettison/pom.xml
+++ b/integrations/cxf-jettison/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cxf-jettison-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
diff --git a/integrations/jackson/jackson-itest/pom.xml b/integrations/jackson/jackson-itest/pom.xml
index 0c0eded..e6d83b3 100644
--- a/integrations/jackson/jackson-itest/pom.xml
+++ b/integrations/jackson/jackson-itest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>jackson-integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.jackson.itest</artifactId>
diff --git a/integrations/jackson/jackson-jaxrs/pom.xml b/integrations/jackson/jackson-jaxrs/pom.xml
index 501ed97..e30c6e1 100644
--- a/integrations/jackson/jackson-jaxrs/pom.xml
+++ b/integrations/jackson/jackson-jaxrs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/jackson/pom.xml b/integrations/jackson/pom.xml
index 563ce7d..83252a1 100644
--- a/integrations/jackson/pom.xml
+++ b/integrations/jackson/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>jackson-integration</artifactId>
@@ -35,7 +35,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
diff --git a/integrations/openapi/openapi-itest/pom.xml b/integrations/openapi/openapi-itest/pom.xml
index be7553b..d2ef478 100644
--- a/integrations/openapi/openapi-itest/pom.xml
+++ b/integrations/openapi/openapi-itest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>openapi-integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.openapi.itest</artifactId>
diff --git a/integrations/openapi/openapi-resource/pom.xml b/integrations/openapi/openapi-resource/pom.xml
index 7cef674..d22eeb2 100644
--- a/integrations/openapi/openapi-resource/pom.xml
+++ b/integrations/openapi/openapi-resource/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/openapi/pom.xml b/integrations/openapi/pom.xml
index 5a5cf19..229e0af 100644
--- a/integrations/openapi/pom.xml
+++ b/integrations/openapi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>openapi-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
diff --git a/integrations/pom.xml b/integrations/pom.xml
index d8a1fdf..41aefa3 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>integration</artifactId>
@@ -40,7 +40,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
diff --git a/integrations/rest-management/pom.xml b/integrations/rest-management/pom.xml
index 2917691..55035cd 100644
--- a/integrations/rest-management/pom.xml
+++ b/integrations/rest-management/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>rest-management-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
diff --git a/integrations/rest-management/rest-management-itest/pom.xml b/integrations/rest-management/rest-management-itest/pom.xml
index c72504b..9b85773 100644
--- a/integrations/rest-management/rest-management-itest/pom.xml
+++ b/integrations/rest-management/rest-management-itest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>rest-management-integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.rest.management.itest</artifactId>
diff --git a/integrations/rest-management/rest-management/pom.xml b/integrations/rest-management/rest-management/pom.xml
index 5b6fc55..5529c09 100644
--- a/integrations/rest-management/rest-management/pom.xml
+++ b/integrations/rest-management/rest-management/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/shiro/pom.xml b/integrations/shiro/pom.xml
index 030a7c5..32377c6 100644
--- a/integrations/shiro/pom.xml
+++ b/integrations/shiro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>shiro-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
diff --git a/integrations/shiro/shiro-authc/pom.xml b/integrations/shiro/shiro-authc/pom.xml
index 0b92112..140ab26 100644
--- a/integrations/shiro/shiro-authc/pom.xml
+++ b/integrations/shiro/shiro-authc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/shiro/shiro-authz/pom.xml b/integrations/shiro/shiro-authz/pom.xml
index c0a0e15..cb7a53f 100644
--- a/integrations/shiro/shiro-authz/pom.xml
+++ b/integrations/shiro/shiro-authz/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/shiro/shiro-itest/pom.xml b/integrations/shiro/shiro-itest/pom.xml
index 5137639..d851aa9 100644
--- a/integrations/shiro/shiro-itest/pom.xml
+++ b/integrations/shiro/shiro-itest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>shiro-integration</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.shiro.itest</artifactId>
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 4a3b908..18eb8b9 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</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 3e12956..23333b8 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>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.features</artifactId>
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 93bf605..4b063bd 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</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 ee83de7..f56d928 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>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
diff --git a/pom.xml b/pom.xml
index 04dc9c2..6fb90d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<name>Apache Aries JAX-RS Whiteboard Integration Project</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<packaging>pom</packaging>
<properties>
@@ -90,7 +90,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.aries.jax.rs-2.0.0</tag>
</scm>
<modules>
[aries-jax-rs-whiteboard] 05/05: Revert
"[ARIES-JAXRS-Whiteboard][maven-release-plugin] 2.0.0 prepare release
org.apache.aries.jax.rs-2.0.0"
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 46217ddb5d248018263f68c9aca638e323873179
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Sun Apr 18 10:44:40 2021 +0200
Revert "[ARIES-JAXRS-Whiteboard][maven-release-plugin] 2.0.0 prepare release org.apache.aries.jax.rs-2.0.0"
This reverts commit e4c7911bdc71a1867e88cfdc9ea3d40ca642b241.
---
integrations/cxf-jettison/cxf-jettison-itest/pom.xml | 2 +-
integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml | 2 +-
integrations/cxf-jettison/pom.xml | 4 ++--
integrations/jackson/jackson-itest/pom.xml | 2 +-
integrations/jackson/jackson-jaxrs/pom.xml | 2 +-
integrations/jackson/pom.xml | 4 ++--
integrations/openapi/openapi-itest/pom.xml | 2 +-
integrations/openapi/openapi-resource/pom.xml | 2 +-
integrations/openapi/pom.xml | 4 ++--
integrations/pom.xml | 4 ++--
integrations/rest-management/pom.xml | 4 ++--
integrations/rest-management/rest-management-itest/pom.xml | 2 +-
integrations/rest-management/rest-management/pom.xml | 2 +-
integrations/shiro/pom.xml | 4 ++--
integrations/shiro/shiro-authc/pom.xml | 2 +-
integrations/shiro/shiro-authz/pom.xml | 2 +-
integrations/shiro/shiro-itest/pom.xml | 2 +-
jax-rs.example/pom.xml | 2 +-
jax-rs.features/pom.xml | 2 +-
jax-rs.itests/pom.xml | 2 +-
jax-rs.whiteboard/pom.xml | 2 +-
pom.xml | 4 ++--
22 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
index 45daf08..ba852af 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>cxf-jettison-integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest</artifactId>
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
index a4b2830..d1f8a7c 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/cxf-jettison/pom.xml b/integrations/cxf-jettison/pom.xml
index 4b0d86f..7f25e38 100644
--- a/integrations/cxf-jettison/pom.xml
+++ b/integrations/cxf-jettison/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-jettison-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/integrations/jackson/jackson-itest/pom.xml b/integrations/jackson/jackson-itest/pom.xml
index e6d83b3..d7311cb 100644
--- a/integrations/jackson/jackson-itest/pom.xml
+++ b/integrations/jackson/jackson-itest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>jackson-integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.jackson.itest</artifactId>
diff --git a/integrations/jackson/jackson-jaxrs/pom.xml b/integrations/jackson/jackson-jaxrs/pom.xml
index e30c6e1..4ebe27c 100644
--- a/integrations/jackson/jackson-jaxrs/pom.xml
+++ b/integrations/jackson/jackson-jaxrs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/jackson/pom.xml b/integrations/jackson/pom.xml
index 83252a1..4e8c8ea 100644
--- a/integrations/jackson/pom.xml
+++ b/integrations/jackson/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>jackson-integration</artifactId>
@@ -35,7 +35,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/integrations/openapi/openapi-itest/pom.xml b/integrations/openapi/openapi-itest/pom.xml
index d2ef478..ccd7fce 100644
--- a/integrations/openapi/openapi-itest/pom.xml
+++ b/integrations/openapi/openapi-itest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>openapi-integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.openapi.itest</artifactId>
diff --git a/integrations/openapi/openapi-resource/pom.xml b/integrations/openapi/openapi-resource/pom.xml
index d22eeb2..405471f 100644
--- a/integrations/openapi/openapi-resource/pom.xml
+++ b/integrations/openapi/openapi-resource/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/openapi/pom.xml b/integrations/openapi/pom.xml
index 229e0af..4bec518 100644
--- a/integrations/openapi/pom.xml
+++ b/integrations/openapi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>openapi-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/integrations/pom.xml b/integrations/pom.xml
index 41aefa3..9d877e9 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>integration</artifactId>
@@ -40,7 +40,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/integrations/rest-management/pom.xml b/integrations/rest-management/pom.xml
index 55035cd..7eec35c 100644
--- a/integrations/rest-management/pom.xml
+++ b/integrations/rest-management/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>rest-management-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/integrations/rest-management/rest-management-itest/pom.xml b/integrations/rest-management/rest-management-itest/pom.xml
index 9b85773..6662b19 100644
--- a/integrations/rest-management/rest-management-itest/pom.xml
+++ b/integrations/rest-management/rest-management-itest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>rest-management-integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.rest.management.itest</artifactId>
diff --git a/integrations/rest-management/rest-management/pom.xml b/integrations/rest-management/rest-management/pom.xml
index 5529c09..34c0cdb 100644
--- a/integrations/rest-management/rest-management/pom.xml
+++ b/integrations/rest-management/rest-management/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/shiro/pom.xml b/integrations/shiro/pom.xml
index 32377c6..05cf8b7 100644
--- a/integrations/shiro/pom.xml
+++ b/integrations/shiro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>shiro-integration</artifactId>
@@ -33,7 +33,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/integrations/shiro/shiro-authc/pom.xml b/integrations/shiro/shiro-authc/pom.xml
index 140ab26..d2f1394 100644
--- a/integrations/shiro/shiro-authc/pom.xml
+++ b/integrations/shiro/shiro-authc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/shiro/shiro-authz/pom.xml b/integrations/shiro/shiro-authz/pom.xml
index cb7a53f..72bafe0 100644
--- a/integrations/shiro/shiro-authz/pom.xml
+++ b/integrations/shiro/shiro-authz/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
diff --git a/integrations/shiro/shiro-itest/pom.xml b/integrations/shiro/shiro-itest/pom.xml
index d851aa9..23a8948 100644
--- a/integrations/shiro/shiro-itest/pom.xml
+++ b/integrations/shiro/shiro-itest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>shiro-integration</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.shiro.itest</artifactId>
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 18eb8b9..16883ba 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</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 23333b8..ef08cf0 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>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.features</artifactId>
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 4b063bd..298ca9f 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</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 f56d928..7cff2f1 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>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
diff --git a/pom.xml b/pom.xml
index 6fb90d2..4947ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs</artifactId>
<name>Apache Aries JAX-RS Whiteboard Integration Project</name>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -90,7 +90,7 @@
<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>
<url>https://gitbox.apache.org/repos/asf?p=aries-jax-rs-whiteboard.git</url>
- <tag>org.apache.aries.jax.rs-2.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
[aries-jax-rs-whiteboard] 02/05: Revert "re-resolve"
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 1b87ae6d2e0fdb28ffa543cd1e816bb3e11d8f22
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Sun Apr 18 10:44:39 2021 +0200
Revert "re-resolve"
This reverts commit c6c4ddc01e1612fc650524bfba637ab750ba8d93.
---
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 2 +-
integrations/jackson/jackson-itest/itest.bndrun | 2 +-
integrations/openapi/openapi-itest/itest.bndrun | 2 +-
integrations/rest-management/rest-management-itest/itest.bndrun | 2 +-
integrations/shiro/shiro-itest/itest.bndrun | 2 +-
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 2 +-
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 2 +-
jax-rs.itests/itest.bndrun | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index d5bdd6a..10a6a9b 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -53,7 +53,7 @@
org.apache.aries.jax.rs.jaxb.json.cxf-jettison;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.jaxb.json.cxf-jettison-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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index 26215a0..102d5e9 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -58,7 +58,7 @@
org.apache.aries.jax.rs.jackson;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.jackson.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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index f2e9cc1..3313eff 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -68,7 +68,7 @@
org.apache.aries.jax.rs.openapi.itest;version='[2.0.0,2.0.1)',\
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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index 91af392..860bc41 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -90,7 +90,7 @@
org.apache.aries.jax.rs.rest.management;version='[2.0.0,2.0.1)',\
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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index a4dbc1b..a48cb07 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -54,7 +54,7 @@
org.apache.aries.jax.rs.shiro.authz;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.shiro.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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index d6e0939..ad05022 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -55,7 +55,7 @@
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.example;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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 4df919f..63d6acb 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -53,7 +53,7 @@
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 81b759f..506e749 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -56,7 +56,7 @@
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.itests;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.3,1.3.4)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
[aries-jax-rs-whiteboard] 03/05: Revert "update to spifly 1.3.3"
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit abb4ca7c38584bb6171688e86f75ca96818bc325
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Sun Apr 18 10:44:39 2021 +0200
Revert "update to spifly 1.3.3"
This reverts commit f76202fa7b96f33d8a51fa5f93bc3f46f920b434.
---
pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1a4a5b5..04dc9c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
<osgi.test.version>0.10.0</osgi.test.version>
<shiro.version>1.7.1</shiro.version>
<slf4j.version>1.7.30</slf4j.version>
- <spifly.extension.version>1.3.3</spifly.extension.version>
+ <spifly.extension.version>1.3.2</spifly.extension.version>
<xmlunit.assertj3.version>2.8.2</xmlunit.assertj3.version>
</properties>
@@ -721,6 +721,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] 01/05: Revert "increase timeout so
accommodate slowness on windows"
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit e0cf85aa31823172f2fe88e5271059317200f7a3
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Sun Apr 18 10:44:37 2021 +0200
Revert "increase timeout so accommodate slowness on windows"
This reverts commit 9e93fb998d54b83c6f3d34ce9830bf63730cedac.
---
.../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 41a71c1..973b437 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 = 2000l
+ timeout = 800l
)
public ServiceAware<JaxrsServiceRuntime> jaxrsServiceRuntimeAware;