Skip to content
Commits on Source (11)
Show whitespace changes
Inline Side-by-side
build.gradle
View file @ 2f390e38
......@@ -41,7 +41,7 @@ configure(allprojects) { project ->
ext.fileuploadVersion = "1.3.3"
ext.freemarkerVersion = "2.3.23"
ext.groovyVersion = "2.4.15"
ext.gsonVersion = "2.8.2"
ext.gsonVersion = "2.8.5"
ext.guavaVersion = "20.0"
ext.hamcrestVersion = "1.3"
ext.hibernate3Version = "3.6.10.Final"
......@@ -50,9 +50,9 @@ configure(allprojects) { project ->
ext.hibval4Version = "4.3.2.Final"
ext.hibval5Version = "5.2.5.Final"
ext.hsqldbVersion = "2.3.4"
ext.httpasyncVersion = "4.1.3"
ext.httpclientVersion = "4.5.5"
ext.jackson2Version = "2.8.11.2"
ext.httpasyncVersion = "4.1.4"
ext.httpclientVersion = "4.5.6"
ext.jackson2Version = "2.8.11.3"
ext.jasperreportsVersion = "6.2.1" // our tests fail with JR-internal NPEs against 6.2.2 and higher
ext.javamailVersion = "1.5.6"
ext.jettyVersion = "9.3.14.v20161028" // as of 9.3.15, Jetty has hard Servlet 3.1 requirement
......@@ -62,7 +62,7 @@ configure(allprojects) { project ->
ext.jtaVersion = "1.2"
ext.junitVersion = "4.12"
ext.log4jVersion = "1.2.17"
ext.nettyVersion = "4.1.29.Final"
ext.nettyVersion = "4.1.31.Final"
ext.okhttpVersion = "2.7.5"
ext.okhttp3Version = "3.8.1"
ext.openjpaVersion = "2.4.2"
......@@ -71,11 +71,11 @@ configure(allprojects) { project ->
ext.romeVersion = "1.7.4"
ext.slf4jVersion = "1.7.25"
ext.snakeyamlVersion = "1.17"
ext.snifferVersion = "1.16"
ext.snifferVersion = "1.17"
ext.testngVersion = "6.9.10"
ext.tiles2Version = "2.2.2"
ext.tiles3Version = "3.0.7"
ext.tomcatVersion = "8.5.33"
ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.35"
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
ext.undertowVersion = "1.3.33.Final"
ext.xmlunitVersion = "1.6"
......@@ -289,10 +289,9 @@ project("spring-build-src") {
project("spring-core") {
description = "Spring Core"
// As of Spring 4.0.3, spring-core includes asm 5.x and repackages cglib 3.2, inlining
// both into the spring-core jar. cglib 3.2 itself depends on asm 5.x and is therefore
// further transformed by the JarJar task to depend on org.springframework.asm; this
// avoids including two different copies of asm unnecessarily.
// spring-core includes asm and repackages cglib, inlining both into the spring-core jar.
// cglib itself depends on asm and is therefore further transformed by the JarJar task to
// depend on org.springframework.asm; this avoids including two different copies of asm.
def cglibVersion = "3.2.6"
def objenesisVersion = "2.6"
......
debian/changelog
View file @ 2f390e38
libspring-java (4.3.21-1) unstable; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
- Fixes CVE-2018-15756: DoS attack via range requests (Closes: #911786)
* Fixed the compatibility with Java 11 (Closes: #910356)
* Depend on libtomcat9-java instead of libtomcat8-java
* Standards-Version updated to 4.3.0
* Updated the homepage (Closes: #911160)
-- Emmanuel Bourg <ebourg@apache.org> Tue, 01 Jan 2019 11:48:44 +0100
libspring-java (4.3.19-1) unstable; urgency=medium
* Team upload.
......
debian/control
View file @ 2f390e38
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib@debian.org>
Build-Depends: debhelper (>= 11),
default-jdk (>= 1:1.6),
default-jdk (>= 2:1.11),
gradle (>= 1.7),
gradle-debian-helper (>= 1.4.4~)
Build-Depends-Indep: bsh,
......@@ -13,6 +13,7 @@ Build-Depends-Indep: bsh,
groovy,
jruby (>= 1.7.19~),
junit4 (>= 4.5),
libactivation-java,
libapache-poi-java,
libasm-java (>= 5.0),
libaspectj-java,
......@@ -32,6 +33,7 @@ Build-Depends-Indep: bsh,
libeclipselink-java,
libehcache-java,
libfreemarker-java,
libgeronimo-annotation-1.3-spec-java,
libgeronimo-commonj-spec-java (>= 1.1.1-3),
libgeronimo-concurrent-1.0-spec-java,
libgeronimo-ejb-3.2-spec-java,
......@@ -52,6 +54,8 @@ Build-Depends-Indep: bsh,
libjackson2-dataformat-xml-java,
libjamon-java,
libjasperreports-java (>= 6.1.1+dfsg-4~),
libjaxb-api-java,
libjaxws-api-java,
libjdo-api-java (>= 3.1),
libjetty9-extra-java,
libjexcelapi-java,
......@@ -61,6 +65,7 @@ Build-Depends-Indep: bsh,
libjpa-2.1-spec-java,
libjsf-api-java,
libjsonpath-java,
libjws-api-java,
libmail-java,
libnetty-java,
libopenjpa-java,
......@@ -73,7 +78,7 @@ Build-Depends-Indep: bsh,
libservlet3.1-java,
libtaglibs-standard-jstlel-java,
libtiles-java (>= 3.0),
libtomcat8-java,
libtomcat9-java,
libvelocity-tools-java (>= 2.0-3),
libwebjars-locator-java,
libwebjars-locator-core-java,
......@@ -84,10 +89,10 @@ Build-Depends-Indep: bsh,
maven-repo-helper (>= 1.9~),
testng (>= 6.9.12-2~),
velocity
Standards-Version: 4.2.1
Standards-Version: 4.3.0
Vcs-Git: https://salsa.debian.org/java-team/libspring-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libspring-java
Homepage: http://projects.spring.io/spring-framework/
Homepage: http://spring.io/projects/spring-framework
Package: libspring-core-java
Architecture: all
......@@ -149,7 +154,7 @@ Recommends: libasm-java (>= 5.0),
libgeronimo-validation-1.0-spec-java,
libjodatime-java,
libspring-instrument-java (= ${source:Version}),
libtomcat8-java
libtomcat9-java
Suggests: bsh,
groovy,
jruby (>= 1.7.19~)
......
debian/maven.rules
View file @ 2f390e38
......@@ -17,8 +17,8 @@ s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validati
javax.websocket javax.websocket-api * * * *
junit junit * s/.*/4.x/ * *
log4j log4j * s/.*/1.2.x/ * *
org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/8.x/ * *
org.apache.tomcat tomcat-websocket * s/.*/8.x/ * *
org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/9.x/ * *
org.apache.tomcat tomcat-websocket * s/.*/9.x/ * *
org.codehaus.castor s/castor/castor-xml/ * s/.*/debian/ * *
s/org.codehaus.fabric3.api/org.apache.geronimo.specs/ s/commonj/geronimo-commonj_1.1_spec/ * s/.*/debian/ * *
org.eclipse.jetty* * * s/.*/9.x/ * *
......
debian/patches/0003_no_ibm_websphere.diff
View file @ 2f390e38
......@@ -4,7 +4,7 @@ Last-Update: 2010-06-20
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -586,6 +586,15 @@
@@ -585,6 +585,15 @@
testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
}
......
debian/patches/0022-ignore-docbook-reference-plugin.patch
View file @ 2f390e38
......@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1156,7 +1156,6 @@
@@ -1155,7 +1155,6 @@
description = "Spring Framework"
apply plugin: "org.asciidoctor.convert"
......@@ -12,7 +12,7 @@ Forwarded: not-needed
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
@@ -1170,13 +1169,6 @@
@@ -1169,13 +1168,6 @@
attributes 'spring-version': project.version, 'revnumber': project.version, 'docinfo': ""
}
......@@ -26,7 +26,7 @@ Forwarded: not-needed
afterEvaluate {
tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
}
@@ -1250,7 +1242,7 @@
@@ -1249,7 +1241,7 @@
}
}
......@@ -35,7 +35,7 @@ Forwarded: not-needed
group = "Distribution"
baseName = "spring-framework"
classifier = "docs"
@@ -1264,10 +1256,6 @@
@@ -1263,10 +1255,6 @@
from (api) {
into "javadoc-api"
}
......
debian/patches/0028-disable-jdiff-report.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1159,7 +1159,7 @@
@@ -1158,7 +1158,7 @@
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
......
debian/patches/0035-ignore-asciidoctor-plugin.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1155,24 +1155,11 @@
@@ -1154,24 +1154,11 @@
configure(rootProject) {
description = "Spring Framework"
......
debian/patches/0037-ignore-sonar-plugin.patch
View file @ 2f390e38
......@@ -14,7 +14,7 @@ Forwarded: not-needed
ext {
linkHomepage = 'https://projects.spring.io/spring-framework'
linkCi = 'https://build.spring.io/browse/SPR'
@@ -1138,20 +1134,6 @@
@@ -1137,20 +1133,6 @@
}
}
......@@ -35,7 +35,7 @@ Forwarded: not-needed
configure(rootProject) {
description = "Spring Framework"
@@ -1367,21 +1349,6 @@
@@ -1366,21 +1348,6 @@
}
......
debian/patches/0039-openjpa-compatibility.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -766,6 +766,7 @@
@@ -765,6 +765,7 @@
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
}
......
debian/patches/0041-servlet-api-compatibility.patch
View file @ 2f390e38
......@@ -80,7 +80,7 @@ Forwarded: no
}
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -1237,4 +1237,8 @@
@@ -1246,4 +1246,8 @@
return result;
}
......
debian/patches/0042-ignore-money-api.patch
View file @ 2f390e38
......@@ -29,7 +29,7 @@ Forwarded: not-needed
// just handling JSR-310 specific date and time types
--- a/build.gradle
+++ b/build.gradle
@@ -493,6 +493,14 @@
@@ -492,6 +492,14 @@
testCompile("org.apache.commons:commons-pool2:2.4.2")
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
}
......
debian/patches/0043-ignore-okhttp.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -743,6 +743,14 @@
@@ -742,6 +742,14 @@
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
}
......
debian/patches/0044-ignore-httpunit.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1061,6 +1061,15 @@
@@ -1060,6 +1060,15 @@
testRuntime("log4j:log4j:${log4jVersion}")
}
......
debian/patches/0045-ignore-caffeine.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -674,6 +674,14 @@
@@ -673,6 +673,14 @@
testRuntime("org.ehcache:ehcache:${ehcache3Version}")
testRuntime("org.terracotta:management-model:2.3.0")
}
......
debian/patches/0047-ejb-api-compatibility.patch
View file @ 2f390e38
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -476,7 +476,8 @@
@@ -475,7 +475,8 @@
compile(files(project(":spring-core").cglibRepackJar))
optional(project(":spring-instrument"))
optional("javax.inject:javax.inject:1")
......@@ -13,7 +13,7 @@ Forwarded: not-needed
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
optional("javax.money:money-api:1.0.1")
optional("org.eclipse.persistence:javax.persistence:2.0.0")
@@ -584,7 +585,8 @@
@@ -583,7 +584,8 @@
optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
optional("javax.transaction:javax.transaction-api:${jtaVersion}")
optional("javax.resource:connector-api:1.5")
......
debian/patches/0049-java11-compatibility.patch 0 → 100644
View file @ 2f390e38
Description: Fixes the compatibility with Java 11 (CORBA support removed, independent JavaEE APIs)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -347,6 +347,8 @@
compile(files(cglibRepackJar))
compile(files(objenesisRepackJar))
compile("commons-logging:commons-logging:1.2")
+ compile("javax.xml.bind:jaxb-api:debian")
+ compile("javax.activation:javax.activation-api:debian")
optional("commons-codec:commons-codec:1.10")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("net.sf.jopt-simple:jopt-simple:5.0.3")
@@ -487,6 +489,8 @@
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.beanshell:bsh:2.0b5")
optional("org.jruby:jruby:${jrubyVersion}")
+ optional("javax.xml.ws:jaxws-api:debian")
+ optional("org.apache.geronimo.specs:geronimo-annotation_1.3_spec:debian")
testCompile("javax.inject:javax.inject-tck:1")
testCompile("org.javamoney:moneta:1.1")
testCompile("commons-dbcp:commons-dbcp:1.4")
@@ -717,6 +721,7 @@
optional("javax.el:javax.el-api:2.2.5")
optional("javax.faces:javax.faces-api:2.2")
optional("javax.validation:validation-api:1.0.0.GA")
+ optional("javax.jws:javax.jws-api:debian")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("com.caucho:hessian:4.0.38")
optional("commons-fileupload:commons-fileupload:${fileuploadVersion}")
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
@@ -29,10 +29,6 @@
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.omg.CORBA.COMM_FAILURE;
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.NO_RESPONSE;
-import org.omg.CORBA.SystemException;
import org.springframework.remoting.RemoteAccessException;
import org.springframework.remoting.RemoteConnectFailureException;
@@ -184,8 +180,7 @@
* @param ex the RMI exception to check
*/
private static boolean isCorbaConnectFailure(Throwable ex) {
- return ((ex instanceof COMM_FAILURE || ex instanceof NO_RESPONSE) &&
- ((SystemException) ex).completed == CompletionStatus.COMPLETED_NO);
+ return false;
}
}
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
@@ -21,12 +21,9 @@
import java.rmi.RemoteException;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.omg.CORBA.OBJECT_NOT_EXIST;
-import org.omg.CORBA.SystemException;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.InitializingBean;
@@ -229,13 +226,8 @@
try {
Object stub = lookup();
if (getServiceInterface() != null && !(stub instanceof RmiInvocationHandler)) {
- try {
- stub = PortableRemoteObject.narrow(stub, getServiceInterface());
- }
- catch (ClassCastException ex) {
- throw new RemoteLookupFailureException(
- "Could not narrow RMI stub to service interface [" + getServiceInterface().getName() + "]", ex);
- }
+ throw new RemoteLookupFailureException(
+ "Could not narrow RMI stub to service interface [" + getServiceInterface().getName() + "]");
}
return stub;
}
@@ -306,14 +298,6 @@
throw ex;
}
}
- catch (SystemException ex) {
- if (isConnectFailure(ex)) {
- return handleRemoteConnectFailure(invocation, ex);
- }
- else {
- throw ex;
- }
- }
finally {
getJndiTemplate().releaseContext(ctx);
}
@@ -331,17 +315,6 @@
}
/**
- * Determine whether the given CORBA exception indicates a connect failure.
- * <p>The default implementation checks for CORBA's
- * {@link org.omg.CORBA.OBJECT_NOT_EXIST} exception.
- * @param ex the RMI exception to check
- * @return whether the exception should be treated as connect failure
- */
- protected boolean isConnectFailure(SystemException ex) {
- return (ex instanceof OBJECT_NOT_EXIST);
- }
-
- /**
* Refresh the stub and retry the remote invocation if necessary.
* <p>If not configured to refresh on connect failure, this method
* simply rethrows the original exception.
@@ -402,9 +375,6 @@
catch (RemoteException ex) {
throw convertRmiAccessException(ex, invocation.getMethod());
}
- catch (SystemException ex) {
- throw convertCorbaAccessException(ex, invocation.getMethod());
- }
catch (InvocationTargetException ex) {
throw ex.getTargetException();
}
@@ -423,9 +393,6 @@
if (targetEx instanceof RemoteException) {
throw convertRmiAccessException((RemoteException) targetEx, invocation.getMethod());
}
- else if (targetEx instanceof SystemException) {
- throw convertCorbaAccessException((SystemException) targetEx, invocation.getMethod());
- }
else {
throw targetEx;
}
@@ -483,27 +450,4 @@
return RmiClientInterceptorUtils.convertRmiAccessException(method, ex, isConnectFailure(ex), getJndiName());
}
- /**
- * Convert the given CORBA SystemException that happened during remote access
- * to Spring's RemoteAccessException if the method signature does not declare
- * RemoteException. Else, return the SystemException wrapped in a RemoteException.
- * @param method the invoked method
- * @param ex the RemoteException that happened
- * @return the exception to be thrown to the caller
- */
- private Exception convertCorbaAccessException(SystemException ex, Method method) {
- if (ReflectionUtils.declaresException(method, RemoteException.class)) {
- // A traditional RMI service: wrap CORBA exceptions in standard RemoteExceptions.
- return new RemoteException("Failed to access CORBA service [" + getJndiName() + "]", ex);
- }
- else {
- if (isConnectFailure(ex)) {
- return new RemoteConnectFailureException("Could not connect to CORBA service [" + getJndiName() + "]", ex);
- }
- else {
- return new RemoteAccessException("Could not access CORBA service [" + getJndiName() + "]", ex);
- }
- }
- }
-
}
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
@@ -21,7 +21,6 @@
import java.rmi.RemoteException;
import java.util.Properties;
import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
@@ -117,9 +116,9 @@
// Initialize and cache exported object.
this.exportedObject = getObjectToExport();
- PortableRemoteObject.exportObject(this.exportedObject);
+ throw new UnsupportedOperationException("PortableRemoteObject.exportObject()");
- rebind();
+ //rebind();
}
/**
@@ -143,7 +142,7 @@
logger.info("Unbinding RMI service from JNDI location [" + this.jndiName + "]");
}
this.jndiTemplate.unbind(this.jndiName);
- PortableRemoteObject.unexportObject(this.exportedObject);
+ throw new UnsupportedOperationException("PortableRemoteObject.unexportObject()");
}
}
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
@@ -22,7 +22,6 @@
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
import org.aopalliance.intercept.MethodInvocation;
@@ -98,13 +97,7 @@
protected Object lookup() throws NamingException {
Object homeObject = super.lookup();
if (this.homeInterface != null) {
- try {
- homeObject = PortableRemoteObject.narrow(homeObject, this.homeInterface);
- }
- catch (ClassCastException ex) {
- throw new RemoteLookupFailureException(
- "Could not narrow EJB home stub to home interface [" + this.homeInterface.getName() + "]", ex);
- }
+ throw new RemoteLookupFailureException("Could not narrow EJB home stub to home interface [" + this.homeInterface.getName() + "]");
}
return homeObject;
}
debian/patches/series
View file @ 2f390e38
......@@ -17,3 +17,4 @@
0046-jruby-compatibility.patch
0047-ejb-api-compatibility.patch
0048-snakeyaml-compatibility.patch
0049-java11-compatibility.patch
gradle.properties
View file @ 2f390e38
version=4.3.19.RELEASE
version=4.3.21.RELEASE
spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
View file @ 2f390e38
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2018 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.
......@@ -150,7 +150,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
// since those are only meant to apply to beans defined in the original factory.
for (Iterator<BeanPostProcessor> it = internalBeanFactory.getBeanPostProcessors().iterator(); it.hasNext();) {
if (it.next() instanceof AopInfrastructureBean) {
it.remove();
it.remove(); // effectively deprecated: use List.removeIf on Java 8+
}
}
......