java-sig-commits January 2012

java-sig-commits@lists.fedoraproject.org

19 participants
376 discussions

[apache-commons-daemon] Update to latest upstream (1.0.8)
by Stanislav Ochotnicky 26 Jan '12

26 Jan '12

commit 11b432254f77c5c418799aa6ebed6a20246e2983 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Jan 26 16:54:36 2012 +0100 Update to latest upstream (1.0.8) - Drop s390/ppc patches (upstream seems to already include them) .gitignore | 1 + 0002-ppc64-configure.patch | 68 -------------------------------------------- 0003-s390x-configure.patch | 30 ------------------- apache-commons-daemon.spec | 12 ++++---- sources | 2 +- 5 files changed, 8 insertions(+), 105 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0948922..cf8795d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ commons-daemon-1.0.2-src.tar.gz /commons-daemon-1.0.5-src.tar.gz /commons-daemon-1.0.6-src.tar.gz /commons-daemon-1.0.7-src.tar.gz +/commons-daemon-1.0.8-src.tar.gz diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 9f251ee..bda84d2 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -3,16 +3,14 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 Group: Applications/System URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{… Patch0: 0001-execve-path-warning.patch -Patch1: 0002-ppc64-configure.patch -Patch2: 0003-s390x-configure.patch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: maven @@ -63,8 +61,6 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1 %prep %setup -q -n %{short_name}-%{version}-src %patch0 -p1 -b .execve -%patch1 -p1 -b .ppc -%patch2 -p1 -b .s390 # remove java binaries from sources rm -rf src/samples/build/ @@ -136,6 +132,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.8-1 +- Update to latest upstream (1.0.8) +- Drop s390/ppc patches (upstream seems to already include them) + * Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 601f474..2f686d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb6c5e7b6544fd8400b08f0e81fc9581 commons-daemon-1.0.7-src.tar.gz +323a0bd9e2786256f02c5aed4e887fed commons-daemon-1.0.8-src.tar.gz

1 0

[junit] Fixed versioning
by tradej＠fedoraproject.org 26 Jan '12

26 Jan '12

commit 31ab455743cf1cdd63d42e69908263e7945256a7 Author: Tomas Radej <tradej(a)redhat.com> Date: Thu Jan 26 16:36:32 2012 +0100 Fixed versioning junit.spec | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) --- diff --git a/junit.spec b/junit.spec index 18fdbeb..61b97d5 100644 --- a/junit.spec +++ b/junit.spec @@ -30,7 +30,7 @@ Name: junit Version: 4.10 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Java regression test package License: CPL @@ -56,8 +56,8 @@ BuildRequires: perl-MD5 Requires: hamcrest Requires: java >= 1:1.6.0 -Provides: junit4 = %{version}-%{release} -Obsoletes: junit4 < %{version}-%{release} +Provides: junit4 = %{epoch}:%{version}-%{release} +Obsoletes: junit4 < %{epoch}:%{version}-%{release} Conflicts: junit4 %description @@ -70,8 +70,8 @@ hosted on SourceForge. %package manual Group: Documentation Summary: Manual for %{name} -Provides: junit4-manual = %{version}-%{release} -Obsoletes: junit4-manual < %{version}-%{release} +Provides: junit4-manual = %{epoch}:%{version}-%{release} +Obsoletes: junit4-manual < %{epoch}:%{version}-%{release} %description manual Documentation for %{name}. @@ -80,8 +80,8 @@ Documentation for %{name}. Group: Documentation Summary: Javadoc for %{name} Requires: jpackage-utils -Provides: junit4-javadoc = %{version}-%{release} -Obsoletes: junit4-javadoc < %{version}-%{release} +Provides: junit4-javadoc = %{epoch}:%{version}-%{release} +Obsoletes: junit4-javadoc < %{epoch}:%{version}-%{release} %description javadoc Javadoc for %{name}. @@ -90,8 +90,8 @@ Javadoc for %{name}. Group: Development/Libraries Summary: Demos for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: junit4-demo = %{version}-%{release} -Obsoletes: junit4-demo < %{version}-%{release} +Provides: junit4-demo = %{epoch}:%{version}-%{release} +Obsoletes: junit4-demo < %{epoch}:%{version}-%{release} %description demo Demonstrations and samples for %{name}. @@ -149,6 +149,9 @@ cp -pr %{name}%{version}/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name} %doc junit%{version}/doc/* %changelog +* Thu Jan 26 2012 Tomas Radej <tradej(a)redhat.com> - 0:4.10-2 +- Fixed versioning + * Wed Jan 25 2012 Tomas Radej <tradej(a)redhat.com> - 0:4.10-1 - Updated to upstream 4.10 - Obsoleted junit4

1 0

[junit] Update to 4.10
by tradej＠fedoraproject.org 26 Jan '12

26 Jan '12

commit 4b435d30adb4d0b0afc662445e7690e40ca41462 Author: Tomas Radej <tradej(a)redhat.com> Date: Tue Jan 24 10:24:57 2012 +0100 Update to 4.10 .gitignore | 1 + junit-4.10.pom | 69 +++++++++++++++++++++++++++ junit-removed-test.patch | 49 +++++++++++++++++++ junit.spec | 115 ++++++++++++++++++++++++++++++---------------- sources | 1 + 5 files changed, 195 insertions(+), 40 deletions(-) --- diff --git a/.gitignore b/.gitignore index e47bda3..d63afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ junit3.8.2.zip +/junit-4.10.tar.xz diff --git a/junit-4.10.pom b/junit-4.10.pom new file mode 100644 index 0000000..3ccf8f8 --- /dev/null +++ b/junit-4.10.pom @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/maven-v4_0_0.xsd "> + <modelVersion>4.0.0</modelVersion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <name>JUnit</name> + <url>http://junit.org</url> + <description> + JUnit is a regression testing framework written by Erich Gamma and Kent Beck. + It is used by the developer who implements unit tests in Java. + </description> + <organization> + <name>JUnit</name> + <url>http://www.junit.org</url> + </organization> + <mailingLists> + <mailingList> + <name>JUnit Mailing List</name> + <post>junit(a)yahoogroups.com</post> + <archive> + http://tech.groups.yahoo.com/group/junit/ + </archive> + </mailingList> + </mailingLists> + <licenses> + <license> + <name>Common Public License Version 1.0</name> + <url>http://www.opensource.org/licenses/cpl1.0.txt</url> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/KentBeck/junit.git</connection> + <developerConnection>scm:git:git@github.com:KentBeck/junit.git</developerConnection> + <url>http://github.com/KentBeck/junit/tree/master</url> + </scm> + <developers> + <developer> + <id>dsaff</id> + <name>David Saff</name> + <email>david(a)saff.net</email> + </developer> + </developers> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>ISO-8859-1</encoding> + <source>${jdk.version}</source> + <target>${jdk.version}</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <properties> + <jdk.version>1.5</jdk.version> + </properties> +</project> \ No newline at end of file diff --git a/junit-removed-test.patch b/junit-removed-test.patch new file mode 100644 index 0000000..2cbaa6f --- /dev/null +++ b/junit-removed-test.patch @@ -0,0 +1,49 @@ +diff --git a/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java b/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java +index 21c22b8..948a6bb 100644 +--- a/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java ++++ b/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java +@@ -38,25 +38,25 @@ public class ParentRunnerTest { + } + } + +- @Test +- public void useChildHarvester() throws InitializationError { +- log= ""; +- ParentRunner<?> runner= new BlockJUnit4ClassRunner(FruitTest.class); +- runner.setScheduler(new RunnerScheduler() { +- public void schedule(Runnable childStatement) { +- log+= "before "; +- childStatement.run(); +- log+= "after "; +- } +- +- public void finished() { +- log+= "afterAll "; +- } +- }); +- +- runner.run(new RunNotifier()); +- assertEquals("before apple after before banana after afterAll ", log); +- } ++// @Test ++// public void useChildHarvester() throws InitializationError { ++// log= ""; ++// ParentRunner<?> runner= new BlockJUnit4ClassRunner(FruitTest.class); ++// runner.setScheduler(new RunnerScheduler() { ++// public void schedule(Runnable childStatement) { ++// log+= "before "; ++// childStatement.run(); ++// log+= "after "; ++// } ++// ++// public void finished() { ++// log+= "afterAll "; ++// } ++// }); ++// ++// runner.run(new RunNotifier()); ++// assertEquals("before apple after before banana after afterAll ", log); ++// } + + @Test + public void testMultipleFilters() throws Exception { diff --git a/junit.spec b/junit.spec index e9674ad..18fdbeb 100644 --- a/junit.spec +++ b/junit.spec @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2005, JPackage Project +# Copyright (c) 2000-2008, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -29,29 +29,49 @@ # Name: junit -Version: 3.8.2 -Release: 9%{?dist} +Version: 4.10 +Release: 1%{?dist} +Epoch: 0 Summary: Java regression test package License: CPL URL: http://www.junit.org/ Group: Development/Tools -# http://osdn.dl.sourceforge.net/junit/junit3.8.2.zip -Source0: junit3.8.2.zip -Source1: junit3.8.2-build.xml +BuildArch: noarch + +# git clone --bare git://github.com/KentBeck/junit.git junit.git +# mkdir junit-4.10 +# git --git-dir=junit.git --work-tree=junit-4.10 checkout r4.10 +# tar cjf junit-4.10.tar.xz junit-4.10/ +Source0: %{name}-%{version}.tar.xz +Source1: http://search.maven.org/remotecontent?filepath=%{name}/%{name}/%{version}/%… +Patch0: %{name}-removed-test.patch + BuildRequires: ant -BuildRequires: jpackage-utils >= 0:1.6 -BuildArch: noarch -Buildroot: %{_tmppath}/%{name}-%{version}-buildroot +BuildRequires: ant-contrib +BuildRequires: jpackage-utils >= 0:1.7.4 +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: hamcrest +BuildRequires: perl-MD5 + +Requires: hamcrest +Requires: java >= 1:1.6.0 + +Provides: junit4 = %{version}-%{release} +Obsoletes: junit4 < %{version}-%{release} +Conflicts: junit4 %description -JUnit is a regression testing framework written by Erich Gamma and Kent -Beck. It is used by the developer who implements unit tests in Java. +JUnit is a regression testing framework written by Erich Gamma and Kent Beck. +It is used by the developer who implements unit tests in Java. JUnit is Open +Source Software, released under the Common Public License Version 1.0 and JUnit is Open Source Software, released under the IBM Public License and hosted on SourceForge. %package manual Group: Documentation Summary: Manual for %{name} +Provides: junit4-manual = %{version}-%{release} +Obsoletes: junit4-manual < %{version}-%{release} %description manual Documentation for %{name}. @@ -59,6 +79,9 @@ Documentation for %{name}. %package javadoc Group: Documentation Summary: Javadoc for %{name} +Requires: jpackage-utils +Provides: junit4-javadoc = %{version}-%{release} +Obsoletes: junit4-javadoc < %{version}-%{release} %description javadoc Javadoc for %{name}. @@ -66,59 +89,71 @@ Javadoc for %{name}. %package demo Group: Development/Libraries Summary: Demos for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: junit4-demo = %{version}-%{release} +Obsoletes: junit4-demo < %{version}-%{release} %description demo Demonstrations and samples for %{name}. %prep -%setup -q -n %{name}%{version} -# extract sources -jar xf src.jar -rm -f src.jar -cp %{SOURCE1} build.xml +%setup -q +%patch0 -p1 +cp %{SOURCE1} pom.xml +find -iname '*.class' -o -iname '*.jar' -delete +ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.1.jar %build ant dist + %install -rm -rf $RPM_BUILD_ROOT # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{name}%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +# Many packages still use the junit4.jar directly +ln -s %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar + # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr %{name}%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr %{name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} + # demo -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %name for last part because it is - # part of package name -cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit +install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/%{name} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr %{name}%{version}/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name} -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) -%doc README.html -%{_javadir}/* +%doc cpl-v10.html README.html +%{_javadir}/%{name}.jar +%{_javadir}/%{name}4.jar +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* -%files manual -%defattr(-,root,root,-) -%doc %{name}%{version}/doc/* +%files demo +%doc cpl-v10.html +%{_datadir}/%{name} %files javadoc -%defattr(-,root,root,-) -%doc %{_javadocdir}/%{name}-%{version} +%doc cpl-v10.html %doc %{_javadocdir}/%{name} -%files demo -%defattr(-,root,root,-) -%{_datadir}/%{name} +%files manual +%doc cpl-v10.html +%doc junit%{version}/doc/* %changelog +* Wed Jan 25 2012 Tomas Radej <tradej(a)redhat.com> - 0:4.10-1 +- Updated to upstream 4.10 +- Obsoleted junit4 +- Epoch added + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.8.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index fb1e22c..e58793d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 9b8963ba2147a64bd5f1574b6fd289cb junit3.8.2.zip +48a301080612344294fdfe123f7abe91 junit-4.10.tar.xz

1 0

[maven-site-plugin] Add missing patch
by Stanislav Ochotnicky 26 Jan '12

26 Jan '12

commit c49010e18765985db9aefcd6ab1ce6bce50313ad Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Jan 26 15:17:36 2012 +0100 Add missing patch 0002-Port-to-jetty-8.x.patch | 98 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) --- diff --git a/0002-Port-to-jetty-8.x.patch b/0002-Port-to-jetty-8.x.patch new file mode 100644 index 0000000..01838fe --- /dev/null +++ b/0002-Port-to-jetty-8.x.patch @@ -0,0 +1,98 @@ +From a2052adcf52445e2c3a14fbb0b8fa28bbe763ee8 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Thu, 26 Jan 2012 12:19:05 +0100 +Subject: [PATCH 2/2] Port to jetty 8.x + +--- + pom.xml | 30 ++++++++++++++----- + .../org/apache/maven/plugins/site/SiteRunMojo.java | 20 ++++++------ + 2 files changed, 32 insertions(+), 18 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 8052e1c..5de9f4a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -388,20 +388,34 @@ under the License. + </dependency> + + <dependency> +- <groupId>org.mortbay.jetty</groupId> +- <artifactId>jetty</artifactId> +- <version>6.1.25</version> +- </dependency> ++ <groupId>org.eclipse.jetty</groupId> ++ <artifactId>jetty-server</artifactId> ++ <version>8.1.0.RC4</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.eclipse.jetty</groupId> ++ <artifactId>jetty-webapp</artifactId> ++ <version>8.1.0.RC4</version> ++ </dependency> ++ + <dependency> +- <groupId>org.mortbay.jetty</groupId> ++ <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> +- <version>6.1.25</version> ++ <version>8.1.0.RC4</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.eclipse.jetty</groupId> ++ <artifactId>jetty-servlet</artifactId> ++ <version>8.1.0.RC4</version> ++ <scope>test</scope> + </dependency> + + <dependency> +- <groupId>org.mortbay.jetty</groupId> ++ <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> +- <version>6.1.25</version> ++ <version>8.1.0.RC4</version> + <scope>test</scope> + </dependency> + +diff --git a/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java b/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java +index 43ff85e..99b9382 100644 +--- a/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java ++++ b/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java +@@ -40,12 +40,13 @@ import org.apache.maven.reporting.exec.MavenReportExecution; + + import org.codehaus.plexus.util.IOUtil; + +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Handler; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.handler.DefaultHandler; +-import org.mortbay.jetty.nio.SelectChannelConnector; +-import org.mortbay.jetty.webapp.WebAppContext; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Handler; ++import org.eclipse.jetty.server.handler.HandlerList; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.handler.DefaultHandler; ++import org.eclipse.jetty.server.nio.SelectChannelConnector; ++import org.eclipse.jetty.webapp.WebAppContext; + + /** + * Starts the site up, rendering documents as requested for faster editing. +@@ -93,10 +94,9 @@ public class SiteRunMojo + DefaultHandler defaultHandler = new DefaultHandler(); + defaultHandler.setServer( server ); + +- Handler[] handlers = new Handler[2]; +- handlers[0] = webapp; +- handlers[1] = defaultHandler; +- server.setHandlers( handlers ); ++ HandlerList handlers = new HandlerList(); ++ handlers.setHandlers(new Handler[] { webapp, defaultHandler }); ++ server.setHandler(handlers); + + getLog().info( "Starting Jetty on http://localhost:" + port + "/" ); + try +-- +1.7.6.2 +

1 0

[maven-site-plugin] Add BR/R on jetty-parent.
by Alexander Kurtakov 26 Jan '12

26 Jan '12

commit 55beab2d48acb5bdc2f79f488bd628ea98e4c153 Author: Alexander Kurtakov <akurtako(a)redhat.com> Date: Thu Jan 26 16:03:52 2012 +0200 Add BR/R on jetty-parent. maven-site-plugin.spec | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) --- diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec index 21a691a..7e5af3f 100644 --- a/maven-site-plugin.spec +++ b/maven-site-plugin.spec @@ -1,6 +1,6 @@ Name: maven-site-plugin Version: 3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Maven Site Plugin Group: Development/Libraries @@ -43,6 +43,7 @@ BuildRequires: plexus-containers-container-default BuildRequires: plexus-i18n BuildRequires: plexus-velocity BuildRequires: plexus-utils +BuildRequires: jetty-parent Requires: maven Requires: jetty >= 8.1.0-0.1.rc5 @@ -60,6 +61,7 @@ Requires: plexus-containers-container-default Requires: plexus-i18n Requires: plexus-velocity Requires: plexus-utils +Requires: jetty-parent Provides: maven2-plugin-site = %{version}-%{release} Obsoletes: maven2-plugin-site <= 0:2.0.8 @@ -113,6 +115,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ %{_javadocdir}/%{name} %changelog +* Thu Jan 26 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.0-4 +- Add BR/R on jetty-parent. + * Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0-3 - Port for jetty 8.1.0 - Small spec cleanups

1 0

[maven-site-plugin] Port for jetty 8.1.0
by Stanislav Ochotnicky 26 Jan '12

26 Jan '12

commit b2721e35995fc4cdf63bc7ce52a46cc285fa9efa Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Jan 26 14:05:51 2012 +0100 Port for jetty 8.1.0 - Small spec cleanups 0001-Set-source-encoding-property-to-UTF8.patch | 8 +++--- maven-site-plugin.spec | 25 ++++++++++++++-------- 2 files changed, 20 insertions(+), 13 deletions(-) --- diff --git a/0001-Set-source-encoding-property-to-UTF8.patch b/0001-Set-source-encoding-property-to-UTF8.patch index ae5e0db..fc36ef7 100644 --- a/0001-Set-source-encoding-property-to-UTF8.patch +++ b/0001-Set-source-encoding-property-to-UTF8.patch @@ -1,7 +1,7 @@ -From f1bb969252d2b85d54ab138e57d56d3b960429a9 Mon Sep 17 00:00:00 2001 +From 251ff59189b792587c8d54c18b8ef3d8b65fc4f6 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> -Date: Mon, 15 Aug 2011 11:10:57 +0200 -Subject: [PATCH] Set source encoding property to UTF8 +Date: Thu, 26 Jan 2012 12:18:00 +0100 +Subject: [PATCH 1/2] Set source encoding property to UTF8 --- pom.xml | 1 + @@ -20,5 +20,5 @@ index f73ad8a..8052e1c 100644 <dependencies> -- -1.7.6 +1.7.6.2 diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec index f7f0896..21a691a 100644 --- a/maven-site-plugin.spec +++ b/maven-site-plugin.spec @@ -1,6 +1,6 @@ Name: maven-site-plugin Version: 3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Site Plugin Group: Development/Libraries @@ -9,6 +9,7 @@ URL: http://maven.apache.org/plugins/maven-site-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%… Patch0: 0001-Set-source-encoding-property-to-UTF8.patch +Patch1: 0002-Port-to-jetty-8.x.patch BuildArch: noarch @@ -35,7 +36,7 @@ BuildRequires: maven-plugin-cobertura BuildRequires: maven-wagon BuildRequires: maven-reporting-exec BuildRequires: plexus-containers-component-metadata -BuildRequires: jetty +BuildRequires: jetty >= 8.1.0-0.1.rc5 BuildRequires: servlet25 BuildRequires: plexus-archiver BuildRequires: plexus-containers-container-default @@ -44,7 +45,7 @@ BuildRequires: plexus-velocity BuildRequires: plexus-utils Requires: maven -Requires: jetty +Requires: jetty >= 8.1.0-0.1.rc5 Requires: java Requires: jpackage-utils Requires: maven-artifact-manager @@ -59,8 +60,6 @@ Requires: plexus-containers-container-default Requires: plexus-i18n Requires: plexus-velocity Requires: plexus-utils -Requires(post): jpackage-utils -Requires(postun): jpackage-utils Provides: maven2-plugin-site = %{version}-%{release} Obsoletes: maven2-plugin-site <= 0:2.0.8 @@ -79,10 +78,12 @@ API documentation for %{name}. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +# skipping tests because we need to fix them first for jetty update mvn-rpmbuild \ - -Dmaven.test.failure.ignore=true \ + -Dmaven.test.skip=true \ install javadoc:javadoc %install @@ -102,14 +103,20 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ %files -%{_javadir}/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* +%doc LICENSE NOTICE +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} %files javadoc +%doc LICENSE NOTICE %{_javadocdir}/%{name} %changelog +* Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0-3 +- Port for jetty 8.1.0 +- Small spec cleanups + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

1 0

[jetty] Revert the dependency on jetty-parent - we don't need the whole maven stack when installing jetty.
by Alexander Kurtakov 26 Jan '12

26 Jan '12

commit ad631cef1df34dac7e7e6179cacf88d862854753 Author: Alexander Kurtakov <akurtako(a)redhat.com> Date: Thu Jan 26 15:53:59 2012 +0200 Revert the dependency on jetty-parent - we don't need the whole maven stack when installing jetty. - Make the javadoc package not depend on the main one. jetty.spec | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- diff --git a/jetty.spec b/jetty.spec index e6a9565..f9c52b8 100644 --- a/jetty.spec +++ b/jetty.spec @@ -42,7 +42,7 @@ Name: jetty Version: 8.1.0 -Release: 0.2.rc5%{?dist} +Release: 0.3.rc5%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet @@ -93,7 +93,6 @@ BuildRequires: jetty-artifact-remote-resources BuildArch: noarch -Requires: jetty-parent Requires: chkconfig Requires: jpackage-utils >= 0:1.6 Requires: tomcat-servlet-3.0-api @@ -133,7 +132,6 @@ platforms. %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: %{name} = %{version} %description javadoc %{summary}. @@ -370,6 +368,10 @@ fi %doc %{_javadocdir}/%{name} %changelog +* Thu Jan 26 2012 Alexander Kurtakov <akurtako(a)redhat.com> 8.1.0-0.3.rc5 +- Revert the dependency on jetty-parent - we don't need the whole maven stack when installing jetty. +- Make the javadoc package not depend on the main one. + * Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.2.rc5 - Add jetty-parent to Requires

1 0

[jetty] Add jetty-parent to Requires
by Stanislav Ochotnicky 26 Jan '12

26 Jan '12

commit e430c3db034c15743bc37fb175d13f183c53b83e Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Jan 26 14:17:24 2012 +0100 Add jetty-parent to Requires jetty.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/jetty.spec b/jetty.spec index 8231d53..e6a9565 100644 --- a/jetty.spec +++ b/jetty.spec @@ -42,7 +42,7 @@ Name: jetty Version: 8.1.0 -Release: 0.1.rc5%{?dist} +Release: 0.2.rc5%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet @@ -83,7 +83,6 @@ BuildRequires: objectweb-asm BuildRequires: %{_javadir}/javamail/mail.jar BuildRequires: jetty-parent BuildRequires: jetty-distribution-remote-resources -BuildRequires: jetty-parent BuildRequires: jetty-build-support BuildRequires: jetty-version-maven-plugin BuildRequires: jetty-toolchain @@ -94,6 +93,7 @@ BuildRequires: jetty-artifact-remote-resources BuildArch: noarch +Requires: jetty-parent Requires: chkconfig Requires: jpackage-utils >= 0:1.6 Requires: tomcat-servlet-3.0-api @@ -370,6 +370,9 @@ fi %doc %{_javadocdir}/%{name} %changelog +* Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.2.rc5 +- Add jetty-parent to Requires + * Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.1.rc5 - Update to rc5 - Remove symbolic name patch (not needed after bundle plugin fix)

1 0

[Bug 782398] New: Icu4j is outdated
by Red Hat Bugzilla 26 Jan '12

26 Jan '12

Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Icu4j is outdated https://bugzilla.redhat.com/show_bug.cgi?id=782398 Summary: Icu4j is outdated Product: Fedora Version: 16 Platform: Unspecified OS/Version: Unspecified Status: NEW Severity: unspecified Priority: unspecified Component: icu4j AssignedTo: fnasser(a)redhat.com ReportedBy: kdaniel(a)redhat.com QAContact: extras-qa(a)fedoraproject.org CC: fnasser(a)redhat.com, nsantos(a)redhat.com, dbhole(a)redhat.com, akurtako(a)redhat.com, java-sig-commits(a)lists.fedoraproject.org Classification: Fedora Story Points: --- Type: --- Regression: --- Mount Type: --- Documentation: --- Description of problem: icu4j version has been updated in the upstream. The change is very subtle, as the fourth segment of the version was changed, and therefore it went almost unnoticed in Eclipse community (because Eclipse supports only 3 segments and a qualifier). The problem is that Eclipse cannot be build without 4.4.2.2. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.

1 7

[icu4j] Bug 782398 - Icu4j is outdated
by Krzysztof Daniel 26 Jan '12

26 Jan '12

commit 387fd5d65645a97e75ac526e225657dc013aa5c9 Author: Krzysztof Daniel <kdaniel(a)redhat.com> Date: Thu Jan 19 16:44:01 2012 +0100 Bug 782398 - Icu4j is outdated Update ICU to 4.4.2.2 .gitignore | 2 +- ...-4.4.2-MANIFEST.MF => icu4j-4.4.2.2-MANIFEST.MF | 56 ++++++++++---------- icu4j.spec | 15 ++++-- sources | 2 +- 4 files changed, 40 insertions(+), 35 deletions(-) --- diff --git a/.gitignore b/.gitignore index 073f5d6..9a88094 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ icu4j-*-src.jar -/icu4j-4.4.2.tar.xz +/icu4j-*.tar.xz diff --git a/icu4j-4.4.2-MANIFEST.MF b/icu4j-4.4.2.2-MANIFEST.MF similarity index 81% rename from icu4j-4.4.2-MANIFEST.MF rename to icu4j-4.4.2.2-MANIFEST.MF index 91c262a..4b9cc9c 100644 --- a/icu4j-4.4.2-MANIFEST.MF +++ b/icu4j-4.4.2.2-MANIFEST.MF @@ -1,28 +1,28 @@ -Manifest-Version: 1.0 -Export-Package: com.ibm.icu.lang;base=true;full=true;version="4.4.2.1" - ,com.ibm.icu.math;base=true;full=true;version="4.4.2.1",com.ibm.icu.t - ext;base=true;full=true;version="4.4.2.1",com.ibm.icu.util;base=true; - full=true;version="4.4.2.1",com.ibm.icu.impl;x-internal:=true,com.ibm - .icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt44b;x-inte - rnal:=true,com.ibm.icu.impl.data.icudt44b.brkitr;x-internal:=true,com - .ibm.icu.impl.data.icudt44b.coll;x-internal:=true,com.ibm.icu.impl.da - ta.icudt44b.curr;x-internal:=true,com.ibm.icu.impl.data.icudt44b.lang - ;x-internal:=true,com.ibm.icu.impl.data.icudt44b.rbnf;x-internal:=tru - e,com.ibm.icu.impl.data.icudt44b.region;x-internal:=true,com.ibm.icu. - impl.data.icudt44b.translit;x-internal:=true,com.ibm.icu.impl.data.ic - udt44b.zone;x-internal:=true,com.ibm.icu.impl.duration;x-internal:=tr - ue,com.ibm.icu.impl.locale;x-internal:=true -Bundle-ClassPath: icu-data.jar,. -Bundle-Name: %pluginName -Bundle-Localization: plugin -Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright I - BM Corp. 2000, 2011. All Rights Reserved. IBM is a registered tradema - rk of IBM Corp. -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: %providerName -Eclipse-LazyStart: true -Bundle-Version: 4.4.2.v20110208 -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: com.ibm.icu; singleton:=true -Eclipse-ExtensibleAPI: true - +Manifest-Version: 1.0 +Export-Package: com.ibm.icu.lang;base=true;full=true;version="4.4.2.2" + ,com.ibm.icu.math;base=true;full=true;version="4.4.2.2",com.ibm.icu.t + ext;base=true;full=true;version="4.4.2.2",com.ibm.icu.util;base=true; + full=true;version="4.4.2.2",com.ibm.icu.impl;x-internal:=true,com.ibm + .icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt44b;x-inte + rnal:=true,com.ibm.icu.impl.data.icudt44b.brkitr;x-internal:=true,com + .ibm.icu.impl.data.icudt44b.coll;x-internal:=true,com.ibm.icu.impl.da + ta.icudt44b.curr;x-internal:=true,com.ibm.icu.impl.data.icudt44b.lang + ;x-internal:=true,com.ibm.icu.impl.data.icudt44b.rbnf;x-internal:=tru + e,com.ibm.icu.impl.data.icudt44b.region;x-internal:=true,com.ibm.icu. + impl.data.icudt44b.translit;x-internal:=true,com.ibm.icu.impl.data.ic + udt44b.zone;x-internal:=true,com.ibm.icu.impl.duration;x-internal:=tr + ue,com.ibm.icu.impl.locale;x-internal:=true +Bundle-ClassPath: icu-data.jar,. +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright I + BM Corp. 2000, 2011. All Rights Reserved. IBM is a registered tradema + rk of IBM Corp. +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %providerName +Eclipse-LazyStart: true +Bundle-Version: 4.4.2.v20110823 +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: com.ibm.icu; singleton:=true +Eclipse-ExtensibleAPI: true + diff --git a/icu4j.spec b/icu4j.spec index 08278cb..65106f3 100644 --- a/icu4j.spec +++ b/icu4j.spec @@ -41,16 +41,18 @@ %endif Name: icu4j -Version: 4.4.2 -Release: 5%{?dist} +Version: 4.4.2.2 +Release: 6%{?dist} Epoch: 1 Summary: International Components for Unicode for Java License: MIT and EPL URL: http://site.icu-project.org/ Group: Development/Libraries -#http://source.icu-project.org/repos/icu/icu4j/tags/release-4-4-2-eclipse37-20110208/ icu4j-4.4.2 -#tar caf icu4j-4.4.2.tar.xz icu4j-4.4.2/ -Source0: icu4j-4.4.2.tar.xz +#CAUTION +#to create a tarball use following procedure +#svn co http://source.icu-project.org/repos/icu/icu4j/tags/release-4-4-2-eclipse37-… icu4j-<version> +#tar caf icu4j-<version>.tar.xz icu4j-<version>/ +Source0: icu4j-4.4.2.2.tar.xz Source1: %{name}-4.4.2.pom ## CAUTION ## Please do not forget to update this Manifest to the latest one taken from the icu4j bundle from @@ -185,6 +187,9 @@ cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %endif %changelog +* Mon Jan 16 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:4.4.2.2-6 +- Update to 4.4.2.2. + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:4.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 7518c9e..cc56e46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44f4bdc0e436931a158bbd40cca3a6a2 icu4j-4.4.2.tar.xz +6cdc2e36700b1c0dc9ae7a2608c42489 icu4j-4.4.2.2.tar.xz

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits January 2012