[apache-commons-validator] Fix tests after junit update
by Stanislav Ochotnicky
commit f2edda70cb2d778f3a658a0d0d0946f237ad5b5a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 18 16:23:43 2012 +0200
Fix tests after junit update
apache-commons-validator.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-validator.spec b/apache-commons-validator.spec
index 8b2d60b..adf2125 100644
--- a/apache-commons-validator.spec
+++ b/apache-commons-validator.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Apache Commons Validator
Group: Development/Libraries
License: ASL 2.0
@@ -61,6 +61,10 @@ sed -i 's/\r//' LICENSE.txt
sed -i 's/\r//' RELEASE-NOTES.txt
sed -i 's/\r//' NOTICE.txt
+# use textui instead of awtui (not available in junit4+)
+sed -i 's:junit.awtui.TestRunner.main:junit.textui.TestRunner.main:g' \
+ src/test/org/apache/commons/validator/*java
+
%build
# TODO: Use Maven for building as soon as upstream provides proper build.xml.
# Currently upstream build.xml uses antrun plugin to build, so downloads
@@ -116,6 +120,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Fri May 18 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com>- 1.3.1-8
+- Fix tests after junit update
+
* Sat Jan 14 2012 Ville Skyttä <ville.skytta(a)iki.fi> - 1.3.1-7
- Tweak source encoding to fix build with Java 1.7.
- Drop versioned jars and javadoc dir.
12 years, 1 month
[netty] Add enforcer-plugin to BR
by Stanislav Ochotnicky
Summary of changes:
35c2f1c... Add enforcer-plugin to BR (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 1 month
[netty/f17] Add enforcer-plugin to BR
by Stanislav Ochotnicky
commit 35c2f1c2b599fcd8a3d15cc56aef2ced478c9682
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 18 15:12:59 2012 +0200
Add enforcer-plugin to BR
netty.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/netty.spec b/netty.spec
index 027802e..77a6b6e 100644
--- a/netty.spec
+++ b/netty.spec
@@ -1,6 +1,6 @@
Name: netty
Version: 3.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An asynchronous event-driven network application framework and tools for Java
Group: Development/Libraries
@@ -21,6 +21,7 @@ BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-release-plugin
@@ -111,6 +112,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%{_javadocdir}/%{name}
%changelog
+* Fri May 18 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.2.4-4
+- Add enforcer-plugin to BR
+
* Wed Apr 18 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.2.4-3
- Remove eclipse plugin from BuildRequires
12 years, 1 month
[apache-commons-discovery/f16] add maven pom
by Stanislav Ochotnicky
commit def8ff570a4e2b24b9fbbf371cbb7c93e44447a1
Author: gil <puntogil(a)libero.it>
Date: Thu May 17 09:07:25 2012 +0200
add maven pom
apache-commons-discovery-0.4-pom.patch | 17 +++
apache-commons-discovery.spec | 48 ++++++----
commons-discovery-0.4.pom | 168 ++++++++++++++++++++++++++++++++
3 files changed, 213 insertions(+), 20 deletions(-)
---
diff --git a/apache-commons-discovery-0.4-pom.patch b/apache-commons-discovery-0.4-pom.patch
new file mode 100644
index 0000000..3e64049
--- /dev/null
+++ b/apache-commons-discovery-0.4-pom.patch
@@ -0,0 +1,17 @@
+--- pom.xml 2006-12-03 07:27:17.000000000 +0100
++++ pom.xml-gil 2012-05-17 08:53:48.291516910 +0200
+@@ -129,14 +129,6 @@
+ </includes>
+ </configuration>
+ </plugin>
+- <plugin>
+- <artifactId>maven-xdoc-plugin</artifactId>
+- <version>1.9.2</version>
+- <configuration>
+- <comment><strong>Site Only</strong> - v1.9.2 (minimum)
+- required for building the Site documentation.</comment>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+ <dependencies>
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index 688be77..5cc00d1 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -4,24 +4,25 @@
Name: apache-%{short_name}
Version: 0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 2
Summary: Apache Commons Discovery
License: ASL 2.0
Group: Development/Libraries
URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
+Source1: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{sh...
Patch0: %{name}-addosgimanifest.patch
+# removed maven-xdoc-plugin
+Patch1: %{name}-%{version}-pom.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant
-BuildRequires: ant-nodeps
BuildRequires: junit >= 0:3.7
BuildRequires: apache-commons-logging >= 1.1.1
Requires: apache-commons-logging >= 1.1.1
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This should go away with F-17
Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
@@ -48,6 +49,8 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:0.4
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0
+cp -p %{SOURCE1} pom.xml
+%patch1
%build
ant \
@@ -56,40 +59,45 @@ ant \
test.discovery dist
%install
-rm -rf $RPM_BUILD_ROOT
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
+ ln -s %{name}.jar %{short_name}.jar
popd # come back from javadir
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%pre javadoc
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu May 17 2012 gil cattaneo <puntogil(a)libero.it> - 2:0.4-7
+- add maven pom
+- adapt to current guideline
+- add %%pre javadoc script
+- remove BR ant-nodeps
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:0.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/commons-discovery-0.4.pom b/commons-discovery-0.4.pom
new file mode 100644
index 0000000..d7bfa01
--- /dev/null
+++ b/commons-discovery-0.4.pom
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <name>Discovery</name>
+ <version>0.4</version>
+ <description>Commons Discovery</description>
+ <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
+ <issueManagement>
+ <url>http://issues.apache.org/jira/</url>
+ </issueManagement>
+ <ciManagement>
+ <notifiers>
+ <notifier>
+ <configuration>
+ <address>commons-dev(a)jakarta.apache.org</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+ <inceptionYear>2002</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>Commons Dev List</name>
+ <subscribe>commons-dev-subscribe(a)jakarta.apache.org</subscribe>
+ <unsubscribe>commons-dev-unsubscribe(a)jakarta.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commons User List</name>
+ <subscribe>commons-user-subscribe(a)jakarta.apache.org</subscribe>
+ <unsubscribe>commons-user-unsubscribe(a)jakarta.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>rsitze</id>
+ <name>Richard Sitze</name>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>craigmcc</id>
+ <name>Craig R. McClanahan</name>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>costin</id>
+ <name>Costin Manolache</name>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>jstrachan</id>
+ <name>James Strachan</name>
+ <email>jstrachan(a)apache.org</email>
+ <organization>SpiritSoft, Inc.</organization>
+ </developer>
+ <developer>
+ <id>matth</id>
+ <name>Matthew Hawthorne</name>
+ <email>matth(a)apache.org</email>
+ </developer>
+ <developer>
+ <id>dims</id>
+ <name>Davanum Srinivas</name>
+ <email>dims(a)apache.org</email>
+ </developer>
+ <developer>
+ <id>rwinston</id>
+ <name>Rory Winston</name>
+ <email>rwinston(a)eircom.net</email>
+ </developer>
+ <developer>
+ <id>rdonkin</id>
+ <name>Robert Burrell Donkin</name>
+ <email>rdonkin(a)apache.org</email>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>/LICENSE.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.arti...</connection>
+ <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.s...</url>
+ </scm>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://jakarta.apache.org</url>
+ </organization>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src</directory>
+ <includes>
+ <include>**/testResource</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>META-INF/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/TestAll.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-xdoc-plugin</artifactId>
+ <version>1.9.2</version>
+ <configuration>
+ <comment><strong>Site Only</strong> - v1.9.2 (minimum)
+ required for building the Site documentation.</comment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>default</id>
+ <name>Default Repository</name>
+ <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.su...</url>
+ </repository>
+ <site>
+ <id>default</id>
+ <name>Default Site</name>
+ <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId....</url>
+ </site>
+ <status>converted</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
12 years, 1 month
[apache-commons-discovery] Use %{buildroot} consistently
by Stanislav Ochotnicky
commit fc3d0b1db142c3aa486eae9a24893992a8e6d01b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu May 17 14:40:16 2012 +0200
Use %{buildroot} consistently
apache-commons-discovery.spec | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index 9aae1fe..fabcbaa 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -50,17 +50,17 @@ mvn-rpmbuild install javadoc:aggregate
%install
# jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%files
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
12 years, 1 month