diff --git a/framework/dependencies.yml b/framework/dependencies.yml index 0b12f7cffb..88b2af8aef 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -10,14 +10,14 @@ require: &allDependencies - antlr 2.7.7 - c3p0 0.9.5 - org.ow2.asm -> asm-all 5.0.4 - - cglib -> cglib 3.1 - - com.google.code.gson -> gson 2.3.1 + - cglib -> cglib 3.2.1 + - com.google.code.gson -> gson 2.6.2 - com.jamonapi -> jamon 2.81 - com.ning -> async-http-client 1.9.31 - - commons-beanutils 1.8.3 + - commons-beanutils 1.9.2 - commons-codec 1.10 - - commons-collections 3.2.1 - - commons-email 1.3.3 + - commons-collections 3.2.2 + - commons-email 1.4 - commons-fileupload 1.3.1 - commons-io 2.4 - commons-javaflow 1590792 @@ -30,7 +30,7 @@ require: &allDependencies - javax.inject 1.0 - javax.validation -> validation-api 1.0.0.GA - jaxen 1.1.6 - - joda-time 2.8.2 + - joda-time 2.9.2 - org.hamcrest -> hamcrest-core 1.3 - junit 4.12 - jregex 1.2_01 @@ -38,7 +38,7 @@ require: &allDependencies - net.sf.ehcache -> ehcache-core 2.6.11 - net.sf.ezmorph -> ezmorph 1.0.6 - net.sf.jsr107cache -> jsr107cache 1.0 - - net.sf.oval -> oval 1.84 + - net.sf.oval -> oval 1.85 - mysql -> mysql-connector-java 5.1.35 - oauth.signpost -> signpost-core 1.2.1.2 - org.apache.geronimo.specs -> geronimo-servlet_2.5_spec 1.2 @@ -56,14 +56,14 @@ require: &allDependencies - org.hibernate -> hibernate-c3p0 4.2.19.Final - org.hibernate -> hibernate-ehcache 4.2.19.Final - com.mchange -> mchange-commons-java 0.2.9 - - org.javassist -> javassist 3.19.0-GA + - org.javassist -> javassist 3.20.0-GA - org.jboss.netty -> netty 3.10.4.Final - org.postgresql -> postgresql 9.0 - - org.slf4j -> slf4j-api 1.7.10 - - org.slf4j -> slf4j-log4j12 1.7.10 - - org.yaml -> snakeyaml 1.15 - - spy -> spymemcached 2.11.7 - - com.thoughtworks.xstream -> xstream 1.4.7 + - org.slf4j -> slf4j-api 1.7.16 + - org.slf4j -> slf4j-log4j12 1.7.16 + - org.yaml -> snakeyaml 1.17 + - spy -> spymemcached 2.12.0 + - com.thoughtworks.xstream -> xstream 1.4.8 - xmlpull 1.1.3.1 # Default repositories, used for all projects diff --git a/framework/lib/cglib-3.1.jar b/framework/lib/cglib-3.1.jar deleted file mode 100644 index 25a5df155a..0000000000 Binary files a/framework/lib/cglib-3.1.jar and /dev/null differ diff --git a/framework/lib/cglib-3.2.1.jar b/framework/lib/cglib-3.2.1.jar new file mode 100644 index 0000000000..d66c5d3500 Binary files /dev/null and b/framework/lib/cglib-3.2.1.jar differ diff --git a/framework/lib/commons-beanutils-1.8.3.jar b/framework/lib/commons-beanutils-1.8.3.jar deleted file mode 100644 index 218510bc5d..0000000000 Binary files a/framework/lib/commons-beanutils-1.8.3.jar and /dev/null differ diff --git a/framework/lib/commons-beanutils-1.9.2.jar b/framework/lib/commons-beanutils-1.9.2.jar new file mode 100644 index 0000000000..7d075edf42 Binary files /dev/null and b/framework/lib/commons-beanutils-1.9.2.jar differ diff --git a/framework/lib/commons-collections-3.2.1.jar b/framework/lib/commons-collections-3.2.1.jar deleted file mode 100644 index c35fa1fee1..0000000000 Binary files a/framework/lib/commons-collections-3.2.1.jar and /dev/null differ diff --git a/framework/lib/commons-collections-3.2.2.jar b/framework/lib/commons-collections-3.2.2.jar new file mode 100644 index 0000000000..fa5df82a63 Binary files /dev/null and b/framework/lib/commons-collections-3.2.2.jar differ diff --git a/framework/lib/commons-email-1.3.3.jar b/framework/lib/commons-email-1.3.3.jar deleted file mode 100644 index 0061ed86d3..0000000000 Binary files a/framework/lib/commons-email-1.3.3.jar and /dev/null differ diff --git a/framework/lib/commons-email-1.4.jar b/framework/lib/commons-email-1.4.jar new file mode 100644 index 0000000000..99fd402837 Binary files /dev/null and b/framework/lib/commons-email-1.4.jar differ diff --git a/framework/lib/gson-2.3.1.jar b/framework/lib/gson-2.3.1.jar deleted file mode 100644 index 250132c197..0000000000 Binary files a/framework/lib/gson-2.3.1.jar and /dev/null differ diff --git a/framework/lib/gson-2.6.2.jar b/framework/lib/gson-2.6.2.jar new file mode 100644 index 0000000000..9d78626d85 Binary files /dev/null and b/framework/lib/gson-2.6.2.jar differ diff --git a/framework/lib/javassist-3.19.0-GA.jar b/framework/lib/javassist-3.20.0-GA.jar similarity index 68% rename from framework/lib/javassist-3.19.0-GA.jar rename to framework/lib/javassist-3.20.0-GA.jar index 2a640c4a48..0f1ff725d8 100644 Binary files a/framework/lib/javassist-3.19.0-GA.jar and b/framework/lib/javassist-3.20.0-GA.jar differ diff --git a/framework/lib/joda-time-2.8.2.jar b/framework/lib/joda-time-2.9.2.jar similarity index 66% rename from framework/lib/joda-time-2.8.2.jar rename to framework/lib/joda-time-2.9.2.jar index 05960ff121..ce3b356917 100644 Binary files a/framework/lib/joda-time-2.8.2.jar and b/framework/lib/joda-time-2.9.2.jar differ diff --git a/framework/lib/oval-1.84.jar b/framework/lib/oval-1.84.jar deleted file mode 100644 index ab39854fa4..0000000000 Binary files a/framework/lib/oval-1.84.jar and /dev/null differ diff --git a/framework/lib/oval-1.85.jar b/framework/lib/oval-1.85.jar new file mode 100644 index 0000000000..5864f86b59 Binary files /dev/null and b/framework/lib/oval-1.85.jar differ diff --git a/framework/lib/slf4j-api-1.7.10.jar b/framework/lib/slf4j-api-1.7.10.jar deleted file mode 100644 index 744e9ec5b0..0000000000 Binary files a/framework/lib/slf4j-api-1.7.10.jar and /dev/null differ diff --git a/framework/lib/slf4j-api-1.7.16.jar b/framework/lib/slf4j-api-1.7.16.jar new file mode 100644 index 0000000000..68285952b6 Binary files /dev/null and b/framework/lib/slf4j-api-1.7.16.jar differ diff --git a/framework/lib/slf4j-log4j12-1.7.10.jar b/framework/lib/slf4j-log4j12-1.7.10.jar deleted file mode 100644 index 957b2b158a..0000000000 Binary files a/framework/lib/slf4j-log4j12-1.7.10.jar and /dev/null differ diff --git a/framework/lib/slf4j-log4j12-1.7.16.jar b/framework/lib/slf4j-log4j12-1.7.16.jar new file mode 100644 index 0000000000..a6aef80e9e Binary files /dev/null and b/framework/lib/slf4j-log4j12-1.7.16.jar differ diff --git a/framework/lib/snakeyaml-1.15.jar b/framework/lib/snakeyaml-1.15.jar deleted file mode 100644 index 34084e3325..0000000000 Binary files a/framework/lib/snakeyaml-1.15.jar and /dev/null differ diff --git a/framework/lib/snakeyaml-1.17.jar b/framework/lib/snakeyaml-1.17.jar new file mode 100644 index 0000000000..b0372a3cdd Binary files /dev/null and b/framework/lib/snakeyaml-1.17.jar differ diff --git a/framework/lib/spymemcached-2.11.7.jar b/framework/lib/spymemcached-2.12.0.jar similarity index 60% rename from framework/lib/spymemcached-2.11.7.jar rename to framework/lib/spymemcached-2.12.0.jar index 90ece2af74..f9a0e0d9fd 100644 Binary files a/framework/lib/spymemcached-2.11.7.jar and b/framework/lib/spymemcached-2.12.0.jar differ diff --git a/framework/lib/xstream-1.4.7.jar b/framework/lib/xstream-1.4.7.jar deleted file mode 100644 index ea4b6a2816..0000000000 Binary files a/framework/lib/xstream-1.4.7.jar and /dev/null differ diff --git a/framework/lib/xstream-1.4.8.jar b/framework/lib/xstream-1.4.8.jar new file mode 100644 index 0000000000..a493c3b99d Binary files /dev/null and b/framework/lib/xstream-1.4.8.jar differ