Enable tests
- Fix BR
This commit is contained in:
Michal Srb
parent
8672e471dc
commit
dfa866b730
34
0009-Fix-tests.patch
Normal file
34
0009-Fix-tests.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 91349164c1d44eec50ac1b09ef3e2ff41b4aa468 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@redhat.com>
|
||||
Date: Thu, 11 Jul 2013 11:13:45 +0200
|
||||
Subject: [PATCH] Fix tests
|
||||
|
||||
---
|
||||
tests/build.xml | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tests/build.xml b/tests/build.xml
|
||||
index 74a7139..9149da2 100644
|
||||
--- a/tests/build.xml
|
||||
+++ b/tests/build.xml
|
||||
@@ -31,13 +31,13 @@
|
||||
the Maven repository can provide all the dependencies. -->
|
||||
<property name="m2_repo" location="${user.home}/.m2/repository"/>
|
||||
<property name="oro.version" value="2.0.8"/>
|
||||
- <property name="jakarta.oro.jar" location="${m2_repo}/oro/oro/${oro.version}/oro-${oro.version}.jar"/>
|
||||
+ <property name="jakarta.oro.jar" location="lib/jakarta-oro.jar"/>
|
||||
<property name="checkstyle.version" value="4.1"/>
|
||||
<property name="checkstyle.jar" location="${m2_repo}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}.jar"/>
|
||||
- <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4.3/mail-1.4.3.jar"/>
|
||||
- <property name="activation.jar" location="${m2_repo}/javax/activation/activation/1.1/activation-1.1.jar"/>
|
||||
+ <property name="javamail.jar" location="lib/mail.jar"/>
|
||||
+ <property name="activation.jar" location="lib/mail.jar"/>
|
||||
<property name="junit.version" value="3.8.1"/>
|
||||
- <property name="junit.jar" location="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
|
||||
+ <property name="junit.jar" location="lib/junit.jar"/>
|
||||
|
||||
|
||||
<!-- Read the system environment variables and stores them in properties, -->
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 31d2056b3f625115ad0f26c7e11ab6273cd4c285 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Mon, 17 May 2010 15:34:19 +0200
|
||||
Subject: [PATCH 09/10] Remove ant run of tests
|
||||
|
||||
---
|
||||
pom.xml | 16 ----------------
|
||||
1 files changed, 0 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 6d00cf6..406fa43 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -220,22 +220,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
- <execution>
|
||||
- <phase>test</phase>
|
||||
- <id>runAll</id>
|
||||
- <configuration>
|
||||
- <tasks>
|
||||
- <ant dir="tests" target="runAll">
|
||||
- <property name="m2_repo" location="${m2_repo}" />
|
||||
- <property name="log4j.jar" location="target/classes" />
|
||||
- <property name="project.lib.home" location="target" />
|
||||
- </ant>
|
||||
- </tasks>
|
||||
- </configuration>
|
||||
- <goals>
|
||||
- <goal>run</goal>
|
||||
- </goals>
|
||||
- </execution>
|
||||
<!-- release builds will put SVN tags into the SCM page, this changes it back to trunk -->
|
||||
<execution>
|
||||
<phase>site</phase>
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
48
log4j.spec
48
log4j.spec
@ -3,12 +3,11 @@
|
||||
|
||||
Name: log4j
|
||||
Version: 1.2.17
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Java logging package
|
||||
BuildArch: noarch
|
||||
License: ASL 2.0
|
||||
Group: Development/Libraries
|
||||
URL: http://logging.apache.org/%{name}
|
||||
Source0: http://www.apache.org/dist/logging/%{name}/%{version}/%{name}-%{version}.tar.gz
|
||||
# Converted from src/java/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif
|
||||
@ -24,33 +23,20 @@ Source114: %{name}-chainsaw.1
|
||||
Source200: %{name}.catalog
|
||||
Patch0: 0001-logfactor5-changed-userdir.patch
|
||||
Patch1: 0006-Remove-mvn-clirr-plugin.patch
|
||||
Patch2: 0009-Remove-ant-run-of-tests.patch
|
||||
Patch2: 0009-Fix-tests.patch
|
||||
Patch3: 0010-Fix-javadoc-link.patch
|
||||
Patch4: 0011-Remove-openejb.patch
|
||||
Patch5: 0012-Add-proper-bundle-symbolicname.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: %{__perl}
|
||||
BuildRequires: java >= 1:1.6.0
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
BuildRequires: javamail
|
||||
BuildRequires: geronimo-jms
|
||||
BuildRequires: geronimo-parent-poms
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: jpackage-utils >= 0:1.7.2
|
||||
BuildRequires: maven-plugin-bundle
|
||||
BuildRequires: maven-surefire-plugin
|
||||
BuildRequires: maven-surefire-provider-junit
|
||||
BuildRequires: maven-antrun-plugin
|
||||
BuildRequires: maven-assembly-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: javamail
|
||||
BuildRequires: junit
|
||||
BuildRequires: geronimo-jms
|
||||
BuildRequires: jakarta-oro
|
||||
BuildRequires: ant-contrib
|
||||
|
||||
BuildRequires: ant-junit
|
||||
|
||||
%description
|
||||
Log4j is a tool to help the programmer output log statements to a
|
||||
@ -58,7 +44,6 @@ variety of output targets.
|
||||
|
||||
%package manual
|
||||
Summary: Developer manual for %{name}
|
||||
Group: Documentation
|
||||
Requires: %{name}-javadoc = %{version}-%{release}
|
||||
|
||||
%description manual
|
||||
@ -66,7 +51,6 @@ Requires: %{name}-javadoc = %{version}-%{release}
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
Group: Documentation
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
@ -76,7 +60,7 @@ Group: Documentation
|
||||
# see patch files themselves for reasons for applying
|
||||
%patch0 -p1 -b .logfactor-home
|
||||
%patch1 -p1 -b .remove-mvn-clirr
|
||||
%patch2 -p1 -b .remove-tests
|
||||
%patch2 -p1 -b .fix-tests
|
||||
%patch3 -p1 -b .xlink-javadoc
|
||||
%patch4 -p1 -b .openejb
|
||||
%patch5 -p1 -b .bundlename
|
||||
@ -97,10 +81,18 @@ done
|
||||
find -name "*.jar" -o -name "*.class" -delete
|
||||
rm -rf docs/api
|
||||
|
||||
# Needed by tests
|
||||
mkdir -p tests/lib/
|
||||
(cd tests/lib/
|
||||
ln -s `build-classpath jakarta-oro`
|
||||
ln -s `build-classpath javamail/mail`
|
||||
ln -s `build-classpath junit`
|
||||
)
|
||||
|
||||
|
||||
%build
|
||||
%mvn_file : %{name}
|
||||
%mvn_build -f
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
@ -191,6 +183,10 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 11 2013 Michal Srb <msrb@redhat.com> - 0:1.2.17-13
|
||||
- Enable tests
|
||||
- Fix BR
|
||||
|
||||
* Tue May 14 2013 Ville Skyttä <ville.skytta@iki.fi> - 0:1.2.17-12
|
||||
- Add DTD public id to XML and SGML catalogs.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user