Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dgray16 2016-05-06 15:32:15 +03:00
commit f0d69af651
2 changed files with 2 additions and 1 deletions

View file

@ -40,6 +40,7 @@ Changes
* Update Commons Lang * Update Commons Lang
* Update Commons Math * Update Commons Math
* Update Commons Collections * Update Commons Collections
* Update Commons Logging
* Update MPXJ * Update MPXJ
* Update Bonecp * Update Bonecp

View file

@ -310,7 +310,7 @@
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.7.4</version> <version>1.8.9</version>
</dependency> </dependency>
<!-- Spring context support --> <!-- Spring context support -->