java-sig-commits January 2013

java-sig-commits@lists.fedoraproject.org

14 participants
405 discussions

[plexus-compiler] Build with xmvn
by Michal Srb 24 Jan '13

24 Jan '13

commit 3f49d088b9bb69f596928e0e27472c182c36f238 Author: Michal Srb <msrb(a)redhat.com> Date: Thu Jan 24 10:59:09 2013 +0100 Build with xmvn - Fixed rpmlint warning plexus-compiler.spec | 118 +++++++++++++++---------------------------------- 1 files changed, 36 insertions(+), 82 deletions(-) --- diff --git a/plexus-compiler.spec b/plexus-compiler.spec index eee0e2b..88c0cef 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -33,13 +33,13 @@ Name: plexus-compiler Version: 1.9.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT License: MIT and ASL 2.0 -Group: Development/Java +Group: Development/Libraries URL: http://plexus.codehaus.org/ Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{v… @@ -47,7 +47,7 @@ Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{na Patch0: plexus-compiler-ignoreOptionalProblems.patch BuildArch: noarch -BuildRequires: maven +BuildRequires: xmvn BuildRequires: jpackage-utils BuildRequires: junit BuildRequires: classworlds @@ -58,10 +58,6 @@ BuildRequires: plexus-containers-component-metadata BuildRequires: junit4 BuildRequires: plexus-pom -Requires: classworlds -Requires: plexus-containers-container-default -Requires: plexus-utils -Requires: junit4 %description Plexus Compiler adds support for using various compilers from a @@ -75,8 +71,6 @@ Group: Development/Libraries # ...codehaus/plexus/compiler/csharp/CSharpCompiler.java # ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java License: MIT and ASL 2.0 and ASL 1.1 -Requires: jpackage-utils -Requires: eclipse-ecj Requires: %{name} = %{version}-%{release} %description extras @@ -85,7 +79,6 @@ Additional support for csharp, eclipse and jikes compilers %package javadoc Summary: Javadoc for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc API documentation for %{name}. @@ -100,83 +93,44 @@ API documentation for %{name}. %pom_disable_module plexus-compiler-test %build -mvn-rpmbuild -e \ - -Dmaven.test.skip=true \ - install javadoc:aggregate +# plexus-compiler-jikes +%mvn_package "org.codehaus.plexus:plexus-compiler-jikes" plexus-compiler-extras +%mvn_file "org.codehaus.plexus:plexus-compiler-jikes" plexus/compiler-jikes +# plexus-compiler-eclipse +%mvn_package "org.codehaus.plexus:plexus-compiler-eclipse" plexus-compiler-extras +%mvn_file "org.codehaus.plexus:plexus-compiler-eclipse" plexus/compiler-eclipse + +# plexus-compiler-csharp +%mvn_package "org.codehaus.plexus:plexus-compiler-csharp" plexus-compiler-extras +%mvn_file "org.codehaus.plexus:plexus-compiler-csharp" plexus/compiler-csharp + +# plexus-compiler-api +%mvn_file "org.codehaus.plexus:plexus-compiler-api" plexus/compiler-api + +# plexus-compiler-manager +%mvn_file "org.codehaus.plexus:plexus-compiler-manager" plexus/compiler-manager + +# plexus-compiler-javac +%mvn_file "org.codehaus.plexus:plexus-compiler-javac" plexus/compiler-javac + + +%mvn_build -f %install -# jars -install -d -m 755 %{buildroot}%{_javadir}/%{parent} -install -d -m 755 %{buildroot}%{_mavenpomdir} - -for mod in plexus-compiler-{api,manager}; do - jarname=${mod/plexus-} - install -pm 644 $mod/target/${mod}-%{version}.jar \ - %{buildroot}%{_javadir}/%{parent}/$jarname.jar - - install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom - %add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar -done - -pushd plexus-compilers -for mod in plexus-compiler-{csharp,eclipse,jikes,javac}; do - jarname=${mod/plexus-} - install -pm 644 $mod/target/${mod}-%{version}.jar \ - %{buildroot}%{_javadir}/%{parent}/$jarname.jar - - install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom - %add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar -f extras -done - -install -pm 644 plexus-compiler-javac/target/plexus-compiler-javac-%{version}.jar \ - %{buildroot}%{_javadir}/%{parent}/compiler-javac.jar - -install -pm 644 plexus-compiler-javac/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom -%add_maven_depmap JPP.%{parent}-compiler-javac.pom %{parent}/compiler-javac.jar - -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compilers.pom -%add_maven_depmap JPP.%{parent}-compilers.pom -popd - -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler.pom -%add_maven_depmap JPP.%{parent}-compiler.pom - - -# javadocs -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-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - - -%files -%{_javadir}/%{parent}/compiler-api.jar -%{_javadir}/%{parent}/compiler-manager.jar -%{_javadir}/%{parent}/compiler-javac.jar -%{_mavenpomdir}/JPP.%{parent}-compilers.pom -%{_mavenpomdir}/JPP.%{parent}-compiler.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-api.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-manager.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom -%{_mavendepmapfragdir}/%{name} - -%files extras -%{_mavendepmapfragdir}/%{name}-extras -%{_javadir}/%{parent}/compiler-csharp.jar -%{_javadir}/%{parent}/compiler-eclipse.jar -%{_javadir}/%{parent}/compiler-jikes.jar -%{_mavenpomdir}/JPP.%{parent}-compiler-jikes.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-eclipse.pom -%{_mavenpomdir}/JPP.%{parent}-compiler-csharp.pom - -%files javadoc -%doc %{_javadocdir}/%{name} +%mvn_install + +%files -f .mfiles + +%files extras -f .mfiles-plexus-compiler-extras + +%files javadoc -f .mfiles-javadoc %changelog +* Thu Jan 24 2013 Michal Srb <msrb(a)redhat.com> - 0:1.9.2-4 +- Build with xmvn +- Fixed rpmlint warning + * Wed Dec 5 2012 Michal Srb <msrb(a)redhat.com> - 0:1.9.2-3 - Replaced dependency to plexus-container-default with plexus-containers-container-default

1 0

[maven-reporting-api] Initial commit
by tradej＠fedoraproject.org 24 Jan '13

24 Jan '13

commit c5a2c9934563fd5661181cd789131c171ff276b0 Author: Tomas Radej <tradej(a)redhat.com> Date: Thu Jan 24 10:15:51 2013 +0100 Initial commit .gitignore | 2 + maven-reporting-api.spec | 81 ++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 3 files changed, 85 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..2f8d383 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/maven-reporting-api-3.0.tar.xz +/LICENSE-2.0.txt diff --git a/maven-reporting-api.spec b/maven-reporting-api.spec new file mode 100644 index 0000000..3be43e9 --- /dev/null +++ b/maven-reporting-api.spec @@ -0,0 +1,81 @@ +Name: maven-reporting-api +Version: 3.0 +Release: 1%{?dist} +# Maven-shared defines maven-reporting-api version as 3.0 +Epoch: 1 +Summary: API to manage report generation +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-reporting-api +# svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-api-3.0 maven-reporting-api-3.0 +# tar caf maven-reporting-api-3.0.tar.xz maven-reporting-api-3.0/ +Source0: %{name}-%{version}.tar.xz +# ASL mandates that the licence file be included in redistributed source +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven +Requires: java +Requires: jpackage-utils +Requires: maven-doxia-sink-api + +Obsoletes: maven-shared-reporting-api < %{epoch}:%{version}-%{release} +Provides: maven-shared-reporting-api = %{epoch}:%{version}-%{release} + +%description +API to manage report generation. Maven-reporting-api is included in Maven 2.x +core distribution, but moved to shared components to achieve report decoupling +from Maven 3 core. + +This is a replacement package for maven-shared-reporting-api + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. + + +%prep +%setup -q + +cp %{SOURCE1} LICENSE.txt + +%build +mvn-rpmbuild package javadoc:aggregate + +%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} + +# Previous package provides groupIds org.apache.maven.shared and org.apache.maven.reporting +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.maven.shared:maven-reporting-api" + +%files +%doc LICENSE.txt +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE.txt +%doc %{_javadocdir}/%{name} + + +%changelog +* Thu Jan 17 2013 Tomas Radej <tradej(a)redhat.com> - 1:3.0-1 +- Initial version + diff --git a/sources b/sources index e69de29..88cc8a1 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +ca1cee73f867c382f80d6ab19f14c825 maven-reporting-api-3.0.tar.xz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt

1 0

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

24 Jan '13

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

1 0

File maven-reporting-api-3.0.tar.xz uploaded to lookaside cache by tradej
by tradej＠fedoraproject.org 24 Jan '13

24 Jan '13

A file has been added to the lookaside cache for maven-reporting-api: ca1cee73f867c382f80d6ab19f14c825 maven-reporting-api-3.0.tar.xz

1 0

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

24 Jan '13

commit e95c60d84273c6749ab29b8ef635aef5a34fdbcb Author: Tomas Radej <tradej(a)redhat.com> Date: Thu Jan 24 09:43:18 2013 +0100 Initial commit .gitignore | 2 + maven-shared-io.spec | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 3 files changed, 94 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..7181949 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/LICENSE-2.0.txt +/maven-shared-io-1.1.tar.xz diff --git a/maven-shared-io.spec b/maven-shared-io.spec new file mode 100644 index 0000000..d5d831a --- /dev/null +++ b/maven-shared-io.spec @@ -0,0 +1,90 @@ +Name: maven-shared-io +Version: 1.1 +Release: 1%{?dist} +# Maven-shared defines maven-shared-io version as 1.2 +Epoch: 1 +Summary: API for I/O support like logging, download or file scanning. +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-shared-io +# svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-io-1.1 maven-shared-io-1.1 +# tar caf maven-shared-io-1.1.tar.xz maven-shared-io-1.1/ +Source0: %{name}-%{version}.tar.xz +# ASL mandates that the licence file be included in redistributed source +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +BuildArch: noarch + +BuildRequires: easymock +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven +BuildRequires: maven-surefire-provider-junit +Requires: java +Requires: jpackage-utils +Requires: maven +Requires: maven-artifact-manager +Requires: maven-wagon +Requires: plexus-container-default +Requires: plexus-utils + +Obsoletes: maven-shared-io < %{epoch}:%{version}-%{release} +Provides: maven-shared-io = %{epoch}:%{version}-%{release} + +%description +API for I/O support like logging, download or file scanning. + +This is a replacement package for maven-shared-io + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. + + +%prep +%setup -q + +%pom_add_dep org.apache.maven:maven-compat + +# Failing tests +rm src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java +rm src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java + +cp %{SOURCE1} LICENSE.txt + +%build +mvn-rpmbuild package javadoc:aggregate + +%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.txt +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE.txt +%doc %{_javadocdir}/%{name} + + +%changelog +* Tue Jan 15 2013 Tomas Radej <tradej(a)redhat.com> - 1:1.1-1 +- Initial version + diff --git a/sources b/sources index e69de29..c9e0772 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +e964fd8743a9ca0afdf58160798c43b2 maven-shared-io-1.1.tar.xz

1 0

File maven-shared-io-1.1.tar.xz uploaded to lookaside cache by tradej
by tradej＠fedoraproject.org 24 Jan '13

24 Jan '13

A file has been added to the lookaside cache for maven-shared-io: e964fd8743a9ca0afdf58160798c43b2 maven-shared-io-1.1.tar.xz

1 0

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

24 Jan '13

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

1 0

[maven-reporting-impl] Initial commit
by tradej＠fedoraproject.org 24 Jan '13

24 Jan '13

commit a5e6bc6d83422f58a095ff0e99243ac721f6ad79 Author: Tomas Radej <tradej(a)redhat.com> Date: Thu Jan 24 09:24:34 2013 +0100 Initial commit .gitignore | 2 + maven-reporting-impl.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 3 files changed, 93 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..259e4f0 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/maven-reporting-impl-2.2.tar.xz +/LICENSE-2.0.txt diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec new file mode 100644 index 0000000..b2d69ef --- /dev/null +++ b/maven-reporting-impl.spec @@ -0,0 +1,89 @@ +Name: maven-reporting-impl +Version: 2.2 +Release: 1%{?dist} +Summary: Abstract classes to manage report generation +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-reporting-impl +# svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.2 maven-reporting-impl-2.2 +# tar caf maven-reporting-impl-2.2.tar.xz maven-reporting-impl-2.2/ +Source0: %{name}-%{version}.tar.xz +# ASL mandates that the licence file be included in redistributed source +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: junit +BuildRequires: junit-addons +BuildRequires: maven +BuildRequires: maven-surefire-provider-junit +Requires: apache-commons-validator +Requires: java +Requires: jpackage-utils +Requires: maven +Requires: maven-doxia +Requires: maven-doxia-sink-api +Requires: maven-doxia-sitetools +Requires: maven-project +Requires: maven-shared-reporting-api +Requires: plexus-utils + +Obsoletes: maven-shared-reporting-impl < %{version}-%{release} +Provides: maven-shared-reporting-impl = %{version}-%{release} + +%description +Abstract classes to manage report generation, which can be run both: + +* as part of a site generation (as a maven-reporting-api's MavenReport), +* or as a direct standalone invocation (as a maven-plugin-api's Mojo). + +This is a replacement package for maven-shared-reporting-impl + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. + + +%prep +%setup -q + +cp %{SOURCE1} LICENSE.txt + +%build +mvn-rpmbuild package javadoc:aggregate + +%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.txt +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE.txt +%doc %{_javadocdir}/%{name} + + +%changelog +* Fri Jan 11 2013 Tomas Radej <tradej(a)redhat.com> - 2.2-1 +- Initial version + diff --git a/sources b/sources index e69de29..7d52274 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +192539fc9b82a9c89b48eeed15e71179 maven-reporting-impl-2.2.tar.xz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt

1 0

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

24 Jan '13

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

1 0

File maven-reporting-impl-2.2.tar.xz uploaded to lookaside cache by tradej
by tradej＠fedoraproject.org 24 Jan '13

24 Jan '13

A file has been added to the lookaside cache for maven-reporting-impl: 192539fc9b82a9c89b48eeed15e71179 maven-reporting-impl-2.2.tar.xz

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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