[gsbase] remove test which require Java awt subsystem
by gil
commit ed023199ab437160ddfab815fa38338096ea5e9e
Author: gil <puntogil(a)libero.it>
Date: Mon Mar 31 09:21:50 2014 +0200
remove test which require Java awt subsystem
gsbase.spec | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gsbase.spec b/gsbase.spec
index e55cf32..dbad90f 100644
--- a/gsbase.spec
+++ b/gsbase.spec
@@ -59,7 +59,9 @@ rm -r src/test/com/gargoylesoftware/base/resource/jdbc/WrapperTestCase.java \
src/test/com/gargoylesoftware/base/resource/jdbc/PreparedStatementWrapperTest.java \
src/test/com/gargoylesoftware/base/resource/jdbc/ResultSetWrapperTest.java \
src/test/com/gargoylesoftware/base/resource/jdbc/StatementWrapperTest.java
-
+# Require Java awt subsystem
+rm -r src/test/com/gargoylesoftware/base/gui/TableLayoutTest.java
+
%build
%mvn_file :%{name} %{name}
10 years, 1 month
[tomcat] Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#107
by Ivan Afonichev
commit 4bbbd3e6c6fd9d8cc7e0168a17a9a0333e337672
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Mar 31 00:10:23 2014 +0400
Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949
tomcat.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 3715583..1c06b1e 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -463,7 +463,7 @@ done
# servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
%{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
-%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp"
+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el"
@@ -680,6 +680,10 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sun Mar 30 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.52-2
+- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949
+- Move log4j support into subpackage, resolves: rhbz#1027716
+
* Wed Mar 26 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.52-1
- Updated to 7.0.52
- Rewrite jsvc implementation, resolves: rhbz#1051743
10 years, 1 month
[tomcat] Revert "Removed log4j sub-package with bundled log4j (replaced by system symlink)"
by Ivan Afonichev
commit e4eaf9df8e62b04dc5ed2a35c49dce4529d1a7f6
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Fri Mar 28 02:46:09 2014 +0400
Revert "Removed log4j sub-package with bundled log4j (replaced by system symlink)"
This reverts commit 5746174c039169deb2a1032b2b03bada4dc77f75.
Conflicts:
tomcat6.spec
tomcat.spec | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 03d6e53..3715583 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -175,6 +175,13 @@ Requires(postun): chkconfig
%description jsp-%{jspspec}-api
Apache Tomcat JSP API implementation classes.
+%package log4j
+Group: Applications/Internet
+Summary: Log4j support for Apache Tomcat
+Requires: log4j
+
+%description log4j
+Log4j support for Apache Tomcat
%package lib
Group: Development/Libraries
@@ -596,6 +603,8 @@ fi
%{homedir}/logs
%{homedir}/conf
+%exclude %{confdir}/log4j.properties
+
%files admin-webapps
%defattr(0664,root,tomcat,0755)
%{appdir}/host-manager
@@ -616,6 +625,11 @@ fi
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
+%files log4j
+%defattr(0664,root,tomcat,0755)
+%config(noreplace) %{confdir}/log4j.properties
+%{libdir}/log4j.jar
+
%files lib
%defattr(-,root,root,-)
%{libdir}
@@ -635,6 +649,7 @@ fi
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
+%exclude %{libdir}/log4j.jar
%files servlet-%{servletspec}-api
%defattr(-,root,root,-)
10 years, 1 month
[classmate] fix test failure on java8
by gil
commit 005141a24db9bfc10534a428961d472436880d9f
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 15:16:48 2014 +0200
fix test failure on java8
classmate.spec | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/classmate.spec b/classmate.spec
index 5f97262..af55c11 100644
--- a/classmate.spec
+++ b/classmate.spec
@@ -42,7 +42,8 @@ sed -i 's/\r//' LICENSE-2.0.txt
# these test fails junit.framework.AssertionFailedError: expected:<X> but was:<Y>
rm -r src/test/java/com/fasterxml/classmate/TestReadme.java \
- src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java
+ src/test/java/com/fasterxml/classmate/types/ResolvedObjectTypeTest.java \
+ src/test/java/com/fasterxml/classmate/AnnotationsTest.java
%build
%mvn_file :%{name} %{name}
10 years, 1 month
[mybatis] fix test failure on java8
by gil
commit 616f4467cf68e3ceec8ec381bd4322bb69f7f0d2
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 14:54:16 2014 +0200
fix test failure on java8
mybatis.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/mybatis.spec b/mybatis.spec
index 8984e6a..7b68485 100644
--- a/mybatis.spec
+++ b/mybatis.spec
@@ -100,6 +100,9 @@ rm -r src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.jav
%endif
sed -i 's/\r//' LICENSE NOTICE
+# Fails on java8
+rm -r src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
+
%build
%mvn_file :%{name} %{name}
10 years, 1 month
[ehcache-core] fix BR list
by gil
commit b2ad0ba08f1acb141a5b6a6f72b52f10660eda08
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 14:35:49 2014 +0200
fix BR list
ehcache-core.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/ehcache-core.spec b/ehcache-core.spec
index 8c0d78f..a926892 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -20,6 +20,7 @@ BuildRequires: hibernate3 >= 3.6.10-7
BuildRequires: ehcache-sizeof-agent
BuildRequires: slf4j
BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: mvn(org.slf4j:slf4j-jdk14)
# test
%if 0
10 years, 1 month