[cxf] branch master updated: Remove unused parameter
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new b7fb580 Remove unused parameter b7fb580 is described below commit b7fb580769382149f7fd362da933a426bdfbd740 Author: Christian SchneiderAuthorDate: Thu Sep 21 20:11:04 2017 +0200 Remove unused parameter --- .../main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java index f3a30ba..376b216 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java @@ -47,7 +47,7 @@ public class SwaggerUiResolver { if (cl instanceof URLClassLoader) { for (URL url : ((URLClassLoader)cl).getURLs()) { String root = -checkUiRoot(url.toString(), swaggerUiMavenGroupAndArtifact, swaggerUiVersion); +checkUiRoot(url.toString(), swaggerUiVersion); if (root != null) { return root; } @@ -56,7 +56,7 @@ public class SwaggerUiResolver { Enumeration urls = cl.getResources(UI_RESOURCES_ROOT_START); while (urls.hasMoreElements()) { String urlStr = urls.nextElement().toString().replace(UI_RESOURCES_ROOT_START, ""); -String root = checkUiRoot(urlStr, swaggerUiMavenGroupAndArtifact, swaggerUiVersion); +String root = checkUiRoot(urlStr, swaggerUiVersion); if (root != null) { return root; } @@ -67,7 +67,7 @@ public class SwaggerUiResolver { return null; } -protected static String checkUiRoot(String urlStr, String swaggerUiMavenGroupAndArtifact, String swaggerUiVersion) { +protected static String checkUiRoot(String urlStr, String swaggerUiVersion) { int swaggerUiIndex = urlStr.lastIndexOf("/swagger-ui-"); if (swaggerUiIndex != -1) { boolean urlEndsWithJarSep = urlStr.endsWith(".jar!/"); -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].
buildbot success in on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/17993 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/17992 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:CXF-DOSGi 2.3.0Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_131; Linux 4.10.0-32-generic)""userId" = "cschneider""ip" = "46.223.225.189"Details:The following artifacts have been staged/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-parent/2.3.0/cxf-dosgi-samples-rest-parent-2.3.0.pom(SHA1: 80875880a5500f5c7edc690890b3e03de272f0bf)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-parent/2.3.0/cxf-dosgi-samples-rest-parent-2.3.0.pom.asc(SHA1: 44f446e427c22b05c88a74a0ce8496d379dc1c00)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0.pom(SHA1: be451ca7183ed5a65639ce36152cab629dd455a0)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0.pom.asc(SHA1: a2969c61bca84a3314651e3e7d7da648f46721a5)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0-javadoc.jar(SHA1: 58c859a174ea37caa40fa9e3182799938039a57a)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0-sources.jar(SHA1: dee76dcfc934bce50f468eb8ec7da8f075c91df8)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0.jar.asc(SHA1: 1f963f912526031a0485bf08c81f2b9ff2a528ad)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0-javadoc.jar.asc(SHA1: 6a70fe14e8c8baf3aa00fd2c125155af33035f17)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0.jar(SHA1: 064efa522acee10b3ca454ccafa1965c9655493c)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.3.0/cxf-dosgi-samples-soap-api-2.3.0-sources.jar.asc(SHA1: fa7d4b3be1146abd1a72539048a1734b27e8f47e)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0-sources.jar.asc(SHA1: 2d21439fa12580eee62ddf691b2f064f5bcafeb1)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0-javadoc.jar.asc(SHA1: e6f2e3d4fe3d2f799ece407a75acbdfb3433cd13)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0-javadoc.jar(SHA1: e4c859ef620c529390a5e525229f3f6228b86a63)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0.jar(SHA1: 85d5bc08b678c871cb7c2ee7bd56397dae04ce30)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0-sources.jar(SHA1: 84aabbb3f9153d689aa320906d29b92679e842ed)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0.jar.asc(SHA1: c5e83085e26b16328e036b8edc83eab949b1c36f)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0.pom.asc(SHA1: cce52e003a4e6962428c28270491c88fdc71b46c)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.3.0/cxf-dosgi-samples-rest-impl-2.3.0.pom(SHA1: 3fd3db94a0836333027b2da542c39fb908a18a99)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0.pom.asc(SHA1: 33493fcd6b747106cf8f90e7bacdb8f0681fec88)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0-javadoc.jar.asc(SHA1: 484cb7deafea61b18b06ddc42ae79cf3707f6f9d)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0.pom(SHA1: 7aeba5253c2edd85ee93b7ab333131c8d414c3f7)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0-sources.jar(SHA1: c737ab81f8112b92e5460ad52aed20fc38bb5893)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0-javadoc.jar(SHA1: 9d024159f1ba0804296261eb6dd2e626e129200e)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0.jar.asc(SHA1: 8f370745a1f721416a6410f69b44035aad378e89)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0-sources.jar.asc(SHA1: 02275636d56b8ce097935a84ec2c75315e85)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.3.0/cxf-dosgi-samples-security-filter-2.3.0.jar(SHA1: 0e85cba45e83bd508979d86c02c2c24f6771145d)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.3.0/cxf-dosgi-samples-ssl-intent-2.3.0-sources.jar.asc(SHA1: 6a0c01379d5652bbee474e48fd4758cf49d54c79)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.3.0/cxf-dosgi-samples-ssl-intent-2.3.0.pom.asc(SHA1: ab046d0973b8514610a0e601dbc536017b20acd4)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.3.0/cxf-dosgi-samples-ssl-intent-2.3.0-javadoc.jar.asc(SHA1: 80e4ba1ef6ea1175628a853bfe1535df8be5aedd)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.3.0/cxf-dosgi-samples-ssl-intent-2.3.0.jar.asc(SHA1:
[cxf-dosgi] 01/03: Fix git url
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git commit 95e93322bf1b634dc0b2f942632e199b88b0cfac Author: Christian SchneiderAuthorDate: Thu Sep 21 13:04:22 2017 +0200 Fix git url --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6c2edc6..5c1406a 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ CXF DOSGi main -scm:g...@github.com:apache/cxf-dosgi.git - scm:g...@github.com:apache/cxf-dosgi.git +scm:git:git://github.com/apache/cxf-dosgi.git + scm:git:git://github.com/apache/cxf-dosgi.git HEAD -- To stop receiving notification emails like this one, please contact "commits@cxf.apache.org" .
[cxf-dosgi] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git The following commit(s) were added to refs/heads/master by this push: new aaf88d7 [maven-release-plugin] prepare for next development iteration aaf88d7 is described below commit aaf88d7393bc73f040c44cf2bb641d628aa06859 Author: Christian SchneiderAuthorDate: Thu Sep 21 13:14:52 2017 +0200 [maven-release-plugin] prepare for next development iteration --- common/pom.xml| 2 +- decorator/pom.xml | 2 +- distribution/features/pom.xml | 2 +- distribution/multi-bundle/pom.xml | 2 +- distribution/pom.xml | 2 +- distribution/repository/pom.xml | 2 +- itests/multi-bundle/pom.xml | 2 +- itests/pom.xml| 2 +- parent/pom.xml| 2 +- pom.xml | 4 ++-- provider-rs/pom.xml | 2 +- provider-ws/pom.xml | 2 +- samples/features/pom.xml | 2 +- samples/pom.xml | 2 +- samples/repository/pom.xml| 2 +- samples/rest/api/pom.xml | 2 +- samples/rest/client/pom.xml | 2 +- samples/rest/impl-jackson/pom.xml | 2 +- samples/rest/impl/pom.xml | 2 +- samples/rest/pom.xml | 2 +- samples/security_filter/pom.xml | 2 +- samples/soap/api/pom.xml | 2 +- samples/soap/client/pom.xml | 2 +- samples/soap/impl/pom.xml | 2 +- samples/soap/pom.xml | 2 +- samples/ssl/pom.xml | 2 +- samples/ssl/ssl-intent/pom.xml| 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index d6f2ba5..a19d2ce 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0 +2.4.0-SNAPSHOT ../parent/pom.xml diff --git a/decorator/pom.xml b/decorator/pom.xml index f780779..df06733 100644 --- a/decorator/pom.xml +++ b/decorator/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0 +2.4.0-SNAPSHOT ../parent/pom.xml diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml index 7f21c6c..ea5bc19 100644 --- a/distribution/features/pom.xml +++ b/distribution/features/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf.dosgi cxf-dosgi-distribution-parent -2.3.0 +2.4.0-SNAPSHOT ../pom.xml diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml index 0cdbfd6..a755a55 100644 --- a/distribution/multi-bundle/pom.xml +++ b/distribution/multi-bundle/pom.xml @@ -19,7 +19,7 @@ org.apache.cxf.dosgi cxf-dosgi-distribution-parent - 2.3.0 + 2.4.0-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 51fd110..bc50859 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent - 2.3.0 + 2.4.0-SNAPSHOT ../parent/pom.xml diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml index 4c1d67b..f3cc289 100644 --- a/distribution/repository/pom.xml +++ b/distribution/repository/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0 +2.4.0-SNAPSHOT ../../parent/pom.xml cxf-dosgi-repository diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml index 8ecaa7b..a0c4d5b 100644 --- a/itests/multi-bundle/pom.xml +++ b/itests/multi-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0 +2.4.0-SNAPSHOT ../../parent/pom.xml diff --git a/itests/pom.xml b/itests/pom.xml index 0d9ee41..3a89ed2 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0 +2.4.0-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 8e57b05..15d12e0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -14,7 +14,7 @@ org.apache.cxf.dosgi cxf-dosgi-main -2.3.0 +2.4.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index ddacffa..d1c3854 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf.dosgi cxf-dosgi-main -2.3.0 +2.4.0-SNAPSHOT pom CXF DOSGi main @@ -37,7 +37,7 @@ scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=summary -
[cxf-dosgi] annotated tag cxf-dosgi-2.3.0 created (now 3798d10)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to annotated tag cxf-dosgi-2.3.0 in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git. at 3798d10 (tag) tagging 7fecec14c1fad6849a4e6ce5194a7f7dcac0c078 (commit) replaces cxf-dosgi-2.2.0 by Christian Schneider on Thu Sep 21 13:14:46 2017 +0200 - Log - [maven-release-plugin] copy for tag cxf-dosgi-2.3.0 --- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org"'].
[cxf-dosgi] 03/03: [maven-release-plugin] prepare release cxf-dosgi-2.3.0
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git commit 7fecec14c1fad6849a4e6ce5194a7f7dcac0c078 Author: Christian SchneiderAuthorDate: Thu Sep 21 13:14:19 2017 +0200 [maven-release-plugin] prepare release cxf-dosgi-2.3.0 --- common/pom.xml| 2 +- decorator/pom.xml | 2 +- distribution/features/pom.xml | 2 +- distribution/multi-bundle/pom.xml | 5 ++--- distribution/pom.xml | 2 +- distribution/repository/pom.xml | 2 +- itests/multi-bundle/pom.xml | 2 +- itests/pom.xml| 2 +- parent/pom.xml| 2 +- pom.xml | 4 ++-- provider-rs/pom.xml | 2 +- provider-ws/pom.xml | 2 +- samples/features/pom.xml | 2 +- samples/pom.xml | 2 +- samples/repository/pom.xml| 2 +- samples/rest/api/pom.xml | 2 +- samples/rest/client/pom.xml | 2 +- samples/rest/impl-jackson/pom.xml | 2 +- samples/rest/impl/pom.xml | 2 +- samples/rest/pom.xml | 2 +- samples/security_filter/pom.xml | 2 +- samples/soap/api/pom.xml | 2 +- samples/soap/client/pom.xml | 2 +- samples/soap/impl/pom.xml | 2 +- samples/soap/pom.xml | 2 +- samples/ssl/pom.xml | 2 +- samples/ssl/ssl-intent/pom.xml| 2 +- 27 files changed, 29 insertions(+), 30 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 1ec2b12..d6f2ba5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0-SNAPSHOT +2.3.0 ../parent/pom.xml diff --git a/decorator/pom.xml b/decorator/pom.xml index 4717212..f780779 100644 --- a/decorator/pom.xml +++ b/decorator/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0-SNAPSHOT +2.3.0 ../parent/pom.xml diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml index f985618..7f21c6c 100644 --- a/distribution/features/pom.xml +++ b/distribution/features/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf.dosgi cxf-dosgi-distribution-parent -2.3.0-SNAPSHOT +2.3.0 ../pom.xml diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml index 179a5b1..0cdbfd6 100644 --- a/distribution/multi-bundle/pom.xml +++ b/distribution/multi-bundle/pom.xml @@ -9,8 +9,7 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 cxf-dosgi-multibundle-distribution @@ -20,7 +19,7 @@ org.apache.cxf.dosgi cxf-dosgi-distribution-parent - 2.3.0-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 6c18e7d..51fd110 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent - 2.3.0-SNAPSHOT + 2.3.0 ../parent/pom.xml diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml index 164f198..4c1d67b 100644 --- a/distribution/repository/pom.xml +++ b/distribution/repository/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0-SNAPSHOT +2.3.0 ../../parent/pom.xml cxf-dosgi-repository diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml index 8d0fe75..8ecaa7b 100644 --- a/itests/multi-bundle/pom.xml +++ b/itests/multi-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0-SNAPSHOT +2.3.0 ../../parent/pom.xml diff --git a/itests/pom.xml b/itests/pom.xml index 9775de0..0d9ee41 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.cxf.dosgi cxf-dosgi-parent -2.3.0-SNAPSHOT +2.3.0 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 0ec9007..8e57b05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -14,7 +14,7 @@ org.apache.cxf.dosgi
[cxf-dosgi] 02/03: Fix git url
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git commit ad7438d9d121eed0d414e3daeb6bacc77ea90dc7 Author: Christian SchneiderAuthorDate: Thu Sep 21 13:11:55 2017 +0200 Fix git url --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5c1406a..48fdd43 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,9 @@ CXF DOSGi main -scm:git:git://github.com/apache/cxf-dosgi.git - scm:git:git://github.com/apache/cxf-dosgi.git + scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git + scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git + https://gitbox.apache.org/repos/asf?p=cxf-dosgi.git;a=summary HEAD -- To stop receiving notification emails like this one, please contact "commits@cxf.apache.org" .
[cxf-dosgi] branch master updated (276d8da -> 7fecec1)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git. from 276d8da Use github uri in pom new 95e9332 Fix git url new ad7438d Fix git url new 7fecec1 [maven-release-plugin] prepare release cxf-dosgi-2.3.0 The 3 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: common/pom.xml| 2 +- decorator/pom.xml | 2 +- distribution/features/pom.xml | 2 +- distribution/multi-bundle/pom.xml | 5 ++--- distribution/pom.xml | 2 +- distribution/repository/pom.xml | 2 +- itests/multi-bundle/pom.xml | 2 +- itests/pom.xml| 2 +- parent/pom.xml| 2 +- pom.xml | 9 + provider-rs/pom.xml | 2 +- provider-ws/pom.xml | 2 +- samples/features/pom.xml | 2 +- samples/pom.xml | 2 +- samples/repository/pom.xml| 2 +- samples/rest/api/pom.xml | 2 +- samples/rest/client/pom.xml | 2 +- samples/rest/impl-jackson/pom.xml | 2 +- samples/rest/impl/pom.xml | 2 +- samples/rest/pom.xml | 2 +- samples/security_filter/pom.xml | 2 +- samples/soap/api/pom.xml | 2 +- samples/soap/client/pom.xml | 2 +- samples/soap/impl/pom.xml | 2 +- samples/soap/pom.xml | 2 +- samples/ssl/pom.xml | 2 +- samples/ssl/ssl-intent/pom.xml| 2 +- 27 files changed, 32 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org"'].
[cxf-dosgi] branch master updated: Use github uri in pom
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git The following commit(s) were added to refs/heads/master by this push: new 276d8da Use github uri in pom 276d8da is described below commit 276d8da2b7b00ff79c2a62b1f796e095f53a2699 Author: Christian SchneiderAuthorDate: Thu Sep 21 12:28:51 2017 +0200 Use github uri in pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e4132ae..6c2edc6 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ CXF DOSGi main - scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git - scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git +scm:g...@github.com:apache/cxf-dosgi.git + scm:g...@github.com:apache/cxf-dosgi.git HEAD -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].
[cxf-dosgi] branch master updated (ea16df0 -> 722f4c2)
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git. from ea16df0 Make sure we do not export the IntentsProvider interface new de19dd5 Add swagger UI bundle to distro new 722f4c2 Add itest for swagger json The 2 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: distribution/multi-bundle/distro.bndrun| 89 -- distribution/multi-bundle/pom.xml | 5 ++ .../cxf/dosgi/itests/multi/TestExportService.java | 4 + 3 files changed, 56 insertions(+), 42 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org"'].
[cxf-dosgi] 01/02: Add swagger UI bundle to distro
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git commit de19dd5292df71d4b1b9359050667668b73a123e Author: Christian SchneiderAuthorDate: Thu Sep 21 10:48:21 2017 +0200 Add swagger UI bundle to distro --- distribution/multi-bundle/distro.bndrun | 89 + distribution/multi-bundle/pom.xml | 5 ++ 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/distribution/multi-bundle/distro.bndrun b/distribution/multi-bundle/distro.bndrun index df08e7b..36c8b5b 100644 --- a/distribution/multi-bundle/distro.bndrun +++ b/distribution/multi-bundle/distro.bndrun @@ -4,29 +4,21 @@ -runblacklist: \ osgi.identity;filter:='(osgi.identity=slf4j.api)',\ osgi.identity;filter:='(osgi.identity=osgi.cmpn)',\ - osgi.identity;filter:='(osgi.identity=osgi.core)' + osgi.identity;filter:='(osgi.identity=osgi.core)',\ + osgi.identity;filter:='(osgi.identity=org.osgi.service.http)' -runfw: org.apache.felix.framework;version='[5.6.8,5.6.8]' -runee: JavaSE-1.8 - +# rsa.export.policy.filter="(name=rest)",\ -runproperties: \ org.ops4j.pax.logging.DefaultServiceLog.level=INFO,\ - rsa.export.policy.filter="(name=rest)",\ org.osgi.framework.bootdelegation=com.sun.*,\ org.osgi.framework.system.packages.extra='sun.misc,javax.xml.bind.annotation;version=2.2.1,javax.xml.bind;version=2.2.1' - -# felix.cm.loglevel=4,\ -# felix.fileinstall.dir=./etc,\ -# felix.fileinstall.noInitialDelay=true,\ -# felix.fileinstall.enableConfigSave=false,\ -# felix.fileinstall.log.level=4,\ -# org.osgi.framework.startlevel.beginning=100,\ - -# Only needed for karaf console -# karaf.systemBundlesStartLevel=0,\ -# karaf.startLocalConsole=true,\ -# karaf.local.roles='admin,manager,viewer,systembundles',\ - + felix.cm.loglevel=4,\ + felix.fileinstall.dir=./etc,\ + felix.fileinstall.noInitialDelay=true,\ + felix.fileinstall.log.level=4,\ + org.ops4j.pax.logging.DefaultServiceLog.level=INFO -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.felix.fileinstall)',\ @@ -38,46 +30,34 @@ osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\ osgi.identity;filter:='(&(osgi.identity=org.apache.aries.rsa.discovery.command)(version>=1.9.0))',\ osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-rs)',\ + osgi.identity;filter:='(osgi.identity=org.webjars.swagger-ui)',\ osgi.identity;filter:='(osgi.identity=org.apache.cxf.cxf-rt-rs-service-description-swagger)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.zookeeper)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)' + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\ + osgi.identity;filter:='(&(osgi.identity=org.apache.felix.metatype)(version>=1.1.2))',\ + osgi.identity;filter:='(&(osgi.identity=org.apache.cxf.cxf-rt-ws-policy)(version>=3.2.0))',\ + osgi.identity;filter:='(&(osgi.identity=com.fasterxml.woodstox.woodstox-core)(version>=5.0.3))' + -runbundles: \ - org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\ - org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\ - org.objectweb.asm.all;version='[5.0.4,5.0.5)',\ - org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\ - org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)',\ - javax.servlet-api;version='[3.1.0,3.1.1)',\ - org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\ - org.apache.felix.http.api;version='[2.3.2,2.3.3)',\ - org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\ - org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\ - org.fusesource.jansi;version='[1.13.0,1.13.1)',\ - org.apache.aries.rsa.core;version='[1.11.0,1.11.1)',\ - org.apache.aries.rsa.discovery.command;version='[1.11.0,1.11.1)',\ - org.apache.aries.rsa.spi;version='[1.11.0,1.11.1)',\ - org.apache.aries.rsa.topology-manager;version='[1.11.0,1.11.1)',\ - org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.3.0,2.3.1)',\ - org.apache.cxf.dosgi.cxf-dosgi-provider-rs;version='[2.3.0,2.3.1)',\ - org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.3.0,2.3.1)',\ - org.apache.ws.xmlschema.core;version='[2.2.2,2.2.3)',\ - org.apache.felix.scr;version='[2.0.12,2.0.13)',\ com.fasterxml.jackson.core.jackson-annotations;version='[2.8.9,2.8.10)',\ com.fasterxml.jackson.core.jackson-core;version='[2.8.9,2.8.10)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.8.9,2.8.10)',\
[cxf-dosgi] 02/02: Add itest for swagger json
This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git commit 722f4c261a9798dce71b3839a7ddcb670ae399a4 Author: Christian SchneiderAuthorDate: Thu Sep 21 10:48:53 2017 +0200 Add itest for swagger json --- .../java/org/apache/cxf/dosgi/itests/multi/TestExportService.java | 4 1 file changed, 4 insertions(+) diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java index a4bc5a1..fcc70c0 100644 --- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java +++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java @@ -90,6 +90,10 @@ public class TestExportService extends AbstractDosgiTest { } ); Assert.assertEquals("Buy some coffee", task.getTitle()); +final WebClient swaggerClient = WebClient.create(REST_SERVICE_URI + "/swagger.json"); +String swaggerJson = swaggerClient.get(String.class); +Assert.assertEquals("{\"swagger\":\"2.0\"", swaggerJson.substring(0, 16)); + } @Test -- To stop receiving notification emails like this one, please contact "commits@cxf.apache.org" .