Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JDK 11 Compatibility 

Upgraded dependencies and removed a test in the Java Config LDAP
sample which is arguably an integration test since it starts up an
LDAP container. This test also isn't JDK 11 compatible and the
remaining integration tests in the sample cover the same material.

Issue: gh-5860
This commit is contained in:
Josh Cummings 2018-10-16 17:39:14 -06:00
parent a96893a42a
commit 42b111fba6
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
3 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/dependency-management.gradle
View File

@ -81,8 +81,8 @@ dependencyManagement {
dependency 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
dependency 'junit:junit:4.12'
dependency 'ldapsdk:ldapsdk:4.1'
dependency 'net.bytebuddy:byte-buddy-agent:1.7.9'
dependency 'net.bytebuddy:byte-buddy:1.7.9'
dependency 'net.bytebuddy:byte-buddy-agent:1.8.3'
dependency 'net.bytebuddy:byte-buddy:1.8.3'
dependency 'net.jcip:jcip-annotations:1.0'
dependency 'net.minidev:accessors-smart:1.2'
dependency 'net.minidev:json-smart:2.3'

47
samples/javaconfig/ldap/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
View File

@ -1,47 +0,0 @@
/*
* Copyright 2002-2013 the original author or authors.
*
* Licensed 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.springframework.security.samples.config;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.web.FilterChainProxy;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
/**
* @author Rob Winch
*
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@WebAppConfiguration
public class SecurityConfigTests {
@Configuration
@ComponentScan(basePackages = "org.springframework.security.samples.config")
public static class Config {
}
@Autowired
private FilterChainProxy springSecurityFilterChain;
@Test
public void securityConfigurationLoads() {
}
}

5
samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle
View File

@ -1,5 +1,3 @@
import org.apache.tools.ant.filters.ReplaceTokens
apply plugin: 'io.spring.convention.spring-sample-war'
def keystore = "$rootDir/samples/certificates/server.jks"
@ -8,6 +6,9 @@ def password = 'password'
dependencies {
compile "org.jasig.cas:cas-server-webapp:4.0.0@war"
compile slf4jDependencies
runtime 'org.aspectj:aspectjrt'
runtime 'org.aspectj:aspectjtools'
runtime 'org.aspectj:aspectjweaver'
}
project.tasks.withType(org.gradle.api.tasks.bundling.War) { war ->