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 38ea06b34375c6f5005d164127b3b09f9358a882 Author: Emmanuel Bourg <[email protected]> Date: Mon Apr 4 22:50:44 2016 +0200 Updated the Maven poms --- debian/changelog | 1 + debian/poms/spring-aop.pom.xml | 34 +++-- debian/poms/spring-aspects.pom.xml | 46 +++--- debian/poms/spring-beans.pom.xml | 34 +++-- debian/poms/spring-context-support.pom.xml | 95 ++++++++---- debian/poms/spring-context.pom.xml | 100 ++++++------ debian/poms/spring-core.pom.xml | 30 ++-- debian/poms/spring-expression.pom.xml | 21 ++- debian/poms/spring-instrument.pom.xml | 18 ++- debian/poms/spring-jdbc.pom.xml | 64 +++++--- debian/poms/spring-jms.pom.xml | 63 +++++--- debian/poms/spring-orm.pom.xml | 150 +++++++++++++----- debian/poms/spring-oxm.pom.xml | 44 +++--- debian/poms/spring-test.pom.xml | 129 +++++++++++----- debian/poms/spring-tx.pom.xml | 53 ++++--- debian/poms/spring-web.pom.xml | 128 ++++++++-------- debian/poms/spring-webmvc-portlet.pom.xml | 40 +++-- debian/poms/spring-webmvc.pom.xml | 236 +++++++++++++++++++++++------ debian/rules | 7 + 19 files changed, 873 insertions(+), 420 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4ad8f5..8f841c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libspring-java (4.0.9-2) UNRELEASED; urgency=medium * Updated the versioned dependencies on libjdo-api-java for libspring-orm-java and on libtiles-java for libspring-web-servlet-java * Removed the unused Maven rule for javax.activation + * Updated the Maven poms -- Emmanuel Bourg <[email protected]> Mon, 04 Apr 2016 19:36:46 +0200 diff --git a/debian/poms/spring-aop.pom.xml b/debian/poms/spring-aop.pom.xml index 111befa..81c462e 100644 --- a/debian/poms/spring-aop.pom.xml +++ b/debian/poms/spring-aop.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring AOP</name> <description>Spring AOP</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,44 +26,54 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> <version>1.0</version> + <scope>compile</scope> </dependency> <dependency> <groupId>com.jamonapi</groupId> <artifactId>jamon</artifactId> - <version>debian</version> + <version>2.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> - <version>debian</version> + <version>1.6</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>debian</version> + <version>1.8.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-aspects.pom.xml b/debian/poms/spring-aspects.pom.xml index f666ba1..62de365 100644 --- a/debian/poms/spring-aspects.pom.xml +++ b/debian/poms/spring-aspects.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-aspects</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Aspects</name> <description>Spring Aspects</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,57 +26,69 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>debian</version> + <version>1.8.4</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>debian</version> + <groupId>org.eclipse.persistence</groupId> + <artifactId>javax.persistence</artifactId> + <version>2.0.0</version> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-beans.pom.xml b/debian/poms/spring-beans.pom.xml index 16ce2b5..642eef8 100644 --- a/debian/poms/spring-beans.pom.xml +++ b/debian/poms/spring-beans.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Beans</name> <description>Spring Beans</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,28 +26,42 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.2</version> + <artifactId>javax.el-api</artifactId> + <version>2.2.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> <version>1</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.8.9</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-context-support.pom.xml b/debian/poms/spring-context-support.pom.xml index 951a2a9..5f88327 100644 --- a/debian/poms/spring-context-support.pom.xml +++ b/debian/poms/spring-context-support.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Context Support</name> <description>Spring Context Support</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,95 +26,128 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> <version>2.1.7</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>1.0.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - <version>debian</version> + <groupId>javax.mail</groupId> + <artifactId>javax.mail-api</artifactId> + <version>1.4.7</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId> - <version>debian</version> + <version>2.6.7</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>debian</version> + <version>5.5.1</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>castor</artifactId> - <groupId>org.codehaus.castor</groupId> - </exclusion> - <exclusion> - <artifactId>jfreechart</artifactId> - <groupId>jfree</groupId> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> </exclusion> </exclusions> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-commonj_1.1_spec</artifactId> - <version>debian</version> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>debian</version> + <groupId>org.codehaus.fabric3.api</groupId> + <artifactId>commonj</artifactId> + <version>1.1.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>debian</version> + <version>2.3.20</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>1.7.3</version> + <version>1.8.6</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>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> </dependencies> diff --git a/debian/poms/spring-context.pom.xml b/debian/poms/spring-context.pom.xml index 503ee11..5a7ec4d 100644 --- a/debian/poms/spring-context.pom.xml +++ b/debian/poms/spring-context.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Context</name> <description>Spring Context</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,116 +26,122 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <version>3.0</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.enterprise.concurrent</groupId> + <artifactId>javax.enterprise.concurrent-api</artifactId> + <version>1.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> <version>1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>debian</version> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>debian</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_1.0_spec</artifactId> - <version>debian</version> + <version>2.3</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>debian</version> + <version>1.8.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.beanshell</groupId> <artifactId>bsh</artifactId> - <version>debian</version> + <version>2.0b4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>1.x</version> + <version>1.8.9</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>javax.persistence</artifactId> + <version>2.0.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>debian</version> + <version>4.3.2.Final</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.jruby</groupId> <artifactId>jruby</artifactId> - <version>debian</version> - <exclusions> - <exclusion> - <artifactId>jnr-netdb</artifactId> - <groupId>org.jruby.extras</groupId> - </exclusion> - <exclusion> - <artifactId>bytelist</artifactId> - <groupId>org.jruby.extras</groupId> - </exclusion> - <exclusion> - <artifactId>joni</artifactId> - <groupId>org.jruby.joni</groupId> - </exclusion> - </exclusions> + <version>1.7.17</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-instrument</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> </dependencies> diff --git a/debian/poms/spring-core.pom.xml b/debian/poms/spring-core.pom.xml index f72c67a..4b6f743 100644 --- a/debian/poms/spring-core.pom.xml +++ b/debian/poms/spring-core.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Core</name> <description>Spring Core</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,33 +26,41 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>debian</version> + <version>1.1.3</version> + <scope>compile</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.x</version> + <version>1.2.17</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> - <version>debian</version> + <version>4.6</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>debian</version> + <version>1.8.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> </dependencies> diff --git a/debian/poms/spring-expression.pom.xml b/debian/poms/spring-expression.pom.xml index b9e0ea9..89ee381 100644 --- a/debian/poms/spring-expression.pom.xml +++ b/debian/poms/spring-expression.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Expression Language (SpEL)</name> <description>Spring Expression Language (SpEL)</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,16 +26,21 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-instrument.pom.xml b/debian/poms/spring-instrument.pom.xml index 1965bf7..4f642b1 100644 --- a/debian/poms/spring-instrument.pom.xml +++ b/debian/poms/spring-instrument.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-instrument</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Instrument</name> <description>Spring Instrument</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,9 +26,13 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> </project> diff --git a/debian/poms/spring-jdbc.pom.xml b/debian/poms/spring-jdbc.pom.xml index 448733d..9d1139a 100644 --- a/debian/poms/spring-jdbc.pom.xml +++ b/debian/poms/spring-jdbc.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring JDBC</name> <description>Spring JDBC</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,62 +26,82 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> - <groupId>c3p0</groupId> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.3.176</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> - <version>debian</version> + <version>0.9.2.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>debian</version> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>1.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>debian</version> + <artifactId>derby</artifactId> + <version>10.10.2.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>debian</version> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>10.10.2.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>debian</version> + <version>2.3.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-jms.pom.xml b/debian/poms/spring-jms.pom.xml index f5cac58..e844bc7 100644 --- a/debian/poms/spring-jms.pom.xml +++ b/debian/poms/spring-jms.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring JMS</name> <description>Spring JMS</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,77 +26,92 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> <version>1.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.x</version> + <version>2.3.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>debian</version> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>debian</version> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>1.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>debian</version> + <version>1.9.13</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.1</version> + <groupId>javax.jms</groupId> + <artifactId>jms-api</artifactId> + <version>1.1-rev-1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-orm.pom.xml b/debian/poms/spring-orm.pom.xml index 1056a00..cad2727 100644 --- a/debian/poms/spring-orm.pom.xml +++ b/debian/poms/spring-orm.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Object/Relational Mapping</name> <description>Spring Object/Relational Mapping</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,108 +26,182 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> <version>1.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.jdo</groupId> - <artifactId>jdo2-api</artifactId> - <version>debian</version> + <artifactId>jdo-api</artifactId> + <version>3.0.1</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>transaction-api</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>debian</version> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <version>2.2.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + <exclusion> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.ibatis</groupId> - <artifactId>ibatis-sqlmap</artifactId> - <version>2.3.4.726</version> + <groupId>org.eclipse.persistence</groupId> + <artifactId>javax.persistence</artifactId> + <version>2.0.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>debian</version> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.core</artifactId> + <version>2.4.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> - <artifactId>eclipselink</artifactId> - <version>debian</version> + <artifactId>org.eclipse.persistence.jpa</artifactId> + <version>2.4.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>javax.persistence</artifactId> + <groupId>org.eclipse.persistence</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>debian</version> + <version>4.2.16.Final</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.6.10.Final</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.6.10.Final</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>debian</version> + <version>4.2.16.Final</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>3.2.12.RELEASE</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>toplink.essentials</groupId> - <artifactId>toplink-essentials</artifactId> - <version>debian</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> </dependencies> diff --git a/debian/poms/spring-oxm.pom.xml b/debian/poms/spring-oxm.pom.xml index 15a9ce9..03ce865 100644 --- a/debian/poms/spring-oxm.pom.xml +++ b/debian/poms/spring-oxm.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Object/XML Marshalling</name> <description>Spring Object/XML Marshalling</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,32 +26,38 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>debian</version> + <version>1.4.7</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>xmlpull</artifactId> - <groupId>xmlpull</groupId> - </exclusion> - <exclusion> <artifactId>xpp3_min</artifactId> <groupId>xpp3</groupId> </exclusion> + <exclusion> + <artifactId>xmlpull</artifactId> + <groupId>xmlpull</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> - <version>debian</version> + <version>2.6.0</version> + <scope>compile</scope> <exclusions> <exclusion> <artifactId>stax-api</artifactId> @@ -63,7 +69,8 @@ <dependency> <groupId>org.codehaus.castor</groupId> <artifactId>castor-xml</artifactId> - <version>debian</version> + <version>1.3.3</version> + <scope>compile</scope> <exclusions> <exclusion> <artifactId>stax-api</artifactId> @@ -79,18 +86,21 @@ <dependency> <groupId>org.jibx</groupId> <artifactId>jibx-run</artifactId> - <version>debian</version> + <version>1.2.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-test.pom.xml b/debian/poms/spring-test.pom.xml index c02353d..5bec909 100644 --- a/debian/poms/spring-test.pom.xml +++ b/debian/poms/spring-test.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring TestContext Framework</name> <description>Spring TestContext Framework</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,123 +26,180 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + <version>0.9.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>debian</version> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + <version>2.2.5</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>2.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>javax.servlet.jsp.jstl-api</artifactId> + <version>1.2.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1</version> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> + <version>2.2.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.x</version> + <version>4.11</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-jstlel</artifactId> + <version>1.2.1</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>taglibs-standard-spec</artifactId> + <groupId>org.apache.taglibs</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>debian</version> + <version>1.8.4</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>javax.persistence</artifactId> + <version>2.0.0</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc-portlet</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.x</version> + <version>6.8.8</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> </dependencies> diff --git a/debian/poms/spring-tx.pom.xml b/debian/poms/spring-tx.pom.xml index f468297..21d6913 100644 --- a/debian/poms/spring-tx.pom.xml +++ b/debian/poms/spring-tx.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Transaction</name> <description>Spring Transaction</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,57 +26,76 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> <version>1.0</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.ibm.websphere</groupId> + <artifactId>uow</artifactId> + <version>6.0.2.17</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <version>3.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>debian</version> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>debian</version> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>1.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/debian/poms/spring-web.pom.xml b/debian/poms/spring-web.pom.xml index 8069c7f..f7f1d03 100644 --- a/debian/poms/spring-web.pom.xml +++ b/debian/poms/spring-web.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Web</name> <description>Spring Web</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,110 +26,109 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> <version>1.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - <version>debian</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-saaj</artifactId> - <version>debian</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> - <version>debian</version> + <version>4.0.7</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.x</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>debian</version> + <version>2.3.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>debian</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.x</version> + <version>1.3.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>debian</version> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + <version>2.2.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> + <groupId>javax.faces</groupId> + <artifactId>javax.faces-api</artifactId> <version>2.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>2.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> + <artifactId>javax.servlet.jsp-api</artifactId> + <version>2.2.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.x</version> + <version>1.2.17</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> + <version>4.0.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>debian</version> + <version>4.3.6</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>debian</version> + <version>1.9.13</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>debian</version> + <version>9.1.5.v20140505</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>javax.servlet</artifactId> - <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet-api</artifactId> + <groupId>javax.servlet</groupId> </exclusion> </exclusions> <optional>true</optional> @@ -137,11 +136,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>debian</version> + <version>9.1.5.v20140505</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>javax.servlet</artifactId> - <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet-api</artifactId> + <groupId>javax.servlet</groupId> </exclusion> </exclusions> <optional>true</optional> @@ -149,45 +149,45 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> - <version>debian</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> + <version>1.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>3.0</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-webmvc-portlet.pom.xml b/debian/poms/spring-webmvc-portlet.pom.xml index 52f2713..2073253 100644 --- a/debian/poms/spring-webmvc-portlet.pom.xml +++ b/debian/poms/spring-webmvc-portlet.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-webmvc-portlet</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Web Portlet</name> <description>Spring Web Portlet</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,42 +26,52 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>debian</version> + <version>1.3.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>javax.portlet</groupId> @@ -71,8 +81,8 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/debian/poms/spring-webmvc.pom.xml b/debian/poms/spring-webmvc.pom.xml index 165c55e..0819cb4 100644 --- a/debian/poms/spring-webmvc.pom.xml +++ b/debian/poms/spring-webmvc.pom.xml @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> <name>Spring Web MVC</name> <description>Spring Web MVC</description> - <url>https://github.com/SpringSource/spring-framework</url> + <url>https://github.com/spring-projects/spring-framework</url> <organization> - <name>SpringSource</name> - <url>http://springsource.org/spring-framework</url> + <name>Spring IO</name> + <url>http://projects.spring.io/spring-framework</url> </organization> <licenses> <license> @@ -26,169 +26,317 @@ <email>[email protected]</email> </developer> </developers> + <issueManagement> + <system>Jira</system> + <url>https://jira.springsource.org/browse/SPR</url> + </issueManagement> <scm> - <connection>scm:git:git://github.com/SpringSource/spring-framework</connection> - <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection> - <url>https://github.com/SpringSource/spring-framework</url> + <connection>scm:git:git://github.com/spring-projects/spring-framework</connection> + <developerConnection>scm:git:git://github.com/spring-projects/spring-framework</developerConnection> + <url>https://github.com/spring-projects/spring-framework</url> </scm> <dependencies> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.x</version> + <version>2.3.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> <version>2.1.7</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + <version>2.2.5</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1</version> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>javax.servlet.jsp.jstl-api</artifactId> + <version>1.2.1</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> + <version>2.2.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>debian</version> + <version>5.5.1</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>castor</artifactId> - <groupId>org.codehaus.castor</groupId> - </exclusion> - <exclusion> <artifactId>xml-apis</artifactId> <groupId>xml-apis</groupId> </exclusion> - <exclusion> - <artifactId>jfreechart</artifactId> - <groupId>jfree</groupId> - </exclusion> </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>net.sourceforge.jexcelapi</groupId> <artifactId>jxl</artifactId> - <version>debian</version> + <version>2.6.12</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>debian</version> + <version>3.10.1</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-api</artifactId> - <version>debian</version> + <version>3.0.5</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-api</artifactId> + <version>2.2.2</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-core</artifactId> - <version>debian</version> + <version>2.2.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-core</artifactId> + <version>3.0.5</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-el</artifactId> + <version>3.0.5</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-el</artifactId> - <version>debian</version> + <version>2.2.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-extras</artifactId> + <version>2.2.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>spring-web</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>velocity-tools</artifactId> + <groupId>org.apache.velocity</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-extras</artifactId> + <version>3.0.5</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>spring-web</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-jsp</artifactId> + <version>3.0.5</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-jsp</artifactId> - <version>debian</version> + <version>2.2.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-servlet</artifactId> + <version>2.2.2</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-servlet</artifactId> - <version>debian</version> + <version>3.0.5</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>debian</version> + <version>1.7</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>debian</version> + <version>1.9.13</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>debian</version> + <version>2.3.20</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>3.2.12.RELEASE</version> + <version>4.0.9.RELEASE</version> + <scope>compile</scope> </dependency> <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> - <version>debian</version> + <version>1.0</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>velocity-tools</groupId> <artifactId>velocity-tools-view</artifactId> - <version>debian</version> + <version>1.4</version> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>3.0</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/debian/rules b/debian/rules index e173808..8a7d7dd 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ JAVA_HOME := /usr/lib/jvm/default-java +VERSION = $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//') MODULES = aop beans context context-support core expression instrument jdbc jms orm oxm test tx web webmvc webmvc-portlet %: @@ -43,3 +44,9 @@ override_dh_auto_install: get-orig-source: uscan --download-current-version --rename --force-download + + +get-orig-pom: + for MYMOD in $(MODULES); do \ + wget https://repo1.maven.org/maven2/org/springframework/spring-$$MYMOD/$(VERSION).RELEASE/spring-$$MYMOD-$(VERSION).RELEASE.pom -O debian/poms/spring-$$MYMOD.pom.xml ; \ + done -- 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
