This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit 7469bf321fd75aecd24a50c41bbc3f2bdc3795a6 Author: Emmanuel Bourg <[email protected]> Date: Tue May 24 10:32:21 2016 +0200 Updated the Maven poms --- debian/changelog | 1 + debian/poms/spring-aop.pom.xml | 12 ++--- debian/poms/spring-beans.pom.xml | 15 ++++-- debian/poms/spring-context-support.pom.xml | 54 ++++++++++++------- debian/poms/spring-context.pom.xml | 22 ++++---- debian/poms/spring-core.pom.xml | 17 ++++-- debian/poms/spring-expression.pom.xml | 6 +-- debian/poms/spring-instrument.pom.xml | 4 +- debian/poms/spring-jdbc.pom.xml | 22 ++++---- debian/poms/spring-jms.pom.xml | 31 ++++++----- debian/poms/spring-orm.pom.xml | 34 ++++++------ debian/poms/spring-oxm.pom.xml | 10 ++-- debian/poms/spring-test.pom.xml | 43 ++++++++------- debian/poms/spring-tx.pom.xml | 12 ++--- debian/poms/spring-web.pom.xml | 84 ++++++++++++++++++++++-------- debian/poms/spring-webmvc-portlet.pom.xml | 14 ++--- debian/poms/spring-webmvc.pom.xml | 73 ++++++++++++++++++-------- 17 files changed, 279 insertions(+), 175 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8414145..905b372 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libspring-java (4.1.9-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - Refreshed the patches + - Updated the Maven poms -- Emmanuel Bourg <[email protected]> Sun, 03 Apr 2016 01:12:35 +0200 diff --git a/debian/poms/spring-aop.pom.xml b/debian/poms/spring-aop.pom.xml index 81c462e..ced24ee 100644 --- a/debian/poms/spring-aop.pom.xml +++ b/debian/poms/spring-aop.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring AOP</name> <description>Spring AOP</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -45,7 +45,7 @@ <dependency> <groupId>com.jamonapi</groupId> <artifactId>jamon</artifactId> - <version>2.4</version> + <version>2.81</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -59,20 +59,20 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.4</version> + <version>1.8.7</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-beans.pom.xml b/debian/poms/spring-beans.pom.xml index 642eef8..97f8ab8 100644 --- a/debian/poms/spring-beans.pom.xml +++ b/debian/poms/spring-beans.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Beans</name> <description>Spring Beans</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -53,15 +53,22 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>1.8.9</version> + <version>2.3.11</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.16</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> </dependencies> </project> diff --git a/debian/poms/spring-context-support.pom.xml b/debian/poms/spring-context-support.pom.xml index 5f88327..09688bf 100644 --- a/debian/poms/spring-context-support.pom.xml +++ b/debian/poms/spring-context-support.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Context Support</name> <description>Spring Context Support</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -39,7 +39,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>18.0</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -60,27 +60,47 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>javax.mail-api</artifactId> - <version>1.4.7</version> + <version>1.5.2</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>2.6.7</version> + <artifactId>ehcache</artifactId> + <version>2.9.1</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>5.5.1</version> + <version>6.0.4</version> <scope>compile</scope> <exclusions> <exclusion> <artifactId>xml-apis</artifactId> <groupId>xml-apis</groupId> </exclusion> + <exclusion> + <artifactId>jackson-core</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>olap4j</artifactId> + <groupId>org.olap4j</groupId> + </exclusion> + <exclusion> + <artifactId>spring-context</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-annotations</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -101,52 +121,46 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.20</version> + <version>2.3.22</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>1.8.6</version> + <version>2.2.1</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> diff --git a/debian/poms/spring-context.pom.xml b/debian/poms/spring-context.pom.xml index 5a7ec4d..29f8f8c 100644 --- a/debian/poms/spring-context.pom.xml +++ b/debian/poms/spring-context.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Context</name> <description>Spring Context</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -67,14 +67,14 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.3</version> + <version>2.8.2</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.4</version> + <version>1.8.7</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -88,7 +88,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>1.8.9</version> + <version>2.3.11</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -109,38 +109,38 @@ <dependency> <groupId>org.jruby</groupId> <artifactId>jruby</artifactId> - <version>1.7.17</version> + <version>1.7.22</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-instrument</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> diff --git a/debian/poms/spring-core.pom.xml b/debian/poms/spring-core.pom.xml index 4b6f743..9b3e95a 100644 --- a/debian/poms/spring-core.pom.xml +++ b/debian/poms/spring-core.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Core</name> <description>Spring Core</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -37,9 +37,16 @@ </scm> <dependencies> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.10</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.3</version> + <version>1.2</version> <scope>compile</scope> </dependency> <dependency> @@ -52,14 +59,14 @@ <dependency> <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> - <version>4.6</version> + <version>4.9</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.4</version> + <version>1.8.7</version> <scope>compile</scope> <optional>true</optional> </dependency> diff --git a/debian/poms/spring-expression.pom.xml b/debian/poms/spring-expression.pom.xml index 89ee381..03fe336 100644 --- a/debian/poms/spring-expression.pom.xml +++ b/debian/poms/spring-expression.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Expression Language (SpEL)</name> <description>Spring Expression Language (SpEL)</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -39,7 +39,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-instrument.pom.xml b/debian/poms/spring-instrument.pom.xml index 4f642b1..9bdf1a7 100644 --- a/debian/poms/spring-instrument.pom.xml +++ b/debian/poms/spring-instrument.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-instrument</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Instrument</name> <description>Spring Instrument</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> diff --git a/debian/poms/spring-jdbc.pom.xml b/debian/poms/spring-jdbc.pom.xml index 9d1139a..908effc 100644 --- a/debian/poms/spring-jdbc.pom.xml +++ b/debian/poms/spring-jdbc.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring JDBC</name> <description>Spring JDBC</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -39,14 +39,14 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.176</version> + <version>1.4.190</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> - <version>0.9.2.1</version> + <version>0.9.5.1</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -60,47 +60,47 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.10.2.0</version> + <version>10.11.1.1</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbyclient</artifactId> - <version>10.10.2.0</version> + <version>10.11.1.1</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>2.3.2</version> + <version>2.3.3</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-jms.pom.xml b/debian/poms/spring-jms.pom.xml index e844bc7..4e7498e 100644 --- a/debian/poms/spring-jms.pom.xml +++ b/debian/poms/spring-jms.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring JMS</name> <description>Spring JMS</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -46,7 +46,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.3.4</version> + <version>2.4.6</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -65,47 +65,46 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> diff --git a/debian/poms/spring-orm.pom.xml b/debian/poms/spring-orm.pom.xml index cad2727..b1d9364 100644 --- a/debian/poms/spring-orm.pom.xml +++ b/debian/poms/spring-orm.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Object/Relational Mapping</name> <description>Spring Object/Relational Mapping</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -118,7 +118,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.2.16.Final</version> + <version>4.3.11.Final</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -142,6 +142,13 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> + <version>4.3.11.Final</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> <version>3.6.10.Final</version> <scope>compile</scope> <exclusions> @@ -153,54 +160,47 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>4.2.16.Final</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> diff --git a/debian/poms/spring-oxm.pom.xml b/debian/poms/spring-oxm.pom.xml index 03ce865..0b053e9 100644 --- a/debian/poms/spring-oxm.pom.xml +++ b/debian/poms/spring-oxm.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Object/XML Marshalling</name> <description>Spring Object/XML Marshalling</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -86,20 +86,20 @@ <dependency> <groupId>org.jibx</groupId> <artifactId>jibx-run</artifactId> - <version>1.2.5</version> + <version>1.2.6</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-test.pom.xml b/debian/poms/spring-test.pom.xml index 5bec909..64314e0 100644 --- a/debian/poms/spring-test.pom.xml +++ b/debian/poms/spring-test.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring TestContext Framework</name> <description>Spring TestContext Framework</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -39,7 +39,7 @@ <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> - <version>0.9.1</version> + <version>1.2.0</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -88,7 +88,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -108,14 +108,14 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.4</version> + <version>1.8.7</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>javax.persistence</artifactId> - <version>2.0.0</version> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>2.3.11</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -127,64 +127,71 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.skyscreamer</groupId> + <artifactId>jsonassert</artifactId> + <version>1.2.3</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc-portlet</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -198,7 +205,7 @@ <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - <version>1.5</version> + <version>1.6</version> <scope>compile</scope> <optional>true</optional> </dependency> diff --git a/debian/poms/spring-tx.pom.xml b/debian/poms/spring-tx.pom.xml index 21d6913..3e2941e 100644 --- a/debian/poms/spring-tx.pom.xml +++ b/debian/poms/spring-tx.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Transaction</name> <description>Spring Transaction</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -74,27 +74,27 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-web.pom.xml b/debian/poms/spring-web.pom.xml index f7f1d03..555447f 100644 --- a/debian/poms/spring-web.pom.xml +++ b/debian/poms/spring-web.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Web</name> <description>Spring Web</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -46,14 +46,49 @@ <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> - <version>4.0.7</version> + <version>4.0.38</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.3.4</version> + <version>2.4.6</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>2.4.6</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.3.1</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.6.1</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.googlecode.protobuf-java-format</groupId> + <artifactId>protobuf-java-format</artifactId> + <version>1.2</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.rometools</groupId> + <artifactId>rome</artifactId> + <version>1.5.1</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -65,6 +100,13 @@ <optional>true</optional> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>4.0.33.Final</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId> <version>2.2.5</version> @@ -79,6 +121,13 @@ <optional>true</optional> </dependency> <dependency> + <groupId>javax.mail</groupId> + <artifactId>javax.mail-api</artifactId> + <version>1.5.2</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>2.0</version> @@ -114,16 +163,16 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>2.3.11</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.1.5.v20140505</version> + <version>9.2.14.v20151106</version> <scope>compile</scope> <exclusions> <exclusion> @@ -136,7 +185,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>9.1.5.v20140505</version> + <version>9.2.14.v20151106</version> <scope>compile</scope> <exclusions> <exclusion> @@ -149,38 +198,31 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>4.0.9.RELEASE</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>1.0</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> diff --git a/debian/poms/spring-webmvc-portlet.pom.xml b/debian/poms/spring-webmvc-portlet.pom.xml index 2073253..a96c1ff 100644 --- a/debian/poms/spring-webmvc-portlet.pom.xml +++ b/debian/poms/spring-webmvc-portlet.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-webmvc-portlet</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Web Portlet</name> <description>Spring Web Portlet</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -46,31 +46,31 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> diff --git a/debian/poms/spring-webmvc.pom.xml b/debian/poms/spring-webmvc.pom.xml index 0819cb4..4818b51 100644 --- a/debian/poms/spring-webmvc.pom.xml +++ b/debian/poms/spring-webmvc.pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <name>Spring Web MVC</name> <description>Spring Web MVC</description> <url>https://github.com/spring-projects/spring-framework</url> @@ -23,7 +23,7 @@ <developer> <id>jhoeller</id> <name>Juergen Hoeller</name> - <email>[email protected]</email> + <email>[email protected]</email> </developer> </developers> <issueManagement> @@ -39,7 +39,14 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.3.4</version> + <version>2.4.6</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>2.4.6</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -51,6 +58,13 @@ <optional>true</optional> </dependency> <dependency> + <groupId>com.rometools</groupId> + <artifactId>rome</artifactId> + <version>1.5.1</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId> <version>2.2.5</version> @@ -74,13 +88,33 @@ <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>5.5.1</version> + <version>6.0.4</version> <scope>compile</scope> <exclusions> <exclusion> <artifactId>xml-apis</artifactId> <groupId>xml-apis</groupId> </exclusion> + <exclusion> + <artifactId>jackson-core</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>olap4j</artifactId> + <groupId>org.olap4j</groupId> + </exclusion> + <exclusion> + <artifactId>spring-context</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-annotations</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -94,7 +128,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.10.1</version> + <version>3.11</version> <scope>compile</scope> <optional>true</optional> </dependency> @@ -262,69 +296,62 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>2.3.11</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.20</version> + <version>2.3.22</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>4.0.9.RELEASE</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>4.0.9.RELEASE</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>1.0</version> + <version>4.1.9.RELEASE</version> <scope>compile</scope> - <optional>true</optional> </dependency> <dependency> <groupId>velocity-tools</groupId> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
