You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/06/20 11:26:35 UTC
[cxf-fediz] branch master updated (a8bd0b8 -> be69e78)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.
from a8bd0b8 Switch to StringEscapeUtils from commons-text
new 5e66950 fediz-oidc: remove unused persistence configuration
new be69e78 Update Spring & Spring Security, maven-war-plugin
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:
pom.xml | 20 +++++++---
services/idp-core/pom.xml | 23 -----------
services/oidc/pom.xml | 18 ---------
.../src/main/resources/META-INF/persistence.xml | 35 -----------------
.../src/main/webapp/WEB-INF/entity-manager.xml | 44 ----------------------
services/sts/pom.xml | 1 -
systests/cxf/pom.xml | 2 -
systests/federation/oidcIdpWebapp/pom.xml | 1 -
systests/federation/samlIdpWebapp/pom.xml | 3 +-
systests/federation/samlWebapp/pom.xml | 3 +-
systests/webapps/cxfWebapp/pom.xml | 3 +-
11 files changed, 18 insertions(+), 135 deletions(-)
delete mode 100644 services/oidc/src/main/resources/META-INF/persistence.xml
delete mode 100644 services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
[cxf-fediz] 02/02: Update Spring & Spring Security, maven-war-plugin
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit be69e783a7055ab967e3e1eaf474b8aa7cc6eee5
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jun 20 14:26:09 2019 +0300
Update Spring & Spring Security, maven-war-plugin
---
pom.xml | 20 +++++++++++++++-----
services/idp-core/pom.xml | 23 -----------------------
services/oidc/pom.xml | 1 -
services/sts/pom.xml | 1 -
systests/cxf/pom.xml | 2 --
systests/federation/oidcIdpWebapp/pom.xml | 1 -
systests/federation/samlIdpWebapp/pom.xml | 3 +--
systests/federation/samlWebapp/pom.xml | 3 +--
systests/webapps/cxfWebapp/pom.xml | 3 +--
9 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index f002da3..f69ae50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,9 @@
<openjpa.version>2.4.3</openjpa.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.26</slf4j.version>
- <spring.version>4.3.22.RELEASE</spring.version>
+ <spring.version>4.3.24.RELEASE</spring.version>
<spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
- <spring.security.version>4.2.11.RELEASE</spring.security.version>
+ <spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
<tomcat.version>9.0.20</tomcat.version>
<wss4j.version>2.2.2</wss4j.version>
@@ -264,6 +264,18 @@
<module>apache-fediz</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<defaultGoal>install</defaultGoal>
@@ -643,7 +655,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.3</version>
</plugin>
</plugins>
</pluginManagement>
@@ -826,6 +838,4 @@
</profile>
</profiles>
-
-
</project>
diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index ebc9e93..d04eaca 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -33,25 +33,6 @@
<spring.security.version>3.2.10.RELEASE</spring.security.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -73,7 +54,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -82,17 +62,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index c121887..8830299 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 21201c1..21501bd 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml
index 45d520d..d454d76 100644
--- a/systests/cxf/pom.xml
+++ b/systests/cxf/pom.xml
@@ -73,12 +73,10 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz.systests</groupId>
diff --git a/systests/federation/oidcIdpWebapp/pom.xml b/systests/federation/oidcIdpWebapp/pom.xml
index 2b84b40..7baf187 100644
--- a/systests/federation/oidcIdpWebapp/pom.xml
+++ b/systests/federation/oidcIdpWebapp/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/systests/federation/samlIdpWebapp/pom.xml b/systests/federation/samlIdpWebapp/pom.xml
index 1f03118..bbfc369 100644
--- a/systests/federation/samlIdpWebapp/pom.xml
+++ b/systests/federation/samlIdpWebapp/pom.xml
@@ -43,7 +43,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/systests/federation/samlWebapp/pom.xml b/systests/federation/samlWebapp/pom.xml
index 2b8866b..7cb4145 100644
--- a/systests/federation/samlWebapp/pom.xml
+++ b/systests/federation/samlWebapp/pom.xml
@@ -43,7 +43,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/systests/webapps/cxfWebapp/pom.xml b/systests/webapps/cxfWebapp/pom.xml
index f94cedd..355629c 100644
--- a/systests/webapps/cxfWebapp/pom.xml
+++ b/systests/webapps/cxfWebapp/pom.xml
@@ -48,7 +48,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[cxf-fediz] 01/02: fediz-oidc: remove unused persistence
configuration
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 5e669508576b39de9a570f42e50dc735b38aa809
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Jun 17 15:07:29 2019 +0300
fediz-oidc: remove unused persistence configuration
---
services/oidc/pom.xml | 17 ---------
.../src/main/resources/META-INF/persistence.xml | 35 -----------------
.../src/main/webapp/WEB-INF/entity-manager.xml | 44 ----------------------
3 files changed, 96 deletions(-)
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index 166089b..c121887 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -104,23 +104,6 @@
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- -->
</dependencies>
<build>
<plugins>
diff --git a/services/oidc/src/main/resources/META-INF/persistence.xml b/services/oidc/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index a4ca5b2..0000000
--- a/services/oidc/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
- version="2.0">
- <persistence-unit name="oidcOpenJPA" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.cxf.rs.security.oidc.idp.OidcUserSubject</class>
- <class>org.apache.cxf.rs.security.oauth2.common.Client</class>
- <class>org.apache.cxf.rs.security.oauth2.common.UserSubject</class>
- <class>org.apache.cxf.rs.security.oauth2.grants.code.ServerAuthorizationCodeGrant</class>
- <class>org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeGrant</class>
- <class>org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeGrant_</class>
- <class>org.apache.cxf.rs.security.oauth2.tokens.bearer.BearerAccessToken</class>
- <class>org.apache.cxf.rs.security.oauth2.common.ServerAccessToken</class>
- <class>org.apache.cxf.rs.security.oauth2.common.AccessToken</class>
- <class>org.apache.cxf.rs.security.oauth2.common.Permission</class>
- <class>org.apache.cxf.rs.security.oauth2.common.OAuthPermission</class>
- <class>org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken</class>
- <exclude-unlisted-classes>true</exclude-unlisted-classes>
- <properties>
- <property name="openjpa.ConnectionURL" value="jdbc:hsqldb:target/db/oidc/myDB;shutdown=true"/>
- <property name="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver"/>
- <property name="openjpa.jdbc.DBDictionary" value="hsql" />
- <property name="openjpa.ConnectionUserName" value="sa"/>
- <property name="openjpa.ConnectionPassword" value=""/>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
- <property name="openjpa.MetaDataRepository" value="Preload=true"/>
- <!--
- <property name="openjpa.Log" value="SQL=TRACE"/>
-<property name="openjpa.ConnectionFactoryProperties"
- value="PrettyPrint=true, PrettyPrintLineLength=72"/>
- -->
- </properties>
- </persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml b/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
deleted file mode 100644
index 9ddda02..0000000
--- a/services/oidc/src/main/webapp/WEB-INF/entity-manager.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
- ">
- <bean id="openJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter"/>
- <bean id="dataSource"
- class="org.springframework.jdbc.datasource.DriverManagerDataSource"
- p:driverClassName="org.hsqldb.jdbcDriver"
- p:url="jdbc:hsqldb:target/db/oidc/myDB;shutdown=true"
- p:username="sa"
- p:password=""/>
- <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="dataSource" ref="dataSource" />
- <property name="jpaVendorAdapter" ref="openJpaVendorAdapter" />
- <property name="loadTimeWeaver">
- <bean class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"/>
- </property>
- </bean>
- <bean id="entityManager" factory-bean="entityManagerFactory" factory-method="createEntityManager"/>
-
-</beans>
-