!3 Disable context-support webmvc module

From: @hht8
Reviewed-by: @rita_dong
Signed-off-by: @rita_dong
This commit is contained in:
openeuler-ci-bot 2020-11-02 20:56:09 +08:00 committed by Gitee
commit 583e83078c
5 changed files with 23 additions and 589 deletions

View File

@ -1,137 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>3.2.18.RELEASE</version>
<name>Spring Context Support</name>
<description>Spring Context Support</description>
<url>https://github.com/SpringSource/spring-framework</url>
<organization>
<name>SpringSource</name>
<url>http://springsource.org/spring-framework</url>
</organization>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>jhoeller</id>
<name>Juergen Hoeller</name>
<email>jhoeller@gopivotal.com</email>
</developer>
</developers>
<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>
</scm>
<dependencies>
<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>0.5</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.7</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<version>2.0.1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>3.7.6</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<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>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>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -1,287 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.2.18.RELEASE</version>
<name>Spring Web MVC</name>
<description>Spring Web MVC</description>
<url>https://github.com/SpringSource/spring-framework</url>
<organization>
<name>SpringSource</name>
<url>http://springsource.org/spring-framework</url>
</organization>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>jhoeller</id>
<name>Juergen Hoeller</name>
<email>jhoeller@gopivotal.com</email>
</developer>
</developers>
<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>
</scm>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.0.6</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.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>3.7.6</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.12</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.6</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
<version>2.1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
<version>3.0.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
<version>3.0.4</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>2.1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-el</artifactId>
<version>3.0.4</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>3.0.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>2.1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>3.0.4</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.1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
<version>3.0.4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.7.9</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.20</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<version>1.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools-view</artifactId>
<version>1.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -1,85 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
<version>3.2.18.RELEASE</version>
<name>Spring Web Portlet</name>
<description>Spring Web Portlet</description>
<url>https://github.com/SpringSource/spring-framework</url>
<organization>
<name>SpringSource</name>
<url>http://springsource.org/spring-framework</url>
</organization>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>jhoeller</id>
<name>Juergen Hoeller</name>
<email>jhoeller@gopivotal.com</email>
</developer>
</developers>
<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>
</scm>
<dependencies>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.2.18.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -1,8 +1,7 @@
Name: springframework Name: springframework
Version: 3.2.18 Version: 3.2.18
Release: 5 Release: 6
Summary: The Spring Java Application Framework Summary: The Spring Java Application Framework
Epoch: 0
License: ASL 2.0 License: ASL 2.0
URL: http://projects.spring.io/spring-framework/ URL: http://projects.spring.io/spring-framework/
Source0: https://github.com/spring-projects/spring-framework/archive/v3.2.18.RELEASE/springframework-3.2.18.RELEASE.tar.gz Source0: https://github.com/spring-projects/spring-framework/archive/v3.2.18.RELEASE/springframework-3.2.18.RELEASE.tar.gz
@ -15,16 +14,12 @@ Source106: https://repo1.maven.org/maven2/org/springframework/spring-i
Source107: https://repo1.maven.org/maven2/org/springframework/spring-beans/3.2.18.RELEASE/spring-beans-3.2.18.RELEASE.pom Source107: https://repo1.maven.org/maven2/org/springframework/spring-beans/3.2.18.RELEASE/spring-beans-3.2.18.RELEASE.pom
Source108: https://repo1.maven.org/maven2/org/springframework/spring-orm/3.2.18.RELEASE/spring-orm-3.2.18.RELEASE.pom Source108: https://repo1.maven.org/maven2/org/springframework/spring-orm/3.2.18.RELEASE/spring-orm-3.2.18.RELEASE.pom
Source109: https://repo1.maven.org/maven2/org/springframework/spring-test/3.2.18.RELEASE/spring-test-3.2.18.RELEASE.pom Source109: https://repo1.maven.org/maven2/org/springframework/spring-test/3.2.18.RELEASE/spring-test-3.2.18.RELEASE.pom
Source110: https://repo1.maven.org/maven2/org/springframework/spring-context-support/3.2.18.RELEASE/spring-context-support-3.2.18.RELEASE.pom
Source111: https://repo1.maven.org/maven2/org/springframework/spring-instrument-tomcat/3.2.18.RELEASE/spring-instrument-tomcat-3.2.18.RELEASE.pom Source111: https://repo1.maven.org/maven2/org/springframework/spring-instrument-tomcat/3.2.18.RELEASE/spring-instrument-tomcat-3.2.18.RELEASE.pom
Source112: https://repo1.maven.org/maven2/org/springframework/spring-jdbc/3.2.18.RELEASE/spring-jdbc-3.2.18.RELEASE.pom Source112: https://repo1.maven.org/maven2/org/springframework/spring-jdbi/3.2.18.RELEASE/spring-jdbc-3.2.18.RELEASE.pom
Source113: https://repo1.maven.org/maven2/org/springframework/spring-jms/3.2.18.RELEASE/spring-jms-3.2.18.RELEASE.pom Source113: https://repo1.maven.org/maven2/org/springframework/spring-jms/3.2.18.RELEASE/spring-jms-3.2.18.RELEASE.pom
Source114: https://repo1.maven.org/maven2/org/springframework/spring-tx/3.2.18.RELEASE/spring-tx-3.2.18.RELEASE.pom Source114: https://repo1.maven.org/maven2/org/springframework/spring-tx/3.2.18.RELEASE/spring-tx-3.2.18.RELEASE.pom
Source115: https://repo1.maven.org/maven2/org/springframework/spring-web/3.2.18.RELEASE/spring-web-3.2.18.RELEASE.pom Source115: https://repo1.maven.org/maven2/org/springframework/spring-web/3.2.18.RELEASE/spring-web-3.2.18.RELEASE.pom
Source116: https://repo1.maven.org/maven2/org/springframework/spring-oxm/3.2.18.RELEASE/spring-oxm-3.2.18.RELEASE.pom Source116: https://repo1.maven.org/maven2/org/springframework/spring-oxm/3.2.18.RELEASE/spring-oxm-3.2.18.RELEASE.pom
Source117: https://repo1.maven.org/maven2/org/springframework/spring-struts/3.2.18.RELEASE/spring-struts-3.2.18.RELEASE.pom
Source118: https://repo1.maven.org/maven2/org/springframework/spring-webmvc/3.2.18.RELEASE/spring-webmvc-3.2.18.RELEASE.pom
Source119: https://repo1.maven.org/maven2/org/springframework/spring-webmvc-portlet/3.2.18.RELEASE/spring-webmvc-portlet-3.2.18.RELEASE.pom
Source120: spring-test-mvc-3.2.18.RELEASE.pom Source120: spring-test-mvc-3.2.18.RELEASE.pom
Source121: spring-orm-hibernate4-template.pom Source121: spring-orm-hibernate4-template.pom
Patch0: springframework-3.2.6-java.io.IOException-is-never-thrown.patch Patch0: springframework-3.2.6-java.io.IOException-is-never-thrown.patch
@ -39,13 +34,13 @@ Patch8: springframework-3.2.14-build-with-tomcat8.patch
Patch9: springframework-3.2.18-hibernate4.3.patch Patch9: springframework-3.2.18-hibernate4.3.patch
BuildRequires: maven-local mvn(aopalliance:aopalliance) mvn(c3p0:c3p0) mvn(com.caucho:hessian) BuildRequires: maven-local mvn(aopalliance:aopalliance) mvn(c3p0:c3p0) mvn(com.caucho:hessian)
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.h2database:h2) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.h2database:h2)
BuildRequires: mvn(com.jamonapi:jamon) mvn(com.lowagie:itext) mvn(com.rometools:rome) BuildRequires: mvn(com.jamonapi:jamon) mvn(com.rometools:rome)
BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(commons-beanutils:commons-beanutils)
BuildRequires: mvn(commons-fileupload:commons-fileupload) BuildRequires: mvn(commons-fileupload:commons-fileupload)
BuildRequires: mvn(commons-httpclient:commons-httpclient) mvn(commons-io:commons-io) BuildRequires: mvn(commons-httpclient:commons-httpclient) mvn(commons-io:commons-io)
BuildRequires: mvn(commons-logging:commons-logging) mvn(commons-pool:commons-pool) BuildRequires: mvn(commons-logging:commons-logging) mvn(commons-pool:commons-pool)
BuildRequires: mvn(com.thoughtworks.xstream:xstream) mvn(hsqldb:hsqldb:1) BuildRequires: mvn(com.thoughtworks.xstream:xstream) mvn(hsqldb:hsqldb:1)
BuildRequires: mvn(jasperreports:jasperreports) mvn(javax.ejb:ejb-api) BuildRequires: mvn(javax.ejb:ejb-api)
BuildRequires: mvn(javax.faces:jsf-api) mvn(javax.inject:javax.inject) mvn(javax.jdo:jdo-api) BuildRequires: mvn(javax.faces:jsf-api) mvn(javax.inject:javax.inject) mvn(javax.jdo:jdo-api)
BuildRequires: mvn(javax.mail:mail) mvn(javax.portlet:portlet-api) BuildRequires: mvn(javax.mail:mail) mvn(javax.portlet:portlet-api)
BuildRequires: mvn(javax.servlet:javax.servlet-api) mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(javax.servlet:javax.servlet-api) mvn(javax.servlet.jsp:jsp-api)
@ -61,8 +56,7 @@ BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
BuildRequires: mvn(org.apache.geronimo.specs:geronimo-validation_1.0_spec) BuildRequires: mvn(org.apache.geronimo.specs:geronimo-validation_1.0_spec)
BuildRequires: mvn(org.apache.httpcomponents:httpclient) mvn(org.apache.openjpa:openjpa-lib) BuildRequires: mvn(org.apache.httpcomponents:httpclient) mvn(org.apache.openjpa:openjpa-lib)
BuildRequires: mvn(org.apache.openjpa:openjpa-persistence) mvn(org.apache.poi:poi) BuildRequires: mvn(org.apache.openjpa:openjpa-persistence) mvn(org.apache.poi:poi)
BuildRequires: mvn(org.apache.struts:struts-core) mvn(org.apache.struts:struts-extras) BuildRequires: mvn(org.apache.tiles:tiles-api)
BuildRequires: mvn(org.apache.struts:struts-tiles) mvn(org.apache.tiles:tiles-api)
BuildRequires: mvn(org.apache.tiles:tiles-core) mvn(org.apache.tiles:tiles-el) BuildRequires: mvn(org.apache.tiles:tiles-core) mvn(org.apache.tiles:tiles-el)
BuildRequires: mvn(org.apache.tiles:tiles-jsp) mvn(org.apache.tiles:tiles-servlet) BuildRequires: mvn(org.apache.tiles:tiles-jsp) mvn(org.apache.tiles:tiles-servlet)
BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) mvn(org.apache.tomcat:tomcat-el-api) BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) mvn(org.apache.tomcat:tomcat-el-api)
@ -81,6 +75,7 @@ BuildRequires: mvn(org.hibernate:hibernate-validator)
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api)
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api) BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api)
BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec) BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec)
BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec)
BuildRequires: mvn(org.jibx:jibx-run) mvn(org.jruby.extras:bytelist) mvn(org.jruby:jruby) BuildRequires: mvn(org.jibx:jibx-run) mvn(org.jruby.extras:bytelist) mvn(org.jruby:jruby)
BuildRequires: mvn(org.ow2.asm:asm) mvn(org.quartz-scheduler:quartz) mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.ow2.asm:asm) mvn(org.quartz-scheduler:quartz) mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.testng:testng) mvn(toplink.essentials:toplink-essentials) BuildRequires: mvn(org.testng:testng) mvn(toplink.essentials:toplink-essentials)
@ -88,6 +83,7 @@ BuildRequires: mvn(velocity-tools:velocity-tools-view) mvn(velocity:veloci
BuildRequires: mvn(xmlunit:xmlunit) mvn(org.apache.taglibs:taglibs-standard-jstlel) BuildRequires: mvn(xmlunit:xmlunit) mvn(org.apache.taglibs:taglibs-standard-jstlel)
BuildRequires: mvn(javax.servlet:jstl) mvn(org.apache.taglibs:taglibs-standard-spec) BuildRequires: mvn(javax.servlet:jstl) mvn(org.apache.taglibs:taglibs-standard-spec)
BuildRequires: mvn(com.jayway.jsonpath:json-path) mvn(net.sf.jopt-simple:jopt-simple) xmvn BuildRequires: mvn(com.jayway.jsonpath:json-path) mvn(net.sf.jopt-simple:jopt-simple) xmvn
BuildRequires: jboss-jms-1.1-api jdo2-api jboss-ejb-3.1-api
Obsoletes: springframework-instrument-tomcat < %{version}-%{release} Obsoletes: springframework-instrument-tomcat < %{version}-%{release}
BuildArch: noarch BuildArch: noarch
%description %description
@ -121,12 +117,6 @@ The package is a complete superset of a bean factory, and
adds enhanced capabilities to it, some of them more J2EE and adds enhanced capabilities to it, some of them more J2EE and
enterprise-centric. enterprise-centric.
%package context-support
Summary: Spring Context Support
%description context-support
This package provide Quartz/CommonJ scheduling,
UI templating, mail and caching.
%package expression %package expression
Summary: Spring Expression Language (SpEL) Summary: Spring Expression Language (SpEL)
%description expression %description expression
@ -168,12 +158,6 @@ Summary: Spring OXM
This package provide marshaling and unmarshalling This package provide marshaling and unmarshalling
for XML with JAXB context and JiBX binding factories. for XML with JAXB context and JiBX binding factories.
%package struts
Summary: Spring Web Struts
%description struts
This package provide integrate a Struts
application with Spring
%package devel %package devel
Summary: Spring test context and MVC framework Summary: Spring test context and MVC framework
Provides: springframework-test = %{version}-%{release} Provides: springframework-test = %{version}-%{release}
@ -200,19 +184,6 @@ Summary: Spring Web
This package provide web application context, multipart This package provide web application context, multipart
resolver, HTTP-based remoting support. resolver, HTTP-based remoting support.
%package webmvc
Summary: Spring Web Servlet
%description webmvc
This package provide framework servlets, web MVC framework,
web controllers, web views for JSP, Velocity, Tiles,
iText and POI.
%package webmvc-portlet
Summary: Spring Web Portlet
%description webmvc-portlet
This package provide support development of Portlet
applications with Spring.
%prep %prep
%autosetup -n spring-framework-3.2.18.RELEASE -p1 %autosetup -n spring-framework-3.2.18.RELEASE -p1
find -name "*.class" -delete find -name "*.class" -delete
@ -226,16 +197,16 @@ cp %{SOURCE106} spring-instrument/pom.xml
cp %{SOURCE107} spring-beans/pom.xml cp %{SOURCE107} spring-beans/pom.xml
cp %{SOURCE108} spring-orm/pom.xml cp %{SOURCE108} spring-orm/pom.xml
cp %{SOURCE109} spring-test/pom.xml cp %{SOURCE109} spring-test/pom.xml
cp %{SOURCE110} spring-context-support/pom.xml
%pom_disable_module spring-instrument-tomcat %pom_disable_module spring-instrument-tomcat
%pom_disable_module spring-context-support
%pom_disable_module spring-webmvc
%pom_disable_module spring-webmvc-portlet
%pom_disable_module spring-struts
cp %{SOURCE112} spring-jdbc/pom.xml cp %{SOURCE112} spring-jdbc/pom.xml
cp %{SOURCE113} spring-jms/pom.xml cp %{SOURCE113} spring-jms/pom.xml
cp %{SOURCE114} spring-tx/pom.xml cp %{SOURCE114} spring-tx/pom.xml
cp %{SOURCE115} spring-web/pom.xml cp %{SOURCE115} spring-web/pom.xml
cp %{SOURCE116} spring-oxm/pom.xml cp %{SOURCE116} spring-oxm/pom.xml
cp %{SOURCE117} spring-struts/pom.xml
cp %{SOURCE118} spring-webmvc/pom.xml
cp %{SOURCE119} spring-webmvc-portlet/pom.xml
cp %{SOURCE120} spring-test-mvc/pom.xml cp %{SOURCE120} spring-test-mvc/pom.xml
cp %{SOURCE121} spring-orm-hibernate4/pom.xml cp %{SOURCE121} spring-orm-hibernate4/pom.xml
sed -i "s|@VERSION@|3.2.18.RELEASE|" spring-orm-hibernate4/pom.xml sed -i "s|@VERSION@|3.2.18.RELEASE|" spring-orm-hibernate4/pom.xml
@ -245,13 +216,6 @@ sed -i "s|@VERSION@|3.2.18.RELEASE|" spring-orm-hibernate4/pom.xml
%pom_add_dep org.hibernate:hibernate-entitymanager:3 spring-orm %pom_add_dep org.hibernate:hibernate-entitymanager:3 spring-orm
%pom_remove_dep :hibernate-core spring-orm %pom_remove_dep :hibernate-core spring-orm
%pom_add_dep org.hibernate:hibernate-core:3 spring-orm %pom_add_dep org.hibernate:hibernate-core:3 spring-orm
%pom_remove_dep struts:struts spring-struts
%pom_add_dep org.apache.struts:struts-core spring-struts
%pom_add_dep org.apache.struts:struts-extras spring-struts
%pom_add_dep org.apache.struts:struts-tiles spring-struts
%pom_remove_dep org.apache.tiles:tiles-extras spring-webmvc
%pom_change_dep :tiles-el ::2.1.2 spring-webmvc
%pom_remove_dep ::3.0.4 spring-webmvc
%pom_remove_dep javax.resource:connector-api spring-tx %pom_remove_dep javax.resource:connector-api spring-tx
%pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec spring-tx %pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec spring-tx
%pom_remove_dep com.ibm.websphere:uow spring-tx %pom_remove_dep com.ibm.websphere:uow spring-tx
@ -269,11 +233,7 @@ rm -rf spring-orm/src/main/java/org/springframework/orm/ibatis/*
%pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec spring-jms %pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec spring-jms
%pom_remove_dep hsqldb:hsqldb spring-jdbc %pom_remove_dep hsqldb:hsqldb spring-jdbc
%pom_add_dep hsqldb:hsqldb:1 spring-jdbc %pom_add_dep hsqldb:hsqldb:1 spring-jdbc
rm -Rf spring-context-support/src/main/java/org/springframework/cache/jcache/ file = 'beans,web'
%pom_remove_dep javax.cache:cache-api spring-context-support
rm -Rf spring-context-support/src/main/java/org/springframework/scheduling/
%pom_remove_dep org.codehaus.fabric3.api:commonj spring-context-support
file = 'beans,web,webmvc'
for p in ${file}; for p in ${file};
do do
%pom_remove_dep :el-api spring-${p} %pom_remove_dep :el-api spring-${p}
@ -297,7 +257,6 @@ done
%pom_add_dep org.apache.taglibs:taglibs-standard-jstlel spring-test '<optional>true</optional>' %pom_add_dep org.apache.taglibs:taglibs-standard-jstlel spring-test '<optional>true</optional>'
%pom_add_dep javax.servlet:jstl spring-web '<optional>true</optional>' %pom_add_dep javax.servlet:jstl spring-web '<optional>true</optional>'
%pom_remove_dep taglibs:standard spring-web %pom_remove_dep taglibs:standard spring-web
%pom_add_dep org.apache.taglibs:taglibs-standard-spec spring-webmvc '<optional>true</optional>'
rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
%pom_remove_dep :backport-util-concurrent spring-context %pom_remove_dep :backport-util-concurrent spring-context
@ -307,36 +266,21 @@ rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils
find ./ -name "*.java" -exec sed -i "s/org.springframework.asm/org.objectweb.asm/g" {} + find ./ -name "*.java" -exec sed -i "s/org.springframework.asm/org.objectweb.asm/g" {} +
find ./ -name "*.java" -exec sed -i "s/org.springframework.cglib/net.sf.cglib/g" {} + find ./ -name "*.java" -exec sed -i "s/org.springframework.cglib/net.sf.cglib/g" {} +
find ./ -name "*.java" -exec sed -i "/edu.emory.mathcs.backport/d" {} + find ./ -name "*.java" -exec sed -i "/edu.emory.mathcs.backport/d" {} +
%pom_change_dep -r :rome com.rometools: spring-test-mvc spring-web spring-webmvc %pom_change_dep -r :rome com.rometools: spring-test-mvc spring-web
find ./spring-test-mvc -name "*.java" -exec sed -i "s/com.sun.syndication/com.rometools.rome/g" {} + find ./spring-test-mvc -name "*.java" -exec sed -i "s/com.sun.syndication/com.rometools.rome/g" {} +
find ./spring-web -name "*.java" -exec sed -i "s/com.sun.syndication/com.rometools.rome/g" {} + find ./spring-web -name "*.java" -exec sed -i "s/com.sun.syndication/com.rometools.rome/g" {} +
find ./spring-webmvc -name "*.java" -exec sed -i "s/com.sun.syndication/com.rometools.rome/g" {} +
rm spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/* rm spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/*
cp -p src/dist/* . cp -p src/dist/* .
mkdir -p spring-context/src/main/resources/org/springframework/remoting/rmi mkdir -p spring-context/src/main/resources/org/springframework/remoting/rmi
cp -p spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml \ cp -p spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml \
spring-context/src/main/resources/org/springframework/remoting/rmi/ spring-context/src/main/resources/org/springframework/remoting/rmi/
mkdir -p spring-context-support/src/main/resources/org/springframework/mail/javamail
cp -p spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types \
spring-context-support/src/main/resources/org/springframework/mail/javamail/
mkdir -p spring-web/src/main/resources/org/springframework/web/context mkdir -p spring-web/src/main/resources/org/springframework/web/context
cp -p spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties \ cp -p spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties \
spring-web/src/main/resources/org/springframework/web/context/ spring-web/src/main/resources/org/springframework/web/context/
mkdir -p spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity
cp -p spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties \
spring-webmvc/src/main/resources/org/springframework/web/servlet/
cp -p spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm \
spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity
mkdir -p spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker
cp -p spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl \
spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/
mkdir -p spring-webmvc-portlet/src/main/resources/org/springframework/web/portlet
cp -p spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties \
spring-webmvc-portlet/src/main/resources/org/springframework/web/portlet/
for p in aop beans context context-support core \ for p in aop beans context core \
expression instrument jdbc jms orm oxm struts \ expression instrument jdbc jms orm oxm \
test test-mvc tx web webmvc webmvc-portlet; test test-mvc tx web;
do do
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>" spring-${p} %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>" spring-${p}
%pom_add_plugin org.apache.felix:maven-bundle-plugin:2.5.4 spring-${p} " %pom_add_plugin org.apache.felix:maven-bundle-plugin:2.5.4 spring-${p} "
@ -399,8 +343,6 @@ done
%files context -f .mfiles-spring-context %files context -f .mfiles-spring-context
%files context-support -f .mfiles-spring-context-support
%files expression -f .mfiles-spring-expression %files expression -f .mfiles-spring-expression
%files instrument -f .mfiles-spring-instrument %files instrument -f .mfiles-spring-instrument
@ -416,16 +358,13 @@ done
%files oxm -f .mfiles-spring-oxm %files oxm -f .mfiles-spring-oxm
%files struts -f .mfiles-spring-struts
%files tx -f .mfiles-spring-tx %files tx -f .mfiles-spring-tx
%files web -f .mfiles-spring-web %files web -f .mfiles-spring-web
%files webmvc -f .mfiles-spring-webmvc
%files webmvc-portlet -f .mfiles-spring-webmvc-portlet
%changelog %changelog
* Mon Oct 26 2020 huanghaitao <huanghaitao8@huawei.com> - 3.2.18-6
- Disable context-support webmvc module
* Tue Jun 9 2020 yaokai <yaoaki13@huawei.com> - 3.2.18-5 * Tue Jun 9 2020 yaokai <yaoaki13@huawei.com> - 3.2.18-5
- package init - package init

4
springframework.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: spring-projects/spring-framework
tag_pattern: springframework(.*?)RELEASE
seperator: "."