You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/03/20 14:31:59 UTC
[1/2] syncope git commit: Disabling Travis CI cache
Repository: syncope
Updated Branches:
refs/heads/master a7111f5f4 -> cb4291181
Disabling Travis CI cache
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b10fc06a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b10fc06a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b10fc06a
Branch: refs/heads/master
Commit: b10fc06a9696445f2643c3688a0bf1ce9e5f276e
Parents: a7111f5
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Mar 20 15:31:39 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Mar 20 15:31:39 2018 +0100
----------------------------------------------------------------------
.travis.yml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b10fc06a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8f5ba76..6e008aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,6 @@ addons:
apt:
packages:
- oracle-java8-installer
-cache:
- directories:
- - $HOME/.m2
language: java
jdk:
- oraclejdk8
[2/2] syncope git commit: Upgrading CXF and xml-maven-plugin
Posted by il...@apache.org.
Upgrading CXF and xml-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cb429118
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cb429118
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cb429118
Branch: refs/heads/master
Commit: cb42911816b5006dbc720de1dc2d83946c9376bc
Parents: b10fc06
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Mar 20 15:31:51 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Mar 20 15:31:51 2018 +0100
----------------------------------------------------------------------
.../core/rest/cxf/SyncopeOpenApiFeature.java | 72 --------------------
.../src/main/resources/restCXFContext.xml | 2 +-
.../src/main/resources/jboss/restCXFContext.xml | 2 +-
pom.xml | 4 +-
4 files changed, 4 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cb429118/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiFeature.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiFeature.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiFeature.java
deleted file mode 100644
index ca0148f..0000000
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/SyncopeOpenApiFeature.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the 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.
- */
-package org.apache.syncope.core.rest.cxf;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.ws.rs.core.Application;
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
-import org.apache.cxf.jaxrs.model.ApplicationInfo;
-import org.apache.cxf.jaxrs.model.ClassResourceInfo;
-import org.apache.cxf.jaxrs.openapi.OpenApiFeature;
-import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
-
-public class SyncopeOpenApiFeature extends OpenApiFeature {
-
- protected static class SyncopeDefaultApplication extends Application {
-
- private final Set<Class<?>> serviceClasses;
-
- SyncopeDefaultApplication(final List<ClassResourceInfo> cris, final Set<String> resourcePackages) {
- this.serviceClasses = cris.stream().map(ClassResourceInfo::getServiceClass).
- filter(cls -> {
- return resourcePackages == null || resourcePackages.isEmpty()
- ? true
- : resourcePackages.stream().
- anyMatch(pkg -> cls.getPackage().getName().startsWith(pkg));
- }).
- collect(Collectors.toSet());
- }
-
- @Override
- public Set<Class<?>> getClasses() {
- return serviceClasses;
- }
- }
-
- @Override
- protected Application getApplicationOrDefault(
- final Server server,
- final ServerProviderFactory factory,
- final JAXRSServiceFactoryBean sfb,
- final Bus bus) {
-
- ApplicationInfo appInfo = null;
- if (!isScan()) {
- appInfo = new ApplicationInfo(
- new SyncopeDefaultApplication(sfb.getClassResourceInfo(), getResourcePackages()), bus);
- server.getEndpoint().put(Application.class.getName(), appInfo);
- }
-
- return (appInfo == null) ? null : appInfo.getProvider();
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/cb429118/core/rest-cxf/src/main/resources/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml
index b08c142..74368b0 100644
--- a/core/rest-cxf/src/main/resources/restCXFContext.xml
+++ b/core/rest-cxf/src/main/resources/restCXFContext.xml
@@ -110,7 +110,7 @@ under the License.
<property name="dynamicBasePath" value="true"/>
<property name="replaceTags" value="false"/>
</bean>
- <bean id="openapiFeature" class="org.apache.syncope.core.rest.cxf.SyncopeOpenApiFeature">
+ <bean id="openapiFeature" class="org.apache.cxf.jaxrs.openapi.OpenApiFeature">
<property name="title" value="Apache Syncope"/>
<property name="version" value="${syncope.version}"/>
<property name="description" value="Apache Syncope ${syncope.version}"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/cb429118/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
index 1ec5aff..6d24b66 100644
--- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
+++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
@@ -124,7 +124,7 @@ under the License.
</list>
</property>
</bean>
- <bean id="openapiFeature" class="org.apache.syncope.core.rest.cxf.SyncopeOpenApiFeature">
+ <bean id="openapiFeature" class="org.apache.cxf.jaxrs.openapi.OpenApiFeature">
<property name="title" value="Apache Syncope"/>
<property name="version" value="${syncope.version}"/>
<property name="description" value="Apache Syncope ${syncope.version}"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/cb429118/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 69b179f..ef11267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,7 +365,7 @@ under the License.
<connid.ad.version>1.3.4</connid.ad.version>
<connid.googleapps.version>1.4.1</connid.googleapps.version>
- <cxf.version>3.2.2</cxf.version>
+ <cxf.version>3.2.3</cxf.version>
<jackson.version>2.9.4</jackson.version>
@@ -1779,7 +1779,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<dependencies>
<dependency>
<groupId>xalan</groupId>