March 2015 - java-sig-commits - Fedora Mailing-Lists

[sslext/f22] use new javapackages macros

by gil

commit d0995e6649243501b293f349272177593d37c3bd Author: gil <puntogil(a)libero.it> Date: Wed Mar 4 18:32:45 2015 +0100 use new javapackages macros sslext.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- diff --git a/sslext.spec b/sslext.spec index aa28a44..c1574de 100644 --- a/sslext.spec +++ b/sslext.spec @@ -37,8 +37,8 @@ BuildRequires: apache-commons-logging BuildRequires: apache-commons-validator BuildRequires: jakarta-oro BuildRequires: struts -BuildRequires: tomcat-jsp-2.3-api -BuildRequires: tomcat-servlet-3.1-api +BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api) +BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) BuildArch: noarch @@ -57,8 +57,8 @@ This package contains javadoc for %{name}. %setup -q mkdir -p web/WEB-INF/classes %patch0 -p0 -sed -i "s|tomcat-servlet-3.0-api|tomcat-servlet-api|" build.xml -sed -i "s|tomcat-jsp-2.2-api|tomcat-jsp-api|" build.xml +#sed -i "s|tomcat-servlet-3.0-api|tomcat-servlet-api|" build.xml +#sed -i "s|tomcat-jsp-2.2-api|tomcat-jsp-api|" build.xml sed -i "s|1.5|1.6|" build.xml %patch1 -p0 cp -p %{SOURCE1} pom.xml @@ -81,7 +81,6 @@ export CLASSPATH=$(build-classpath tomcat-servlet-api tomcat-jsp-api) %changelog * Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 1.2-8 -- use servlet api 3.1 - use new javapackages macros * Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2-7

9 years, 2 months

1
0
0 / 0

[tiles/f22] (2 commits) ...use servlet api 3.1

by gil

Summary of changes: b15825e... use servlet api 3.1 (*) 9ba037c... use servlet api 3.1 (*) (*) This commit already existed in another branch; no separate mail sent

9 years, 2 months

1
0
0 / 0

[tiles] use servlet api 3.1

by gil

commit 9ba037c3910310cb20e5efd9b43c0372fd9019e5 Author: gil <puntogil(a)libero.it> Date: Wed Mar 4 17:42:09 2015 +0100 use servlet api 3.1 tiles.spec | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) --- diff --git a/tiles.spec b/tiles.spec index 12dab2e..c2ed561 100644 --- a/tiles.spec +++ b/tiles.spec @@ -1,15 +1,12 @@ %global master_version 3 Name: tiles Version: 2.2.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java templating framework for web application user interfaces License: ASL 2.0 Url: http://tiles.apache.org/ Source0: http://www.apache.org/dist/%{name}/v%{version}/%{name}-%{version}-src.tar.gz -# wget -O tiles-master-3-pom.xml http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3/pom.xml -Source1: %{name}-master-%{master_version}-pom.xml -# force tomcat 7.x apis use -Source2: %{name}-%{version}-2-depmap + # remove shale-test and maven-taglib-plugin # change # org.codehaus.mojo rat-maven-plugin in org.apache.rat apache-rat-plugin @@ -20,33 +17,32 @@ Patch0: %{name}-%{version}-fix-build.patch Patch1: %{name}-%{version}-commons-ognl.patch # add tiles-master relativePath Patch2: %{name}-%{version}-parent-pom.patch -# build fix fot tomcat 7.x apis -Patch3: %{name}-%{version}-servlet-servlet30.patch -Patch4: %{name}-%{version}-jsp-servlet30.patch - -BuildRequires: apache-commons-digester -BuildRequires: apache-commons-ognl -BuildRequires: freemarker -BuildRequires: mvel -BuildRequires: portlet-2.0-api -BuildRequires: slf4j -BuildRequires: tomcat-lib -BuildRequires: tomcat-el-2.2-api -BuildRequires: tomcat-jsp-2.2-api -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: velocity-tools +# build fix fot tomcat 8.x apis +Patch3: %{name}-%{version}-servlet3.1.patch + +BuildRequires: mvn(commons-digester:commons-digester) +BuildRequires: mvn(javax.portlet:portlet-api) +BuildRequires: mvn(org.apache.commons:commons-ognl) +BuildRequires: mvn(org.apache.tomcat:tomcat-el-api) +BuildRequires: mvn(org.apache.tomcat:tomcat-jasper-el) +BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api) +BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) +BuildRequires: mvn(org.apache.velocity:velocity-tools) +BuildRequires: mvn(org.freemarker:freemarker) +BuildRequires: mvn(org.mvel:mvel2) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-jdk14) +BuildRequires: slf4j +BuildRequires: tomcat-lib # test deps %if 0 BuildRequires: mvn(org.easymock:easymockclassextension) >= 2.4 BuildRequires: mvn(org.apache.shale:shale-test) >= 1.0.5 %endif -BuildRequires: junit +BuildRequires: mvn(junit:junit) BuildRequires: maven-local -BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-bundle BuildRequires: maven-resources-plugin @@ -81,9 +77,8 @@ This package contains javadoc for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p0 +%patch3 -p1 -%patch3 -p0 -%patch4 -p0 # require org.springframework spring-webmvc-portlet 2.5.6 %pom_disable_module tiles-portlet-wildcard src/pom.xml @@ -119,6 +114,7 @@ sed -i "s|<artifactId>servlet-api</artifactId>|<artifactId>tomcat-servlet-api</a src/tiles-el/pom.xml \ src/tiles-servlet-wildcard/pom.xml + %pom_remove_parent src #cp -p %%{SOURCE1} pom.xml @@ -143,7 +139,7 @@ cd src %mvn_file :%{name}-velocity %{name}/velocity # test skip for unavailable deps -%mvn_build -f -- -Dmaven.local.depmap.file="%{SOURCE2}" +%mvn_build -f %install @@ -160,6 +156,9 @@ cd src %license LICENSE.txt NOTICE.txt %changelog +* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 2.2.2-13 +- use servlet 3.1, el 3.0, jsp 2.3 + * Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 2.2.2-12 - introduce license macro

9 years, 2 months

1
0
0 / 0

[tiles] use servlet api 3.1

by gil

commit b15825ee858be3a4ddf3fe9c4f1c9db3815bf97c Author: gil <puntogil(a)libero.it> Date: Wed Mar 4 17:40:15 2015 +0100 use servlet api 3.1 tiles-2.2.2-2-depmap | 47 ----- tiles-2.2.2-jsp-servlet30.patch | 153 ----------------- tiles-2.2.2-servlet-servlet30.patch | 170 ------------------ tiles-2.2.2-servlet3.1.patch | 332 ++++++++++++++++++++++++++++++++++++ 4 files changed, 332 insertions(+), 370 deletions(-) --- diff --git a/tiles-2.2.2-servlet3.1.patch b/tiles-2.2.2-servlet3.1.patch new file mode 100644 index 0000000..3127e82 --- /dev/null +++ b/tiles-2.2.2-servlet3.1.patch @@ -0,0 +1,332 @@ +diff -Nru tiles-2.2.2/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java tiles-2.2.2.servlet/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java +--- tiles-2.2.2/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java 2010-06-17 20:31:46.000000000 +0200 ++++ tiles-2.2.2.servlet/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java 2015-03-04 17:04:09.417787819 +0100 +@@ -22,17 +22,31 @@ + package org.apache.tiles.jsp.taglib.definition; + + import java.io.InputStream; ++import java.lang.Class; ++import java.lang.ClassLoader; ++import java.lang.IllegalArgumentException; ++import java.lang.IllegalStateException; ++import java.lang.UnsupportedOperationException; + import java.net.MalformedURLException; + import java.net.URL; + import java.util.Enumeration; ++import java.util.EventListener; + import java.util.Hashtable; + import java.util.Iterator; ++import java.util.Map; + import java.util.Set; + ++import javax.servlet.Filter; ++import javax.servlet.FilterRegistration; ++import javax.servlet.FilterRegistration.Dynamic; + import javax.servlet.RequestDispatcher; + import javax.servlet.Servlet; + import javax.servlet.ServletContext; + import javax.servlet.ServletException; ++import javax.servlet.ServletRegistration; ++import javax.servlet.SessionCookieConfig; ++import javax.servlet.SessionTrackingMode; ++import javax.servlet.descriptor.JspConfigDescriptor; + + import org.apache.tiles.ArrayStack; + import org.apache.tiles.AttributeContext; +@@ -319,8 +333,8 @@ + * @param name The name of the parameter. + * @param value The value of the parameter. + */ +- public void setInitParameter(String name, String value) { +- initParameters.put(name, value); ++ public boolean setInitParameter(String name, String value) { ++ return true; + } + + /** +@@ -409,6 +423,110 @@ + return second.next(); + } + } ++ ++ public JspConfigDescriptor getJspConfigDescriptor() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public ClassLoader getClassLoader() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public void declareRoles(String... roleNames) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends EventListener> T createListener(java.lang.Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends EventListener> void addListener(T t) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public void addListener(String className) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public void addListener(Class<? extends EventListener> listenerClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public SessionCookieConfig getSessionCookieConfig() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Map<String,? extends FilterRegistration> getFilterRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public FilterRegistration getFilterRegistration(String filterName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends Filter> T createFilter(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public FilterRegistration.Dynamic addFilter(String filterName, String className) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Map<String,? extends ServletRegistration> getServletRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public ServletRegistration getServletRegistration(String servletName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public ServletRegistration.Dynamic addServlet(String servletName, String className) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public int getEffectiveMinorVersion() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public int getEffectiveMajorVersion() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public String getVirtualServerName() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } + } + + } +diff -Nru tiles-2.2.2/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java tiles-2.2.2.servlet/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java +--- tiles-2.2.2/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java 2010-06-17 20:31:44.000000000 +0200 ++++ tiles-2.2.2.servlet/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java 2015-03-04 16:58:47.622896826 +0100 +@@ -21,17 +21,31 @@ + package org.apache.tiles.web.util; + + import java.io.InputStream; ++import java.lang.Class; ++import java.lang.ClassLoader; ++import java.lang.IllegalArgumentException; ++import java.lang.IllegalStateException; ++import java.lang.UnsupportedOperationException; + import java.net.MalformedURLException; + import java.net.URL; + import java.util.Enumeration; ++import java.util.EventListener; + import java.util.Hashtable; ++import java.util.Map; + import java.util.Set; + ++import javax.servlet.Filter; ++import javax.servlet.FilterRegistration; ++import javax.servlet.FilterRegistration.Dynamic; + import javax.servlet.RequestDispatcher; + import javax.servlet.Servlet; + import javax.servlet.ServletConfig; + import javax.servlet.ServletContext; + import javax.servlet.ServletException; ++import javax.servlet.ServletRegistration; ++import javax.servlet.SessionCookieConfig; ++import javax.servlet.SessionTrackingMode; ++import javax.servlet.descriptor.JspConfigDescriptor; + + /** + * Adapts a servlet config and a servlet context to become a unique servlet +@@ -249,4 +263,139 @@ + return second.nextElement(); + } + } ++ ++ public JspConfigDescriptor getJspConfigDescriptor() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public ClassLoader getClassLoader() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public void declareRoles(String... roleNames) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends EventListener> T createListener(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends EventListener> void addListener(T t) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public void addListener(String className) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public void addListener(Class<? extends EventListener> listenerClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public SessionCookieConfig getSessionCookieConfig() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Map<String,? extends FilterRegistration> getFilterRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public FilterRegistration getFilterRegistration(String filterName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends Filter> T createFilter(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public FilterRegistration.Dynamic addFilter(String filterName, String className) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Map<String,? extends ServletRegistration> getServletRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public ServletRegistration getServletRegistration(String servletName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public ServletRegistration.Dynamic addServlet(String servletName, String className) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public boolean setInitParameter(String name, String value) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public int getEffectiveMinorVersion() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public int getEffectiveMajorVersion() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public String getVirtualServerName() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ + }

9 years, 2 months

1
0
0 / 0

[sslext/f22] use servlet api 3.1

by gil

Summary of changes: 25ff008... use servlet api 3.1 (*) (*) This commit already existed in another branch; no separate mail sent

9 years, 2 months

1
0
0 / 0

[jasperreports/f22] use servlet api 3.1

by gil

Summary of changes: db21207... use servlet api 3.1 (*) (*) This commit already existed in another branch; no separate mail sent

9 years, 2 months

1
0
0 / 0

[sslext] use servlet api 3.1

by gil

commit 25ff008c68ad7fec61fe78d6e577b19e99d17a2e Author: gil <puntogil(a)libero.it> Date: Wed Mar 4 15:21:02 2015 +0100 use servlet api 3.1 sslext.spec | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) --- diff --git a/sslext.spec b/sslext.spec index 786eaa1..aa28a44 100644 --- a/sslext.spec +++ b/sslext.spec @@ -26,7 +26,7 @@ Patch2: %{name}-%{version}-pom.patch Patch3: %{name}-%{version}-javadocs.patch BuildRequires: java-devel -BuildRequires: jpackage-utils +BuildRequires: javapackages-local BuildRequires: ant BuildRequires: apache-commons-beanutils @@ -37,16 +37,9 @@ BuildRequires: apache-commons-logging BuildRequires: apache-commons-validator BuildRequires: jakarta-oro BuildRequires: struts -BuildRequires: tomcat-jsp-2.2-api -BuildRequires: tomcat-servlet-3.0-api +BuildRequires: tomcat-jsp-2.3-api +BuildRequires: tomcat-servlet-3.1-api -Requires: apache-commons-digester -Requires: apache-commons-logging -Requires: struts -Requires: tomcat-servlet-3.0-api -Requires: tomcat-jsp-2.2-api - -Requires: jpackage-utils BuildArch: noarch %description @@ -64,6 +57,9 @@ This package contains javadoc for %{name}. %setup -q mkdir -p web/WEB-INF/classes %patch0 -p0 +sed -i "s|tomcat-servlet-3.0-api|tomcat-servlet-api|" build.xml +sed -i "s|tomcat-jsp-2.2-api|tomcat-jsp-api|" build.xml +sed -i "s|1.5|1.6|" build.xml %patch1 -p0 cp -p %{SOURCE1} pom.xml %patch2 -p0 @@ -71,27 +67,23 @@ cp -p %{SOURCE1} pom.xml %build -export CLASSPATH=$(build-classpath tomcat-jsp-2.2-api tomcat-servlet-3.0-api) +export CLASSPATH=$(build-classpath tomcat-servlet-api tomcat-jsp-api) %ant compile make-jar javadoc %install - -mkdir -p %{buildroot}%{_javadir} -install -m 644 web/WEB-INF/lib/%{name}.jar %{buildroot}%{_javadir}/ - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr docs/* %{buildroot}%{_javadocdir}/%{name} +%mvn_artifact pom.xml web/WEB-INF/lib/%{name}.jar +%mvn_file %{name}:%{name} %{name} +%mvn_install -J docs %files -f .mfiles -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 1.2-8 +- use servlet api 3.1 +- use new javapackages macros + * Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

9 years, 2 months

1
0
0 / 0

[javapackages] [test] Test merging sections from parent poms

by Michal Srb

commit 3c20c04d5d2df1452ae6956b5b2b2dde3e40e6ef Author: Michal Srb <msrb(a)redhat.com> Date: Wed Mar 4 14:08:16 2015 +0100 [test] Test merging sections from parent poms .../merge_sections/child/child/pom.xml | 22 ++++++++++++++++ .../data/mvn_artifact/merge_sections/child/pom.xml | 26 ++++++++++++++++++++ test/data/mvn_artifact/merge_sections/pom.xml | 19 ++++++++++++++ .../data/mvn_artifact/test_merge_sections-want.xml | 20 +++++++++++++++ test/mvn_artifact_test.py | 6 ++++ 5 files changed, 93 insertions(+), 0 deletions(-) --- diff --git a/test/data/mvn_artifact/merge_sections/child/child/pom.xml b/test/data/mvn_artifact/merge_sections/child/child/pom.xml new file mode 100644 index 0000000..068ae91 --- /dev/null +++ b/test/data/mvn_artifact/merge_sections/child/child/pom.xml @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>childparent</groupId> + <artifactId>parent</artifactId> + <version>2</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>child</groupId> + <artifactId>child</artifactId> + <version>3</version> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>gdep1</groupId> + <artifactId>adep1</artifactId> + </dependency> + </dependencies> +</project> diff --git a/test/data/mvn_artifact/merge_sections/child/pom.xml b/test/data/mvn_artifact/merge_sections/child/pom.xml new file mode 100644 index 0000000..e036faf --- /dev/null +++ b/test/data/mvn_artifact/merge_sections/child/pom.xml @@ -0,0 +1,26 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>grandparent</groupId> + <artifactId>parent</artifactId> + <version>1</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>childparent</groupId> + <artifactId>parent</artifactId> + <version>2</version> + <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>gdep1</groupId> + <artifactId>adep1</artifactId> + <version>10</version> + <optional>true</optional> + </dependency> + </dependencies> + </dependencyManagement> +</project> diff --git a/test/data/mvn_artifact/merge_sections/pom.xml b/test/data/mvn_artifact/merge_sections/pom.xml new file mode 100644 index 0000000..1f1c9ff --- /dev/null +++ b/test/data/mvn_artifact/merge_sections/pom.xml @@ -0,0 +1,19 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>grandparent</groupId> + <artifactId>parent</artifactId> + <version>1</version> + <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>gdep1</groupId> + <artifactId>adep1</artifactId> + <scope>compile</scope> + <optional>false</optional> + </dependency> + </dependencies> + </dependencyManagement> +</project> diff --git a/test/data/mvn_artifact/test_merge_sections-want.xml b/test/data/mvn_artifact/test_merge_sections-want.xml new file mode 100644 index 0000000..0f15ed1 --- /dev/null +++ b/test/data/mvn_artifact/test_merge_sections-want.xml @@ -0,0 +1,20 @@ +<ns0:metadata xmlns:ns0="http://fedorahosted.org/xmvn/METADATA/2.3.0"> + <ns0:artifacts> + <ns0:artifact> + <ns0:groupId>child</ns0:groupId> + <ns0:artifactId>child</ns0:artifactId> + <ns0:extension>pom</ns0:extension> + <ns0:version>3</ns0:version> + <ns0:path>%s/merge_sections/child/child/pom.xml</ns0:path> + <ns0:dependencies> + <ns0:dependency> + <ns0:groupId>gdep1</ns0:groupId> + <ns0:artifactId>adep1</ns0:artifactId> + <ns0:extension>jar</ns0:extension> + <ns0:optional>true</ns0:optional> + <ns0:requestedVersion>10</ns0:requestedVersion> + </ns0:dependency> + </ns0:dependencies> + </ns0:artifact> + </ns0:artifacts> +</ns0:metadata> diff --git a/test/mvn_artifact_test.py b/test/mvn_artifact_test.py index 7245550..c97f1ef 100644 --- a/test/mvn_artifact_test.py +++ b/test/mvn_artifact_test.py @@ -145,5 +145,11 @@ class TestMvnArtifact(unittest.TestCase): #def test_missing_version(self, stdout, stderr, return_value): # self.assertNotEqual(return_value, 0, stderr) + @mvn_artifact('merge_sections/child/child/pom.xml') + def test_merge_sections(self, stdout, stderr, return_value): + self.assertEqual(return_value, 0, stderr) + report = self.check_result(inspect.currentframe().f_code.co_name) + self.assertEqual(report, '', report) + if __name__ == '__main__': unittest.main()

9 years, 2 months

1
0
0 / 0

[jasperreports] use servlet api 3.1

by gil

commit db2120766ce1499792cc8281ba4d0cb0fe10bd74 Author: gil <puntogil(a)libero.it> Date: Wed Mar 4 13:52:48 2015 +0100 use servlet api 3.1 jasperreports.spec | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) --- diff --git a/jasperreports.spec b/jasperreports.spec index 0fbee12..313bb30 100644 --- a/jasperreports.spec +++ b/jasperreports.spec @@ -3,7 +3,7 @@ Name: jasperreports # xmlbeans >= 2.5.0 # castor-xml modules see also https://bugzilla.redhat.com/show_bug.cgi?id=820676 Version: 4.0.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Report-generating tool License: LGPLv3+ URL: http://jasperforge.org/projects/jasperreports/ @@ -50,25 +50,27 @@ BuildRequires: bsh BuildRequires: dom4j BuildRequires: ecj >= 1:3.4.2-13 BuildRequires: geronimo-saaj -BuildRequires: groovy18 BuildRequires: hibernate3 BuildRequires: hibernate-jpa-2.0-api -%if %{?fedora} > 19 BuildRequires: hsqldb1 +%if %{?fedora} > 20 +BuildRequires: groovy18 +BuildRequires: log4j12 +BuildRequires: objectweb-asm3 %else -BuildRequires: hsqldb +BuildRequires: groovy +BuildRequires: log4j +BuildRequires: objectweb-asm %endif BuildRequires: itext-core BuildRequires: jaxen BuildRequires: jcommon BuildRequires: jexcelapi BuildRequires: jfreechart -BuildRequires: log4j12 -BuildRequires: objectweb-asm3 BuildRequires: rhino BuildRequires: springframework BuildRequires: springframework-beans -BuildRequires: tomcat-servlet-3.0-api +BuildRequires: glassfish-servlet-api BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -83,17 +85,13 @@ Requires: batik Requires: bcel Requires: ecj >= 1:3.4.2-13 Requires: geronimo-saaj -%if %{?fedora} > 19 Requires: hsqldb1 -%else -Requires: hsqldb -%endif Requires: itext-core Requires: jcommon Requires: jfreechart Requires: springframework Requires: springframework-beans -Requires: tomcat-servlet-3.0-api +Requires: glassfish-servlet-api Requires: jpackage-utils BuildArch: noarch @@ -126,7 +124,6 @@ Documentation for %{name}. %setup -q find . -name 'PieChartReport.bak' -delete %patch0 -p0 -sed -i "s|org.objectweb.asm|org.objectweb.distroshaded.asm|" src/net/sf/jasperreports/compilers/JRGroovyCompiler.java %patch1 -p0 %patch2 -p1 %patch3 -p0 @@ -158,7 +155,6 @@ ln -sf $(build-classpath hibernate3/hibernate-core) lib/hibernate3.jar ln -sf $(build-classpath hibernate-jpa-2.0-api) lib/jpa.jar ln -sf $(build-classpath springframework/spring-beans) lib/spring-beans-2.5.5.jar ln -sf $(build-classpath springframework/spring-core) lib/spring-core-2.5.5.jar -ln -sf $(build-classpath groovy18-1.8) lib/groovy-all-1.7.5.jar %if %{?fedora} > 19 ln -sf $(build-classpath hsqldb1-1) lib/hsqldb-1.8.0-10.jar %else @@ -171,14 +167,18 @@ ln -sf $(build-classpath jfreechart/jfreechart) lib/jfreechart-1.0.12.jar ln -sf $(build-classpath jxl) lib/jxl-2.6.10.jar %if %{?fedora} > 21 ln -sf $(build-classpath log4j12-1.2.17) lib/log4j-1.2.15.jar +ln -sf $(build-classpath groovy18-1.8) lib/groovy-all-1.7.5.jar +ln -sf $(build-classpath objectweb-asm3/asm-distroshaded) lib/asm.jar +sed -i "s|org.objectweb.asm|org.objectweb.distroshaded.asm|" src/net/sf/jasperreports/compilers/JRGroovyCompiler.java %else ln -sf $(build-classpath log4j) lib/log4j-1.2.15.jar +ln -sf $(build-classpath groovy) lib/groovy-all-1.7.5.jar +ln -sf $(build-classpath objectweb-asm/asm) lib/asm.jar %endif -ln -sf $(build-classpath objectweb-asm3/asm-distroshaded) lib/asm.jar ln -sf $(build-classpath poi/apache-poi) lib/poi-3.6.jar ln -sf $(build-classpath rhino) lib/rhino-1.7R1.jar ln -sf $(build-classpath geronimo-saaj) lib/saaj-api-1.3.jar -ln -sf $(build-classpath tomcat-servlet-3.0-api) lib/servlet.jar +ln -sf $(build-classpath glassfish-servlet-api) lib/servlet.jar ln -sf $(build-classpath xalan-j2) lib/xalan-2.7.1.jar ln -sf $(build-classpath xalan-j2-serializer) lib/serializer.jar ln -sf $(build-classpath xerces-j2) lib/xercesImpl-2.7.0.jar @@ -196,6 +196,8 @@ rm -rf src/net/sf/jasperreports/data/mondrian/* \ sed -i 's|deprecation="true"|deprecation="false"|' build.xml +sed -i 's|target="1.5" source="1.5"|target="1.6" source="1.6"|' build.xml + %pom_remove_dep net.sf.barcode4j:barcode4j %pom_remove_dep net.sourceforge.barbecue:barbecue %pom_remove_dep mondrian:mondrian @@ -229,6 +231,10 @@ sed -i 's|deprecation="true"|deprecation="false"|' build.xml %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'rhino']/pom:groupId" org.mozilla %pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'js']/pom:artifactId" rhino +# Force usage of servlet 3.1 +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:version" 3.1.0 +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:artifactId" javax.servlet-api + %build # DO NOT USE maven for build @@ -265,6 +271,9 @@ rm -rf dist/docs/api %license license.txt %changelog +* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 4.0.2-12 +- use servlet api 3.1 + * Fri Feb 06 2015 gil cattaneo <puntogil(a)libero.it> 4.0.2-11 - introduce license macro

9 years, 2 months

1
0
0 / 0

[ehcache-core/f22] use servlet api 3.1

by gil

Summary of changes: b6c1ce6... use servlet api 3.1 (*) (*) This commit already existed in another branch; no separate mail sent

9 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits March 2015