diff --git a/license.txt b/license.txt
new file mode 100644
index 0000000000..5f7095c742
--- /dev/null
+++ b/license.txt
@@ -0,0 +1,13 @@
+   Copyright 2010-2015 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.
diff --git a/pom.xml b/pom.xml
index baa52ffaf0..b3dfd6adc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2010-2014 the original author or authors.
+  Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java
index 7f3e4814e1..a8248061f7 100644
--- a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java
+++ b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/MyBatisSystemException.java b/src/main/java/org/mybatis/spring/MyBatisSystemException.java
index bf2041beb3..27db8a345c 100644
--- a/src/main/java/org/mybatis/spring/MyBatisSystemException.java
+++ b/src/main/java/org/mybatis/spring/MyBatisSystemException.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
index a800db4228..30dff45c50 100644
--- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
+++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/SqlSessionHolder.java b/src/main/java/org/mybatis/spring/SqlSessionHolder.java
index be884659fd..5af8bc4c07 100644
--- a/src/main/java/org/mybatis/spring/SqlSessionHolder.java
+++ b/src/main/java/org/mybatis/spring/SqlSessionHolder.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java
index 64b66da4e1..dac3da432d 100644
--- a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java
+++ b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/SqlSessionUtils.java b/src/main/java/org/mybatis/spring/SqlSessionUtils.java
index 69cc5a74b8..8e159fc4f4 100644
--- a/src/main/java/org/mybatis/spring/SqlSessionUtils.java
+++ b/src/main/java/org/mybatis/spring/SqlSessionUtils.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
index ba592dc301..a0dfe7577d 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
index e45767447c..b6814799f3 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/annotation/package-info.java b/src/main/java/org/mybatis/spring/annotation/package-info.java
index 94f14f95b8..c1f3722afe 100644
--- a/src/main/java/org/mybatis/spring/annotation/package-info.java
+++ b/src/main/java/org/mybatis/spring/annotation/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains MyBatis annotations
  *
diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java
index 949b7995d2..325902a7cf 100644
--- a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java
+++ b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java b/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java
index a0aaf75e90..62844ccb45 100644
--- a/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java
+++ b/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/batch/package-info.java b/src/main/java/org/mybatis/spring/batch/package-info.java
index 22d4437405..0a60afd4e0 100644
--- a/src/main/java/org/mybatis/spring/batch/package-info.java
+++ b/src/main/java/org/mybatis/spring/batch/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains classes to facilitate the migration in Spring-Batch applications.
  *
diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java
index 28ffd012f2..b26ed20049 100644
--- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java
+++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/config/NamespaceHandler.java b/src/main/java/org/mybatis/spring/config/NamespaceHandler.java
index 952592a3f4..11d07a01db 100644
--- a/src/main/java/org/mybatis/spring/config/NamespaceHandler.java
+++ b/src/main/java/org/mybatis/spring/config/NamespaceHandler.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/config/package-info.java b/src/main/java/org/mybatis/spring/config/package-info.java
index d49818bdf3..46435e50cc 100644
--- a/src/main/java/org/mybatis/spring/config/package-info.java
+++ b/src/main/java/org/mybatis/spring/config/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains the MyBatis namespace schema and element handlers.
  *
diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java
index e5f42bf036..f0ef66b753 100644
--- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java
+++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java
index c16f6453fc..e28df68a5c 100644
--- a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java
+++ b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java
index 4ba996f54c..36f4285d31 100644
--- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java
+++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/mapper/package-info.java b/src/main/java/org/mybatis/spring/mapper/package-info.java
index a617e87c86..b9e7395edc 100644
--- a/src/main/java/org/mybatis/spring/mapper/package-info.java
+++ b/src/main/java/org/mybatis/spring/mapper/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains classes for automatically building MyBatis mapper proxy classes at
  * application startup.
diff --git a/src/main/java/org/mybatis/spring/package-info.java b/src/main/java/org/mybatis/spring/package-info.java
index c0c669662d..01e5db86c3 100644
--- a/src/main/java/org/mybatis/spring/package-info.java
+++ b/src/main/java/org/mybatis/spring/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains core classes to build the MyBatis integration with Spring3.X.
  *
diff --git a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java
index 5e91246031..9f34f99077 100644
--- a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java
+++ b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/support/package-info.java b/src/main/java/org/mybatis/spring/support/package-info.java
index 4fa79560ed..6533c0482d 100644
--- a/src/main/java/org/mybatis/spring/support/package-info.java
+++ b/src/main/java/org/mybatis/spring/support/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains Spring3.X support classes for MyBatis.
  *
diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java
index 50b7927574..85dc9b20ab 100644
--- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java
+++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java
index 42c64aad6a..c909ee7c15 100644
--- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java
+++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/main/java/org/mybatis/spring/transaction/package-info.java b/src/main/java/org/mybatis/spring/transaction/package-info.java
index f6cdacadb0..1db79489a3 100644
--- a/src/main/java/org/mybatis/spring/transaction/package-info.java
+++ b/src/main/java/org/mybatis/spring/transaction/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Contains core classes to manage MyBatis transactions in Spring3.X.
  *
diff --git a/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java b/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java
index a2ffbc8871..b0f9b5a061 100644
--- a/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java
+++ b/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/ExecutorInterceptor.java b/src/test/java/org/mybatis/spring/ExecutorInterceptor.java
index b439d12832..3565e074ff 100644
--- a/src/test/java/org/mybatis/spring/ExecutorInterceptor.java
+++ b/src/test/java/org/mybatis/spring/ExecutorInterceptor.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java
index 690b5934f9..ae00f6d347 100644
--- a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java
+++ b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/PooledMockDataSource.java b/src/test/java/org/mybatis/spring/PooledMockDataSource.java
index 1c64adf6f2..b1dd4fb62e 100644
--- a/src/test/java/org/mybatis/spring/PooledMockDataSource.java
+++ b/src/test/java/org/mybatis/spring/PooledMockDataSource.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java
index 888d971dca..5accf31ad3 100644
--- a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java
+++ b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java
index 9d500f1ae1..6853cb6e8d 100644
--- a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java
+++ b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/TestMapper.java b/src/test/java/org/mybatis/spring/TestMapper.java
index 9fe11553e3..35705a91bc 100644
--- a/src/test/java/org/mybatis/spring/TestMapper.java
+++ b/src/test/java/org/mybatis/spring/TestMapper.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java b/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
index 2a2b7781fa..c2be0ead3d 100644
--- a/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
+++ b/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java
index dad3d21c18..672196a8b0 100644
--- a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java
+++ b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/SqlSessionTemplateAsyncAfterCompletionTest.java b/src/test/java/org/mybatis/spring/asyncsynchronization/SqlSessionTemplateAsyncAfterCompletionTest.java
index ef1de5a6dd..188c7c0d44 100644
--- a/src/test/java/org/mybatis/spring/asyncsynchronization/SqlSessionTemplateAsyncAfterCompletionTest.java
+++ b/src/test/java/org/mybatis/spring/asyncsynchronization/SqlSessionTemplateAsyncAfterCompletionTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java
index c92469e962..d12c63138a 100644
--- a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java
+++ b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2010-2012 the original author or authors..
+/**
+ *    Copyright 2010-2015 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
+ *    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
+ *       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.
+ *    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.mybatis.spring.batch;
 
diff --git a/src/test/java/org/mybatis/spring/batch/domain/Employee.java b/src/test/java/org/mybatis/spring/batch/domain/Employee.java
index 7a9d269cdd..a7f314126f 100644
--- a/src/test/java/org/mybatis/spring/batch/domain/Employee.java
+++ b/src/test/java/org/mybatis/spring/batch/domain/Employee.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2010-2012 the original author or authors..
+/**
+ *    Copyright 2010-2015 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
+ *    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
+ *       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.
+ *    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.mybatis.spring.batch.domain;
 
diff --git a/src/test/java/org/mybatis/spring/config/NamespaceTest.java b/src/test/java/org/mybatis/spring/config/NamespaceTest.java
index 53000ca460..3dd52ae180 100644
--- a/src/test/java/org/mybatis/spring/config/NamespaceTest.java
+++ b/src/test/java/org/mybatis/spring/config/NamespaceTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java
index 984d07ca7c..e0bc223a74 100644
--- a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java
+++ b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperZeroMethods.java b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperZeroMethods.java
index f3c5941670..a5b1cdd779 100644
--- a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperZeroMethods.java
+++ b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperZeroMethods.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperClass.java b/src/test/java/org/mybatis/spring/mapper/MapperClass.java
index 663182bda2..f84579c5c2 100644
--- a/src/test/java/org/mybatis/spring/mapper/MapperClass.java
+++ b/src/test/java/org/mybatis/spring/mapper/MapperClass.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java
index bf5dff26c3..7ba89ff8df 100644
--- a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java
+++ b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java b/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java
index afad0cd6f0..db5a8e9a88 100644
--- a/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java
+++ b/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperInterface.java b/src/test/java/org/mybatis/spring/mapper/MapperInterface.java
index a5b7828013..f9a2695bfb 100644
--- a/src/test/java/org/mybatis/spring/mapper/MapperInterface.java
+++ b/src/test/java/org/mybatis/spring/mapper/MapperInterface.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java
index 3375f5d638..141fe77423 100644
--- a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java
+++ b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/MapperSubinterface.java b/src/test/java/org/mybatis/spring/mapper/MapperSubinterface.java
index 80711891da..316f9e7d6c 100644
--- a/src/test/java/org/mybatis/spring/mapper/MapperSubinterface.java
+++ b/src/test/java/org/mybatis/spring/mapper/MapperSubinterface.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java b/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java
index 85041b65ba..e37b7b1c54 100644
--- a/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java
+++ b/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java b/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java
index db3e3dcc55..b1bb352c7d 100644
--- a/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java
+++ b/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * @version $Id$
  */
diff --git a/src/test/java/org/mybatis/spring/sample/ConfigurationSampleTest.java b/src/test/java/org/mybatis/spring/sample/ConfigurationSampleTest.java
index 962c02d811..f32c6e64f5 100644
--- a/src/test/java/org/mybatis/spring/sample/ConfigurationSampleTest.java
+++ b/src/test/java/org/mybatis/spring/sample/ConfigurationSampleTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * MyBatis @Configuration style sample 
  * 
diff --git a/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java b/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java
index cb68b28a54..8ae6f658bf 100644
--- a/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java
+++ b/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java b/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java
index 5c64263828..02967368cf 100644
--- a/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java
+++ b/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/SampleMapperTest.java b/src/test/java/org/mybatis/spring/sample/SampleMapperTest.java
index 38ecc895c2..9233a7e839 100644
--- a/src/test/java/org/mybatis/spring/sample/SampleMapperTest.java
+++ b/src/test/java/org/mybatis/spring/sample/SampleMapperTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/SampleNamespaceTest.java b/src/test/java/org/mybatis/spring/sample/SampleNamespaceTest.java
index 10c4b2c092..d44adcb2c8 100644
--- a/src/test/java/org/mybatis/spring/sample/SampleNamespaceTest.java
+++ b/src/test/java/org/mybatis/spring/sample/SampleNamespaceTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/SampleScannerTest.java b/src/test/java/org/mybatis/spring/sample/SampleScannerTest.java
index d7ba261630..a0292a4f8e 100644
--- a/src/test/java/org/mybatis/spring/sample/SampleScannerTest.java
+++ b/src/test/java/org/mybatis/spring/sample/SampleScannerTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java
index 56451cdeb2..6290c7a2b9 100644
--- a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java
+++ b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/dao/UserDao.java b/src/test/java/org/mybatis/spring/sample/dao/UserDao.java
index 0420f9a85e..3c4d76efcf 100644
--- a/src/test/java/org/mybatis/spring/sample/dao/UserDao.java
+++ b/src/test/java/org/mybatis/spring/sample/dao/UserDao.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java b/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java
index 910726876b..8ac2b86bdb 100644
--- a/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java
+++ b/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/dao/package-info.java b/src/test/java/org/mybatis/spring/sample/dao/package-info.java
index 2c45bee90a..49f146886c 100644
--- a/src/test/java/org/mybatis/spring/sample/dao/package-info.java
+++ b/src/test/java/org/mybatis/spring/sample/dao/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Package with DAOs/mappers.
  *
diff --git a/src/test/java/org/mybatis/spring/sample/domain/User.java b/src/test/java/org/mybatis/spring/sample/domain/User.java
index 4f3117477f..37b11f78b1 100644
--- a/src/test/java/org/mybatis/spring/sample/domain/User.java
+++ b/src/test/java/org/mybatis/spring/sample/domain/User.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/sample/package-info.java b/src/test/java/org/mybatis/spring/sample/package-info.java
index db462e7c02..628a5d1874 100644
--- a/src/test/java/org/mybatis/spring/sample/package-info.java
+++ b/src/test/java/org/mybatis/spring/sample/package-info.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 /**
  * Sample for four usage scenarios.
  * <ul>
diff --git a/src/test/java/org/mybatis/spring/sample/service/FooService.java b/src/test/java/org/mybatis/spring/sample/service/FooService.java
index daaf364572..90a202c563 100644
--- a/src/test/java/org/mybatis/spring/sample/service/FooService.java
+++ b/src/test/java/org/mybatis/spring/sample/service/FooService.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java b/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java
index 619271e610..d430beaa38 100644
--- a/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java
+++ b/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java b/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java
index 1e6e297a03..7095e5f9eb 100644
--- a/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java
+++ b/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java b/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java
index d6dc065586..bc22e20cc0 100644
--- a/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java
+++ b/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/IBar.java b/src/test/java/org/mybatis/spring/submitted/autowire/IBar.java
index b82ea186dd..01214a1676 100644
--- a/src/test/java/org/mybatis/spring/submitted/autowire/IBar.java
+++ b/src/test/java/org/mybatis/spring/submitted/autowire/IBar.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/IFoo.java b/src/test/java/org/mybatis/spring/submitted/autowire/IFoo.java
index a9fbe45491..cf653f95d2 100644
--- a/src/test/java/org/mybatis/spring/submitted/autowire/IFoo.java
+++ b/src/test/java/org/mybatis/spring/submitted/autowire/IFoo.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/User.java b/src/test/java/org/mybatis/spring/submitted/xa/User.java
index 818cb410a5..4fe1b1c5a7 100644
--- a/src/test/java/org/mybatis/spring/submitted/xa/User.java
+++ b/src/test/java/org/mybatis/spring/submitted/xa/User.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java b/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java
index 84a2e1414b..8a0564f8b9 100644
--- a/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java
+++ b/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserService.java b/src/test/java/org/mybatis/spring/submitted/xa/UserService.java
index ca9ab40bc6..4256f1abd6 100644
--- a/src/test/java/org/mybatis/spring/submitted/xa/UserService.java
+++ b/src/test/java/org/mybatis/spring/submitted/xa/UserService.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java
index e58850b23c..79892d9cb7 100644
--- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java
+++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java
index 6729c37a47..24cc9d0e71 100644
--- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java
+++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2013 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java b/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java
index 01f9c9f402..2364309ce0 100644
--- a/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java
+++ b/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java b/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java
index d5ab38c1bf..ead5ed8e03 100644
--- a/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java
+++ b/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/type/DummyTypeAlias.java b/src/test/java/org/mybatis/spring/type/DummyTypeAlias.java
index 871d7b4131..66a1276dde 100644
--- a/src/test/java/org/mybatis/spring/type/DummyTypeAlias.java
+++ b/src/test/java/org/mybatis/spring/type/DummyTypeAlias.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/type/DummyTypeAlias2.java b/src/test/java/org/mybatis/spring/type/DummyTypeAlias2.java
index 1db3f35a89..ff1ad06db5 100644
--- a/src/test/java/org/mybatis/spring/type/DummyTypeAlias2.java
+++ b/src/test/java/org/mybatis/spring/type/DummyTypeAlias2.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java b/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java
index 13bab84c38..56e7a36d20 100644
--- a/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java
+++ b/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java b/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java
index 8e2381ba85..010fc7ba53 100644
--- a/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java
+++ b/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java
@@ -1,5 +1,5 @@
-/*
- *    Copyright 2010-2012 the original author or authors.
+/**
+ *    Copyright 2010-2015 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.
diff --git a/src/test/java/org/mybatis/spring/type/SuperType.java b/src/test/java/org/mybatis/spring/type/SuperType.java
index 3ac0488492..129b962c71 100644
--- a/src/test/java/org/mybatis/spring/type/SuperType.java
+++ b/src/test/java/org/mybatis/spring/type/SuperType.java
@@ -1,3 +1,18 @@
+/**
+ *    Copyright 2010-2015 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.mybatis.spring.type;
 
 public class SuperType {