diff --git a/spring-context-support-3.2.18.RELEASE.pom b/spring-context-support-3.2.18.RELEASE.pom deleted file mode 100644 index d43cc18f7042ea8735cd69977d519bbec00958bd..0000000000000000000000000000000000000000 --- a/spring-context-support-3.2.18.RELEASE.pom +++ /dev/null @@ -1,137 +0,0 @@ - - - 4.0.0 - org.springframework - spring-context-support - 3.2.18.RELEASE - Spring Context Support - Spring Context Support - https://github.com/SpringSource/spring-framework - - SpringSource - http://springsource.org/spring-framework - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - jhoeller - Juergen Hoeller - jhoeller@gopivotal.com - - - - scm:git:git://github.com/SpringSource/spring-framework - scm:git:git://github.com/SpringSource/spring-framework - https://github.com/SpringSource/spring-framework - - - - com.lowagie - itext - 2.1.7 - compile - true - - - javax.cache - cache-api - 0.5 - compile - true - - - javax.mail - mail - 1.4.7 - compile - true - - - net.sf.ehcache - ehcache-core - 2.0.1 - compile - true - - - net.sf.jasperreports - jasperreports - 3.7.6 - compile - true - - - org.codehaus.fabric3.api - commonj - 1.1.0 - compile - true - - - org.freemarker - freemarker - 2.3.20 - compile - true - - - org.quartz-scheduler - quartz - 1.7.3 - compile - true - - - org.springframework - spring-beans - 3.2.18.RELEASE - compile - - - org.springframework - spring-context - 3.2.18.RELEASE - compile - - - org.springframework - spring-core - 3.2.18.RELEASE - compile - - - org.springframework - spring-jdbc - 3.2.18.RELEASE - compile - true - - - org.springframework - spring-tx - 3.2.18.RELEASE - compile - true - - - velocity - velocity - 1.5 - compile - true - - - javax.activation - activation - 1.1 - provided - - - diff --git a/spring-webmvc-3.2.18.RELEASE.pom b/spring-webmvc-3.2.18.RELEASE.pom deleted file mode 100644 index bc6e52a316b461167c116e9cfbfbab22a45c07f0..0000000000000000000000000000000000000000 --- a/spring-webmvc-3.2.18.RELEASE.pom +++ /dev/null @@ -1,287 +0,0 @@ - - - 4.0.0 - org.springframework - spring-webmvc - 3.2.18.RELEASE - Spring Web MVC - Spring Web MVC - https://github.com/SpringSource/spring-framework - - SpringSource - http://springsource.org/spring-framework - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - jhoeller - Juergen Hoeller - jhoeller@gopivotal.com - - - - scm:git:git://github.com/SpringSource/spring-framework - scm:git:git://github.com/SpringSource/spring-framework - https://github.com/SpringSource/spring-framework - - - - com.fasterxml.jackson.core - jackson-databind - 2.0.6 - compile - true - - - com.lowagie - itext - 2.1.7 - compile - true - - - javax.el - el-api - 1.0 - compile - true - - - javax.servlet.jsp - jsp-api - 2.1 - compile - true - - - javax.servlet - jstl - 1.2 - compile - true - - - net.sf.jasperreports - jasperreports - 3.7.6 - compile - - - xml-apis - xml-apis - - - true - - - net.sourceforge.jexcelapi - jxl - 2.6.12 - compile - true - - - org.apache.poi - poi - 3.6 - compile - true - - - org.apache.tiles - tiles-api - 2.1.2 - compile - true - - - org.apache.tiles - tiles-api - 3.0.4 - compile - true - - - org.apache.tiles - tiles-core - 3.0.4 - compile - - - jcl-over-slf4j - org.slf4j - - - true - - - org.apache.tiles - tiles-core - 2.1.2 - compile - true - - - org.apache.tiles - tiles-el - 3.0.4 - compile - - - jcl-over-slf4j - org.slf4j - - - true - - - org.apache.tiles - tiles-extras - 3.0.4 - compile - - - jcl-over-slf4j - org.slf4j - - - spring-web - org.springframework - - - true - - - org.apache.tiles - tiles-jsp - 2.1.2 - compile - true - - - org.apache.tiles - tiles-jsp - 3.0.4 - compile - - - jcl-over-slf4j - org.slf4j - - - true - - - org.apache.tiles - tiles-servlet - 2.1.2 - compile - true - - - org.apache.tiles - tiles-servlet - 3.0.4 - compile - - - jcl-over-slf4j - org.slf4j - - - true - - - org.codehaus.jackson - jackson-mapper-asl - 1.7.9 - compile - true - - - org.freemarker - freemarker - 2.3.20 - compile - true - - - org.springframework - spring-beans - 3.2.18.RELEASE - compile - - - org.springframework - spring-context - 3.2.18.RELEASE - compile - - - org.springframework - spring-context-support - 3.2.18.RELEASE - compile - true - - - org.springframework - spring-core - 3.2.18.RELEASE - compile - - - org.springframework - spring-expression - 3.2.18.RELEASE - compile - - - org.springframework - spring-oxm - 3.2.18.RELEASE - compile - true - - - org.springframework - spring-web - 3.2.18.RELEASE - compile - - - rome - rome - 1.0 - compile - true - - - velocity-tools - velocity-tools-view - 1.4 - compile - true - - - velocity - velocity - 1.5 - compile - true - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - diff --git a/spring-webmvc-portlet-3.2.18.RELEASE.pom b/spring-webmvc-portlet-3.2.18.RELEASE.pom deleted file mode 100644 index d0a758c91167634218ce4879796c6de0f4a561f4..0000000000000000000000000000000000000000 --- a/spring-webmvc-portlet-3.2.18.RELEASE.pom +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - org.springframework - spring-webmvc-portlet - 3.2.18.RELEASE - Spring Web Portlet - Spring Web Portlet - https://github.com/SpringSource/spring-framework - - SpringSource - http://springsource.org/spring-framework - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - jhoeller - Juergen Hoeller - jhoeller@gopivotal.com - - - - scm:git:git://github.com/SpringSource/spring-framework - scm:git:git://github.com/SpringSource/spring-framework - https://github.com/SpringSource/spring-framework - - - - commons-fileupload - commons-fileupload - 1.3.1 - compile - true - - - org.springframework - spring-beans - 3.2.18.RELEASE - compile - - - org.springframework - spring-context - 3.2.18.RELEASE - compile - - - org.springframework - spring-core - 3.2.18.RELEASE - compile - - - org.springframework - spring-web - 3.2.18.RELEASE - compile - - - org.springframework - spring-webmvc - 3.2.18.RELEASE - compile - - - javax.portlet - portlet-api - 2.0 - provided - - - javax.servlet - servlet-api - 2.5 - provided - - - diff --git a/springframework.spec b/springframework.spec index 6745291c7e6f2e8278b13223dfc3df7f50a42175..d8e0deff3475259410a41064a3be54baffd2ee2c 100644 --- a/springframework.spec +++ b/springframework.spec @@ -1,8 +1,7 @@ Name: springframework Version: 3.2.18 -Release: 5 +Release: 6 Summary: The Spring Java Application Framework -Epoch: 0 License: ASL 2.0 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 @@ -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 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 -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 -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 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 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 Source121: spring-orm-hibernate4-template.pom 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 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.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-fileupload:commons-fileupload) BuildRequires: mvn(commons-httpclient:commons-httpclient) mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) mvn(commons-pool:commons-pool) 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.mail:mail) mvn(javax.portlet:portlet-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.httpcomponents:httpclient) mvn(org.apache.openjpa:openjpa-lib) 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.struts:struts-tiles) mvn(org.apache.tiles:tiles-api) +BuildRequires: 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-jsp) mvn(org.apache.tiles:tiles-servlet) 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.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.6_spec) 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.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(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: jboss-jms-1.1-api jdo2-api jboss-ejb-3.1-api Obsoletes: springframework-instrument-tomcat < %{version}-%{release} BuildArch: noarch %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 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 Summary: Spring Expression Language (SpEL) %description expression @@ -168,12 +158,6 @@ Summary: Spring OXM This package provide marshaling and unmarshalling 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 Summary: Spring test context and MVC framework Provides: springframework-test = %{version}-%{release} @@ -200,19 +184,6 @@ Summary: Spring Web This package provide web application context, multipart 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 %autosetup -n spring-framework-3.2.18.RELEASE -p1 find -name "*.class" -delete @@ -226,16 +197,16 @@ cp %{SOURCE106} spring-instrument/pom.xml cp %{SOURCE107} spring-beans/pom.xml cp %{SOURCE108} spring-orm/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-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 %{SOURCE113} spring-jms/pom.xml cp %{SOURCE114} spring-tx/pom.xml cp %{SOURCE115} spring-web/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 %{SOURCE121} 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_remove_dep :hibernate-core 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_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec 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_remove_dep hsqldb:hsqldb spring-jdbc %pom_add_dep hsqldb:hsqldb:1 spring-jdbc -rm -Rf spring-context-support/src/main/java/org/springframework/cache/jcache/ -%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' +file = 'beans,web' for p in ${file}; do %pom_remove_dep :el-api spring-${p} @@ -297,7 +257,6 @@ done %pom_add_dep org.apache.taglibs:taglibs-standard-jstlel spring-test 'true' %pom_add_dep javax.servlet:jstl spring-web 'true' %pom_remove_dep taglibs:standard spring-web -%pom_add_dep org.apache.taglibs:taglibs-standard-spec spring-webmvc 'true' rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java rm spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java %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.cglib/net.sf.cglib/g" {} + 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-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/* cp -p src/dist/* . mkdir -p spring-context/src/main/resources/org/springframework/remoting/rmi cp -p spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml \ 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 cp -p spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties \ 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 \ -expression instrument jdbc jms orm oxm struts \ -test test-mvc tx web webmvc webmvc-portlet; + +for p in aop beans context core \ +expression instrument jdbc jms orm oxm \ +test test-mvc tx web; do %pom_xpath_inject "pom:project" "bundle" 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-support -f .mfiles-spring-context-support - %files expression -f .mfiles-spring-expression %files instrument -f .mfiles-spring-instrument @@ -416,16 +358,13 @@ done %files oxm -f .mfiles-spring-oxm -%files struts -f .mfiles-spring-struts - %files tx -f .mfiles-spring-tx %files web -f .mfiles-spring-web -%files webmvc -f .mfiles-spring-webmvc - -%files webmvc-portlet -f .mfiles-spring-webmvc-portlet - %changelog +* Mon Oct 26 2020 huanghaitao - 3.2.18-6 +- Disable context-support webmvc module + * Tue Jun 9 2020 yaokai - 3.2.18-5 - package init diff --git a/springframework.yaml b/springframework.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1c5736bb1fe25f0d65d9d3c344b1ab7b30375767 --- /dev/null +++ b/springframework.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: spring-projects/spring-framework +tag_pattern: springframework(.*?)RELEASE +seperator: "."