java-sig-commits January 2013

java-sig-commits@lists.fedoraproject.org

14 participants
405 discussions

[tycho] Remove usage of older maven for intermediary build.
by Roland Grunberg 25 Jan '13

25 Jan '13

commit 874d2fdb05631818955f1fe200c3f031ffeade8c Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Fri Jan 25 10:23:11 2013 -0500 Remove usage of older maven for intermediary build. tycho.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/tycho.spec b/tycho.spec index dc4a46b..42a353e 100644 --- a/tycho.spec +++ b/tycho.spec @@ -165,7 +165,7 @@ if [ "${sysVer}" == "${buildVer}" ]; then echo "Performing intermediary build" %patch4 -p1 -/usr/share/maven/bin/mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate +mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate %patch4 -p1 -R %patch5 -p1

1 0

[plexus-ant-factory] Build with xmvn
by Michal Srb 25 Jan '13

25 Jan '13

commit 5cef1f661ea07ade0adba28d7ca32347ee405d14 Author: Michal Srb <msrb(a)redhat.com> Date: Fri Jan 25 14:42:16 2013 +0100 Build with xmvn - Added BR on plexus-component-factories-pom plexus-ant-factory.spec | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) --- diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec index da2f0da..9260556 100644 --- a/plexus-ant-factory.spec +++ b/plexus-ant-factory.spec @@ -33,7 +33,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.9.a2.1%{?dist} +Release: 0.10.a2.1%{?dist} Epoch: 0 Summary: Plexus Ant component factory # Email from copyright holder confirms license. @@ -48,8 +48,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch -BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: maven +BuildRequires: xmvn BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -64,11 +63,8 @@ BuildRequires: ant BuildRequires: classworlds BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: plexus-component-factories-pom -Requires: ant -Requires: classworlds -Requires: plexus-containers-container-default -Requires: plexus-utils %description Ant component class creator for Plexus. @@ -76,7 +72,6 @@ Ant component class creator for Plexus. %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -87,43 +82,31 @@ cp %{SOURCE1} LICENSE %build -mvn-rpmbuild -e install javadoc:aggregate +%mvn_file : %{parent}/%{subname} +%mvn_build %install +%mvn_install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{parent} -install -pm 644 target/%{name}-%{version}*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar - -# pom -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom -%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %pre javadoc # workaround for rpm bug, can be removed in F-20 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : -%files +%files -f .mfiles %doc LICENSE %dir %{_javadir}/plexus -%{_javadir}/%{parent}/%{subname}.jar -%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom -%{_mavendepmapfragdir}/%{name} -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE -%doc %{_javadocdir}/* %changelog +* Thu Jan 17 2013 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.10.a2.1 +- Build with xmvn +- Added BR on plexus-component-factories-pom + * Mon Dec 10 2012 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.9.a2.1 - migrated to plexus-containers-container-default (#878580) - using global is preferred over define when defining macros

1 0

[plexus-bsh-factory] Build with xmvn
by Michal Srb 25 Jan '13

25 Jan '13

commit 8b8dd3745ed7dbd8e27c0d0a4ba319d587256baf Author: Michal Srb <msrb(a)redhat.com> Date: Wed Jan 23 13:59:33 2013 +0100 Build with xmvn plexus-bsh-factory.spec | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) --- diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec index 42c11d8..a7a3e1e 100644 --- a/plexus-bsh-factory.spec +++ b/plexus-bsh-factory.spec @@ -33,7 +33,7 @@ Name: %{parent}-%{subname} Version: 1.0 -Release: 0.8.a7%{?dist} +Release: 0.9.a7%{?dist} Epoch: 0 Summary: Plexus Bsh component factory License: MIT @@ -50,7 +50,7 @@ Patch1: %{name}-encodingfix.patch BuildArch: noarch BuildRequires: jpackage-utils -BuildRequires: maven +BuildRequires: xmvn BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -62,11 +62,6 @@ BuildRequires: classworlds BuildRequires: plexus-container-default BuildRequires: plexus-utils -Requires: bsh -Requires: classworlds -Requires: plexus-utils -# the only user of this code doesn't use problematic parts of API -Requires: plexus-containers-container-default %description Bsh component class creator for Plexus. @@ -74,7 +69,6 @@ Bsh component class creator for Plexus. %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -89,41 +83,28 @@ cp -p %{SOURCE3} . %build +%mvn_file : %{parent}/%{subname} # depmap used to compile so we resolve old plexus-container-default # At runtime we use new plexus-containers-container-default because our only # runtime user is maven-plugin-tools/maven-script-beanshell which doesn't cause # problems with old/new API -mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE1} \ - -Dmaven.test.skip=true \ - package javadoc:aggregate +export XMVN_RESOLV_DEPMAPS=",%{SOURCE1}" +%mvn_build -f %install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus -install -pm 644 target/*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar - -# pom -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 \ - pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom - -%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name}/ +%mvn_install %files -f .mfiles %doc plexus-bsh-factory-license.txt -%files javadoc +%files javadoc -f .mfiles-javadoc %doc plexus-bsh-factory-license.txt -%doc %{_javadocdir}/* %changelog +* Wed Jan 23 2013 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.9.a7 +- Build with xmvn + * Thu Nov 22 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.8.a7 - Cleanup whole spec file (#878828) - Build/install javadoc package (#878134, #878135)

1 0

[httpcomponents-project] Build with xmvn
by Michal Srb 25 Jan '13

25 Jan '13

commit 2ff1c810efd40531e40e848142699c6bdc06379c Author: Michal Srb <msrb(a)redhat.com> Date: Wed Jan 23 15:01:34 2013 +0100 Build with xmvn httpcomponents-project.spec | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) --- diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 7cda56f..55087f3 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,7 +1,7 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents Version: 6 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -10,17 +10,8 @@ URL: http://hc.apache.org/ Source: %{name}-%{version}.tar.xz BuildArch: noarch -BuildRequires: jpackage-utils +BuildRequires: xmvn -# Requires are dependencies from pom.xml. This project should only be required for building with maven. -Requires: java >= 1:1.6.0 -Requires: jpackage-utils -Requires: maven -Requires: maven-compiler-plugin -Requires: maven-gpg-plugin -Requires: maven-jar-plugin -Requires: maven-project-info-reports-plugin -Requires: maven-site-plugin %description Common Maven POM file for HttpComponents. This project should be @@ -34,18 +25,22 @@ use it as runtime requirement. %pom_remove_plugin :docbkx-maven-plugin %pom_remove_plugin :maven-clover2-plugin %pom_remove_plugin :maven-notice-plugin +%pom_xpath_remove pom:modules + +%build +%mvn_file : %{name} +%mvn_build %install -install -dm 755 %{buildroot}/%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom -%add_maven_depmap JPP.%{name}.pom +%mvn_install -%files +%files -f .mfiles %doc LICENSE.txt NOTICE.txt -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP.%{name}.pom %changelog +* Thu Jan 17 2013 Michal Srb <msrb(a)redhat.com> - 6-2 +- Build with xmvn + * Mon Aug 6 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 6-1 - Update to upstream version 6

1 0

[httpcomponents-client] Build with xmvn
by Michal Srb 25 Jan '13

25 Jan '13

commit 497db611c9e6cbac50018d74d412131f929d171d Author: Michal Srb <msrb(a)redhat.com> Date: Fri Jan 25 11:02:01 2013 +0100 Build with xmvn - Disable fluent-hc module httpcomponents-client.spec | 52 +++++++++++--------------------------------- 1 files changed, 13 insertions(+), 39 deletions(-) --- diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 6121895..d613099 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -3,7 +3,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -11,17 +11,12 @@ Source0: http://archive.apache.org/dist/httpcomponents/httpclient/sour BuildArch: noarch +BuildRequires: xmvn >= 0.2.5 BuildRequires: httpcomponents-project BuildRequires: httpcomponents-core BuildRequires: apache-mime4j BuildRequires: apache-commons-codec -Requires: java >= 1:1.6.0 -Requires: jpackage-utils -Requires: httpcomponents-core -Requires: apache-mime4j -Requires: apache-commons-codec - %description HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on httpcomponents HttpCore. It also provides reusable components for @@ -33,7 +28,6 @@ encouraged to upgrade. %package javadoc Summary: API documentation for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc %{summary}. @@ -45,6 +39,7 @@ Requires: jpackage-utils # Remove optional build deps not available in Fedora %pom_disable_module httpclient-cache %pom_disable_module httpclient-osgi +%pom_disable_module fluent-hc %pom_remove_dep :mockito-core httpclient %pom_remove_plugin :maven-notice-plugin %pom_remove_plugin :docbkx-maven-plugin @@ -96,48 +91,27 @@ done </plugin>" httpclient + %build -mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate +%mvn_file ":{*}" httpcomponents/@1 +%mvn_build -f %install -# jars -install -dm 755 %{buildroot}%{_javadir}/%{base_name} -install -m 644 httpclient/target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar -install -m 644 httpmime/target/httpmime-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpmime.jar - -# main pom -install -dm 755 %{buildroot}/%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom -%add_maven_depmap JPP.%{base_name}-httpcomponents-client.pom - -# pom -install -pm 644 httpclient/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom -%add_maven_depmap JPP.%{base_name}-httpclient.pom %{base_name}/httpclient.jar +%mvn_install -install -pm 644 httpmime/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpmime.pom -%add_maven_depmap JPP.%{base_name}-httpmime.pom %{base_name}/httpmime.jar - -# javadocs -install -dm 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} - - -%files +%files -f .mfiles %doc LICENSE.txt NOTICE.txt %doc README.txt RELEASE_NOTES.txt -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP.%{base_name}*.pom -%{_javadir}/%{base_name} -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt NOTICE.txt -%doc %{_javadocdir}/%{name} %changelog +* Fri Jan 25 2013 Michal Srb <msrb(a)redhat.com> - 4.2.3-2 +- Build with xmvn +- Disable fluent-hc module + * Thu Jan 24 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.3-1 - Update to upstream version 4.2.3

1 0

[maven-shared-jar] Initial commit
by tradej＠fedoraproject.org 25 Jan '13

25 Jan '13

commit 2dfd9f89e385038cea10637c2f1f5d8ea9d8c02a Author: Tomas Radej <tradej(a)redhat.com> Date: Fri Jan 25 10:31:36 2013 +0100 Initial commit .gitignore | 2 + maven-shared-jar.spec | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 3 files changed, 97 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..86db9bf 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/LICENSE-2.0.txt +/maven-shared-jar-1.1-source-release.zip diff --git a/maven-shared-jar.spec b/maven-shared-jar.spec new file mode 100644 index 0000000..0b57429 --- /dev/null +++ b/maven-shared-jar.spec @@ -0,0 +1,93 @@ +Name: maven-shared-jar +Version: 1.1 +Release: 2%{?dist} +# Maven-shared defines maven-shared-jar version as 1.1 +Epoch: 1 +Summary: Maven JAR Utilities +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-shared-jar +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{… + +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven +BuildRequires: plexus-containers-component-metadata +BuildRequires: plexus-containers-container-default +BuildRequires: maven-surefire-provider-junit +Requires: apache-commons-collections +Requires: bcel +Requires: java +Requires: jpackage-utils +Requires: maven +Requires: plexus-digest + +Obsoletes: maven-shared-jar < %{epoch}:%{version}-%{release} +Provides: maven-shared-jar = %{epoch}:%{version}-%{release} + +%description +Utilities that help identify the contents of a JAR, including Java class +analysis and Maven metadata analysis. + +This is a replacement package for maven-shared-jar + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. + + +%prep +%setup -q + +%pom_add_dep org.codehaus.plexus:plexus-container-default + +find -type f -iname '*.jar' -delete + +# Replace plexus-maven-plugin with plexus-component-metadata +find -name 'pom.xml' -exec sed \ + -i 's/<artifactId>plexus-maven-plugin<\/artifactId>/<artifactId>plexus-component-metadata<\/artifactId>/' '{}' ';' +find -name 'pom.xml' -exec sed \ + -i 's/<goal>descriptor<\/goal>/<goal>generate-metadata<\/goal>/' '{}' ';' + +%build +# Tests require the jars that were removed +mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip + +%install +# JAR +install -Ddm 755 %{buildroot}/%{_javadir} +install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + +# POM +install -Ddm 755 %{buildroot}/%{_mavenpomdir} +install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom + +# JavaDoc +install -Ddm 755 %{buildroot}/%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%add_maven_depmap JPP-%{name}.pom %{name}.jar + +%files +%doc LICENSE NOTICE +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE NOTICE +%doc %{_javadocdir}/%{name} + + +%changelog +* Wed Jan 23 2013 Tomas Radej <tradej(a)redhat.com> - 1:1.1-2 +- Removed jars and skipped tests + +* Tue Jan 15 2013 Tomas Radej <tradej(a)redhat.com> - 1:1.1-1 +- Initial version + diff --git a/sources b/sources index e69de29..b774626 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +f71afcad0365eabf07fa151682b2620a maven-shared-jar-1.1-source-release.zip

1 0

File maven-shared-jar-1.1-source-release.zip uploaded to lookaside cache by tradej
by tradej＠fedoraproject.org 25 Jan '13

25 Jan '13

A file has been added to the lookaside cache for maven-shared-jar: f71afcad0365eabf07fa151682b2620a maven-shared-jar-1.1-source-release.zip

1 0

File LICENSE-2.0.txt uploaded to lookaside cache by tradej
by tradej＠fedoraproject.org 25 Jan '13

25 Jan '13

A file has been added to the lookaside cache for maven-shared-jar: 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 25 Jan '13

25 Jan '13

Product: Fedora https://bugzilla.redhat.com/show_bug.cgi?id=652183 Bug 652183 depends on bug 895616, which changed state. Bug 895616 Summary: Review Request: maven-shared-io - API for I/O support like logging, download or file scanning https://bugzilla.redhat.com/show_bug.cgi?id=895616 What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |CLOSED Resolution|--- |RAWHIDE -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

[Bug 903693] New: Previously successful build now fails in rawhide (eclipse-m2e-core)
by Red Hat Bugzilla 24 Jan '13

24 Jan '13

Product: Fedora https://bugzilla.redhat.com/show_bug.cgi?id=903693 Bug ID: 903693 Summary: Previously successful build now fails in rawhide (eclipse-m2e-core) Product: Fedora Version: rawhide Component: javapackages-tools Severity: unspecified Priority: unspecified Reporter: gerard(a)ryan.lt Description of problem: A scratch build[1] of eclipse-m2e-core (that was done during review), completed successfully on Tue, 22 Jan 2013 17:20:07 UTC. An initial build of the package[2] (with trivial changes, hence the NVR bump) failed on Wed, 23 Jan 2013 19:50:36 UTC. I made a small change and tried another scratch[3] because of a couple of errors (bogus changelog dates) in the build.log for the previous failed attempt. The build still failed with the primary problem of seemingly trying to connect to an external repository for Eclipse stuff. [1] http://koji.fedoraproject.org/koji/taskinfo?taskID=4894328 [2] http://koji.fedoraproject.org/koji/taskinfo?taskID=4897472 [3] http://koji.fedoraproject.org/koji/taskinfo?taskID=4897841 Version-Release number of selected component (if applicable): maven-local-0.11.0-1.fc19 How reproducible: I can reproduce failed builds but can no longer reproduce successful builds. -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=eNRrapSmdp&a=cc_unsubscribe

1 7

← Newer
1
...
10
11
12
13
14
15
16
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits January 2013