[plexus-compiler/update-to-version-2.x] Update to upstream version 2.2
by Michal Srb
commit 4f7059a91f28d46f50ece15ffab7341bcd5b840f
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Mar 5 10:47:23 2013 +0100
Update to upstream version 2.2
plexus-compiler.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index cdf14f3..3b1f1eb 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -32,8 +32,8 @@
%global dirhash 16e340d
Name: plexus-compiler
-Version: 2.1
-Release: 3%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Epoch: 0
Summary: Compiler call initiators for Plexus
# extras subpackage has a bit different licensing
@@ -110,6 +110,9 @@ API documentation for %{name}.
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Mar 05 2013 Michal Srb <msrb(a)redhat.com> - 0:2.2-1
+- Update to upstream version 2.2
+
* Tue Mar 05 2013 Michal Srb <msrb(a)redhat.com> - 0:2.1-3
- Remove auxiliary aliases
diff --git a/sources b/sources
index 21ec3cf..fe2122c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5a2e177eda83ad4b70488f6d4b93a3b plexus-compiler-2.1.tar.gz
+9e082787775c08ba4a7e44dbff92c64d plexus-compiler-2.2.tar.gz
11 years, 2 months
[plexus-compiler/update-to-version-2.x] Remove auxiliary aliases
by Michal Srb
commit 6facf154a8c7e159cfd4468d5b65eada7cb2774c
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Mar 5 10:05:37 2013 +0100
Remove auxiliary aliases
plexus-compiler.spec | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 4cd069f..cdf14f3 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -33,7 +33,7 @@
Name: plexus-compiler
Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Compiler call initiators for Plexus
# extras subpackage has a bit different licensing
@@ -94,9 +94,6 @@ API documentation for %{name}.
%pom_disable_module plexus-compiler-test
%build
-# temporary solution only
-%mvn_alias ":{*}" :@1-temp
-
%mvn_package ":plexus-compiler{,s}" pom
%mvn_package ":*{csharp,eclipse,jikes}*" extras
# Tests are skipped because of unavailable plexus-compiler-test artifact
@@ -113,6 +110,9 @@ API documentation for %{name}.
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Mar 05 2013 Michal Srb <msrb(a)redhat.com> - 0:2.1-3
+- Remove auxiliary aliases
+
* Tue Mar 05 2013 Michal Srb <msrb(a)redhat.com> - 0:2.1-2
- Build with original POM files
11 years, 2 months
[maven-compiler-plugin/update-to-version-3.x] Build against proper plexus-compiler
by Michal Srb
commit f200eda5283e5853b3b63d30123928eb225a84ee
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 4 17:32:55 2013 +0100
Build against proper plexus-compiler
...-against-newer-version-of-plexus-compiler.patch | 43 --------------------
maven-compiler-plugin.spec | 8 ++--
2 files changed, 4 insertions(+), 47 deletions(-)
---
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index e9f8c01..f9d7f10 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,13 +1,12 @@
Name: maven-compiler-plugin
Version: 3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Compiler Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-compiler-plugin
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: 0001-Build-against-newer-version-of-plexus-compiler.patch
BuildArch: noarch
@@ -37,8 +36,6 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
-
%build
%mvn_build -f
@@ -52,6 +49,9 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Tue Mar 05 2013 Michal Srb <msrb(a)redhat.com> - 3.0-2
+- Build against proper plexus-compiler
+
* Tue Jan 15 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0-1
- Update to upstream version 3.0
- Build with xmvn
11 years, 2 months
[plexus-compiler/update-to-version-2.x] Bump release version
by Michal Srb
commit 4c98fedefd3a18f97450d85d7691d7a664d86d3e
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Mar 5 08:51:48 2013 +0100
Bump release version
plexus-compiler.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index fa633ca..4cd069f 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -33,7 +33,7 @@
Name: plexus-compiler
Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Compiler call initiators for Plexus
# extras subpackage has a bit different licensing
@@ -113,6 +113,9 @@ API documentation for %{name}.
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Mar 05 2013 Michal Srb <msrb(a)redhat.com> - 0:2.1-2
+- Build with original POM files
+
* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.1-1
- Update to upstream version 2.1
- Build with xmvn
11 years, 2 months
[cobertura-maven-plugin] Initial import (#914005)
by Michal Srb
commit c1910a2f0315f51077413aa521e42c2c87ce1f12
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Mar 5 08:28:29 2013 +0100
Initial import (#914005)
.gitignore | 2 +
cobertura-maven-plugin.spec | 136 +++++++++++++++++++++++++++++++++++++++++++
sources | 2 +
3 files changed, 140 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..a4dbdcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/cobertura-maven-plugin-2.5.2-source-release.zip
+/LICENSE-2.0.txt
diff --git a/cobertura-maven-plugin.spec b/cobertura-maven-plugin.spec
new file mode 100644
index 0000000..6952378
--- /dev/null
+++ b/cobertura-maven-plugin.spec
@@ -0,0 +1,136 @@
+Name: cobertura-maven-plugin
+Version: 2.5.2
+Release: 2%{?dist}
+Summary: Plugin providing the features of Cobertura within Maven
+
+Group: Development/Libraries
+# the project is under ASL 2.0 license
+# javascript files in src/site/resources/sample-maven-shared-io-report/js/
+# are under GPLv2 and GPLv2+
+License: ASL 2.0 and GPLv2 and GPLv2+
+URL: http://mojo.codehaus.org/cobertura-maven-plugin/
+Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name...
+Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
+BuildArch: noarch
+
+BuildRequires: maven-local
+BuildRequires: jpackage-utils
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-invoker-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: gnu-getopt >= 0:1.0.13
+BuildRequires: cobertura
+BuildRequires: mojo-parent
+
+Requires: maven
+Requires: cobertura
+Requires: mojo-parent
+Requires: jpackage-utils
+
+Provides: maven-plugin-cobertura = %{version}-%{release}
+Obsoletes: maven-plugin-cobertura < 2.5.2-1
+
+%description
+This plugin provides the features of Cobertura within the Maven 2 & 3
+environment. The report generated by this plugin is the result of executing
+the Cobertura tool against your compiled classes to help you determine
+how well the unit testing efforts have been, and can then be used to identify
+which parts of your Java program are lacking test coverage.
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{name}-%{version}
+cp %{SOURCE1} LICENSE
+
+# we don't have this extension
+%pom_xpath_remove "pom:extension[pom:artifactId[text()='wagon-webdav-jackrabbit']]"
+
+# remove bundled .class files
+find . -name *.class -delete
+
+%build
+# tests are disabled because of missing dependencies
+mvn-rpmbuild -Dmaven.test.skip=true package javadoc:aggregate
+
+%install
+# jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -p -m 644 target/%{name}-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -p -m 644 pom.xml \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%files
+%doc LICENSE
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/*
+
+%files javadoc
+%doc LICENSE
+%{_javadocdir}/%{name}
+
+%changelog
+* Thu Feb 28 2013 Michal Srb <msrb(a)redhat.com> - 2.5.2-2
+- Missing R: jpackage-utils
+
+* Thu Feb 21 2013 Michal Srb - 2.5.2-1
+- Package rename (was maven-plugin-cobertura)
+- Update to upstream 2.5.2 version
+- Spec file clean up
+- Add license file
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 2.5.1-5
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Tue Aug 21 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.5.1-4
+- Don't own _mavenfragdir
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.5.1-1
+- Update to upstream 2.5.1 version.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.4-1
+- Update to 2.4.
+- Adapt to current guidelines.
+
+* Thu Sep 10 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-3
+- Fix license and changelog.
+- Add comment for patch.
+
+* Thu Sep 10 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-2
+- Fix Summary.
+- Drop maven2-common-poms BR and add versioned BR to gnu-getopt
+
+* Mon Sep 7 2009 Milos Jakubicek <xjakub(a)fi.muni.cz> - 2.3-1
+- Initial release
diff --git a/sources b/sources
index e69de29..bb3bb8a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+f5264caa65502578d2e58846a4665536 cobertura-maven-plugin-2.5.2-source-release.zip
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
11 years, 2 months
[plexus-compiler/update-to-version-2.x] Build with original POM files
by Michal Srb
commit 7d924ae5803e36fbfb2868991e08a11889a1e009
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Mar 4 17:27:55 2013 +0100
Build with original POM files
- with aliases to temporarily created artifact IDs
0001-change-artifactIds.patch | 184 -----------------------------------------
plexus-compiler.spec | 34 +-------
2 files changed, 4 insertions(+), 214 deletions(-)
---
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 5eb8980..fa633ca 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -43,7 +43,6 @@ Group: Development/Java
URL: http://plexus.codehaus.org/
Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%...
-Patch0: 0001-change-artifactIds.patch
BuildArch: noarch
BuildRequires: maven-local
@@ -89,16 +88,16 @@ API documentation for %{name}.
%prep
%setup -q -n sonatype-plexus-compiler-%{dirhash}
-%patch0 -p1
-
%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
# don't build/install compiler-test module, it needs maven2 test harness
%pom_disable_module plexus-compiler-test
%build
-%mvn_package ":plexus-compiler-temp" pom
-%mvn_package ":plexus-compilers-temp" pom
+# temporary solution only
+%mvn_alias ":{*}" :@1-temp
+
+%mvn_package ":plexus-compiler{,s}" pom
%mvn_package ":*{csharp,eclipse,jikes}*" extras
# Tests are skipped because of unavailable plexus-compiler-test artifact
%mvn_build -f
@@ -106,32 +105,7 @@ API documentation for %{name}.
%install
%mvn_install
-# only temporary solution
-# we need to preserve older JARs and POMs for a while, because current maven-compiler-plugin
-# won't work with this newer version of plexus-compiler and we can't update maven-compiler-plugin
-# because it requires this newer version of plexus-compiler.
-# thus temporarly we need both versions of plexus-compiler
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-cp /usr/share/java/plexus/compiler-api.jar %{buildroot}/usr/share/java/plexus/compiler-api.jar
-cp /usr/share/java/plexus/compiler-javac.jar %{buildroot}/usr/share/java/plexus/compiler-javac.jar
-cp /usr/share/java/plexus/compiler-manager.jar %{buildroot}/usr/share/java/plexus/compiler-manager.jar
-cp /usr/share/java/plexus/compiler-csharp.jar %{buildroot}/usr/share/java/plexus/compiler-csharp.jar
-cp /usr/share/java/plexus/compiler-eclipse.jar %{buildroot}/usr/share/java/plexus/compiler-eclipse.jar
-cp /usr/share/java/plexus/compiler-jikes.jar %{buildroot}/usr/share/java/plexus/compiler-jikes.jar
-cp /usr/share/maven-poms/JPP.plexus-compiler-api.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-api.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-javac.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-javac.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-manager.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-manager.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compiler.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compiler.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compilers.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-org.codehaus.plexus(a)plexus-compilers.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-csharp.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-csharp.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-eclipse.pom
-cp /usr/share/maven-poms/JPP.plexus-compiler-jikes.pom %{buildroot}/usr/share/maven-poms/JPP.plexus-compiler-jikes.pom
-cp /usr/share/maven-fragments/plexus-compiler.xml %{buildroot}/usr/share/maven-fragments/plexus-compiler-orig.xml
-
%files -f .mfiles
-%{_javadir}/plexus/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
%files extras -f .mfiles-extras
%files pom -f .mfiles-pom
11 years, 2 months
