Merge branch 'master' into patch-1

Author: iuliana

Contributing.adoc

@@ -12,3 +12,10 @@ Copyright for Apress source code belongs to the author(s). However, under fair u
 * Submit a pull request.
 
 Thank you for your contribution!
+
+== Current list of contributors
+
+The list below contains the list of people that have found errors in the previous edition of the book and submitted them to the author and made sure the second edition was better.
+
+* https://github.com/rafalnowicki116[Rafal Nowicki]
+* https://github.com/Affid[Affid Fedorov]

9781484228074_Errata.pdf Errata.pdf

@@ -144,7 +144,7 @@ ext {
 			castor         : "org.codehaus.castor:castor-xml:$castorVersion",
 			jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
 			poi            : "org.apache.poi:poi:$poiVersion",
-			io             : "commons-io:commons-io:2.5",
+			io             : "commons-io:commons-io:2.7",
 	]
 
 	web = [

build.gradle

@@ -49,7 +49,7 @@ public static void main(String... args) throws Exception {
             (DestructiveBeanWithInterface) ctx.getBean("destructiveBean");
 
         System.out.println("Calling destroy()");
-        ctx.destroy();
+        ctx.close();
         System.out.println("Called destroy()");
     }
 }

chapter04/disposable-bean/src/main/java/com/apress/prospring5/ch4/DestructiveBeanWithInterface.java

@@ -44,7 +44,7 @@ public static void main(String... args) throws Exception {
         DestructiveBean bean = (DestructiveBean) ctx.getBean("destructiveBean");
 
         System.out.println("Calling destroy()");
-        ctx.destroy();
+        ctx.close();
         System.out.println("Called destroy()");
     }
 }

chapter04/initializing-bean-destroy/src/main/java/com/apress/prospring5/ch4/DestructiveBean.java

@@ -49,7 +49,7 @@ public static void main(String... args) throws Exception {
             (DestructiveBeanWithJSR250) ctx.getBean("destructiveBean");
 
         System.out.println("Calling destroy()");
-        ctx.destroy();
+        ctx.close();
         System.out.println("Called destroy()");
     }
 }

chapter04/post-construct-pre-destroy/src/main/java/com/apress/prospring5/ch4/DestructiveBeanWithJSR250.java

@@ -1,7 +1,7 @@
 === How to build
 
 Use Gradle 4.0 to build this project. The gradle-aspectj is compatible only with this version of Gradle and
-an alternative plugin to support compiling of of AspectJ files  (with aj extension" is not available at teh moment.
+an alternative plugin to support compiling of of AspectJ files  (with "aj" extension is not available at the moment).
 
 Since AspectJ files support with Spring will not be in future versions of this book, this module will be removed altogether.
 

chapter05-aspectj-aspects/README.adoc

@@ -1,9 +1,7 @@
 package com.apress.prospring5.ch5;
 
 import com.apress.prospring5.ch2.common.Guitar;
-import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.support.NameMatchMethodPointcut;
 import org.springframework.aop.support.NameMatchMethodPointcutAdvisor;
 
 /**

chapter05/simple-name-matching/src/main/java/com/apress/prospring5/ch5/NamePointcutUsingAdvisor.java

@@ -35,8 +35,7 @@ public void afterThrowing(Exception ex) throws Throwable {
         System.out.println("***\n");
     }
 
-    public void afterThrowing(Method method, Object[] args, Object target,
-            IllegalArgumentException ex) throws Throwable {
+    public void afterThrowing(Method method, Object[] args, Object target, IllegalArgumentException ex) throws Throwable {
         System.out.println("***");
         System.out.println("IllegalArgumentException Capture");
         System.out.println("Caught: " + ex.getClass().getName());

chapter05/simple-throws-advice/src/main/java/com/apress/prospring5/ch5/SimpleThrowsAdvice.java

@@ -13,7 +13,7 @@
         <spring.framework.version>4.0.2.RELEASE</spring.framework.version>
         <spring.batch.version>3.0.1.RELEASE</spring.batch.version>
         <commons.dbcp.version>1.4</commons.dbcp.version>
-        <commons.io.version>2.4</commons.io.version>
+        <commons.io.version>2.7</commons.io.version>
         <log4j.version>1.2.17</log4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hsqldb.version>2.3.1</hsqldb.version>

chapter18/batch-jsr352/pom.xml

@@ -13,7 +13,7 @@
         <spring.framework.version>4.0.2.RELEASE</spring.framework.version>
         <spring.batch.version>3.0.1.RELEASE</spring.batch.version>
         <commons.dbcp.version>1.4</commons.dbcp.version>
-        <commons.io.version>2.4</commons.io.version>
+        <commons.io.version>2.7</commons.io.version>
         <h2.version>1.3.172</h2.version>
         <log4j.version>1.2.17</log4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>