[glassfish-servlet-api] Add alias for Geronimo servlet API
by Mikolaj Izdebski
commit e4ca28e2659f8eb44e7b379c3ad04176411be070
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 12:21:29 2014 +0200
Add alias for Geronimo servlet API
glassfish-servlet-api.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/glassfish-servlet-api.spec b/glassfish-servlet-api.spec
index a7305eb..8906bbd 100644
--- a/glassfish-servlet-api.spec
+++ b/glassfish-servlet-api.spec
@@ -2,7 +2,7 @@
Name: glassfish-servlet-api
Version: 3.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java Servlet API
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://servlet-spec.java.net
@@ -41,6 +41,7 @@ cp -p src/main/resources/META-INF/README .
%build
%mvn_alias : javax.servlet:servlet-api
+%mvn_alias : org.apache.geronimo.specs:geronimo-servlet_3.0_spec
%mvn_build
%install
@@ -53,6 +54,9 @@ cp -p src/main/resources/META-INF/README .
%doc LICENSE-2.0.txt README
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-6
+- Add alias for Geronimo servlet API
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[felix-utils] Add build-requires on mockito
by Mikolaj Izdebski
commit 2e510e5973f6dbc3aa4f606bcb2925dac4502c26
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 12:13:47 2014 +0200
Add build-requires on mockito
felix-utils.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/felix-utils.spec b/felix-utils.spec
index 1b64acb..3a2d7e2 100644
--- a/felix-utils.spec
+++ b/felix-utils.spec
@@ -2,7 +2,7 @@
Name: felix-utils
Version: 1.2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Utility classes for OSGi
License: ASL 2.0
URL: http://felix.apache.org
@@ -14,6 +14,7 @@ BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
BuildRequires: mvn(org.osgi:org.osgi.compendium)
BuildRequires: mvn(org.osgi:org.osgi.core)
+BuildRequires: mvn(org.mockito:mockito-core)
Requires: java-headless
@@ -50,6 +51,9 @@ This package contains the API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2.0-8
+- Add build-requires on mockito
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[maven-project-info-reports-plugin] Port to Doxia 1.6
by Mikolaj Izdebski
commit dead6664c70f9dadf952f7325de101826e0f1725
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 12:10:04 2014 +0200
Port to Doxia 1.6
0001-Update-to-Doxia-1.6.patch | 53 ++++++++++++++++++++++++++++++++
maven-project-info-reports-plugin.spec | 8 ++++-
2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/0001-Update-to-Doxia-1.6.patch b/0001-Update-to-Doxia-1.6.patch
new file mode 100644
index 0000000..684ae1b
--- /dev/null
+++ b/0001-Update-to-Doxia-1.6.patch
@@ -0,0 +1,53 @@
+From 23c8a39366924ba79ba9a78169d815458287ca62 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 4 Aug 2014 12:09:11 +0200
+Subject: [PATCH] Update to Doxia 1.6
+
+---
+ pom.xml | 4 ++--
+ .../apache/maven/report/projectinfo/AbstractProjectInfoReport.java | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c3a9070..0f56748 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -108,8 +108,8 @@ under the License.
+ </distributionManagement>
+
+ <properties>
+- <doxiaVersion>1.4</doxiaVersion>
+- <doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion>
++ <doxiaVersion>1.6</doxiaVersion>
++ <doxia-sitetoolsVersion>1.6</doxia-sitetoolsVersion>
+ <mavenVersion>2.2.1</mavenVersion>
+ <wagonVersion>1.0</wagonVersion>
+ <scmVersion>1.8</scmVersion>
+diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+index 12b49cc..a1cddd1 100644
+--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
++++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+@@ -23,11 +23,11 @@ import org.apache.maven.artifact.Artifact;
+ import org.apache.maven.artifact.factory.ArtifactFactory;
+ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.artifact.resolver.ArtifactResolver;
+-import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.site.decoration.Body;
+ import org.apache.maven.doxia.site.decoration.DecorationModel;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
++import org.apache.maven.doxia.siterenderer.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.doxia.tools.SiteTool;
+@@ -50,7 +50,6 @@ import org.codehaus.plexus.util.IOUtil;
+ import org.codehaus.plexus.util.StringUtils;
+ import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+-
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
+--
+1.9.3
+
diff --git a/maven-project-info-reports-plugin.spec b/maven-project-info-reports-plugin.spec
index 055727e..02eacd3 100644
--- a/maven-project-info-reports-plugin.spec
+++ b/maven-project-info-reports-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-project-info-reports-plugin
Version: 2.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven Project Info Reports Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-project-info-reports-plugin/
@@ -8,6 +8,8 @@ BuildArch: noarch
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: 0001-Update-to-Doxia-1.6.patch
+
BuildRequires: maven-local
BuildRequires: mvn(commons-validator:commons-validator)
BuildRequires: mvn(joda-time:joda-time)
@@ -69,6 +71,7 @@ API documentation for %{name}.
%prep
%setup -q -c
mv %{name}-%{version}/* .
+%patch0 -p1
# removed cvsjava provider since we don't support it anymore
%pom_remove_dep :maven-scm-provider-cvsjava
@@ -83,6 +86,9 @@ mv %{name}-%{version}/* .
%files javadoc -f .mfiles-javadoc
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.7-6
+- Port to Doxia 1.6
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[maven-changes-plugin] Port to Doxia 1.6
by Mikolaj Izdebski
commit 81df284ef73a56654294fa8e60855249d85f9b04
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 12:03:29 2014 +0200
Port to Doxia 1.6
0001-Remove-dependency-on-velocity-tools.patch | 12 +++---
0002-Update-to-Doxia-1.6.patch | 46 ++++++++++++++++++++++++
maven-changes-plugin.spec | 7 +++-
3 files changed, 58 insertions(+), 7 deletions(-)
---
diff --git a/0001-Remove-dependency-on-velocity-tools.patch b/0001-Remove-dependency-on-velocity-tools.patch
index 7b4680e..0010ff7 100644
--- a/0001-Remove-dependency-on-velocity-tools.patch
+++ b/0001-Remove-dependency-on-velocity-tools.patch
@@ -1,21 +1,21 @@
-From 540698d645c4e2646c9f6b2317dc3cf71005a892 Mon Sep 17 00:00:00 2001
+From 14f3c6586d9c476404a3c0c16e5a095b4ba866ad Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb(a)redhat.com>
Date: Wed, 10 Apr 2013 09:00:22 +0200
-Subject: [PATCH] Remove dependency on velocity-tools
+Subject: [PATCH 1/2] Remove dependency on velocity-tools
---
.../java/org/apache/maven/plugin/announcement/AnnouncementMojo.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
-index 06d4575..33af611 100644
+index 06d4575..0f7cd2b 100644
--- a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
+++ b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
@@ -50,9 +50,9 @@ import org.apache.maven.settings.Settings;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
-+import org.apache.velocity.VelocityContext;
++import org.apache.velocity.VelocityContext;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.tools.ToolManager;
@@ -28,10 +28,10 @@ index 06d4575..33af611 100644
{
- ToolManager toolManager = new ToolManager( true );
- Context context = toolManager.createContext();
-+ Context context = new VelocityContext();
++ Context context = new VelocityContext();
if ( getIntroduction() == null || getIntroduction().equals( "" ) )
{
--
-1.8.1.4
+1.9.3
diff --git a/0002-Update-to-Doxia-1.6.patch b/0002-Update-to-Doxia-1.6.patch
new file mode 100644
index 0000000..1b2fafd
--- /dev/null
+++ b/0002-Update-to-Doxia-1.6.patch
@@ -0,0 +1,46 @@
+From 29d76b6f385918446b0b680b97fd6bb275960d91 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 4 Aug 2014 11:54:55 +0200
+Subject: [PATCH 2/2] Update to Doxia 1.6
+
+---
+ pom.xml | 4 ++--
+ .../java/org/apache/maven/plugin/changes/AbstractChangesReport.java | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 02f08da..7d68cb2 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -60,8 +60,8 @@ under the License.
+ </issueManagement>
+
+ <properties>
+- <doxiaVersion>1.2</doxiaVersion>
+- <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
++ <doxiaVersion>1.6</doxiaVersion>
++ <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
+ <mavenVersion>2.2.1</mavenVersion>
+ <sitePluginVersion>3.1</sitePluginVersion>
+ <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
+diff --git a/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java b/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
+index 8f23a22..e7a19ec 100644
+--- a/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
++++ b/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
+@@ -28,12 +28,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+ import org.apache.maven.artifact.resolver.ArtifactResolver;
+ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+ import org.apache.maven.artifact.versioning.VersionRange;
+-import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.site.decoration.Body;
+ import org.apache.maven.doxia.site.decoration.DecorationModel;
+ import org.apache.maven.doxia.site.decoration.Skin;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
++import org.apache.maven.doxia.siterenderer.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.plugin.MojoExecutionException;
+--
+1.9.3
+
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index b49a9fa..17dbb9d 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changes-plugin
Version: 2.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries
@@ -8,6 +8,7 @@ License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: 0001-Remove-dependency-on-velocity-tools.patch
+Patch1: 0002-Update-to-Doxia-1.6.patch
BuildArch: noarch
@@ -70,6 +71,7 @@ API documentation for %{name}.
# remove dependency on velocity-tools
%patch0 -p1
+%patch1 -p1
%pom_remove_dep :velocity-tools
# Javamail is provided by JDK
@@ -100,6 +102,9 @@ rm -rf src/main/java/org/apache/maven/plugin/github
%doc LICENSE NOTICE
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.8-9
+- Port to Doxia 1.6
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[maven-reporting-impl] Port to Doxia 1.6
by Mikolaj Izdebski
commit c1d96424cd17be0cb16ed715727d52f5fa698491
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 10:31:58 2014 +0200
Port to Doxia 1.6
0001-Update-to-Doxia-1.6.patch | 42 ++++++++++++++++++++++++++++++++++++++++
maven-reporting-impl.spec | 6 +++++
2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/0001-Update-to-Doxia-1.6.patch b/0001-Update-to-Doxia-1.6.patch
new file mode 100644
index 0000000..6e870c7
--- /dev/null
+++ b/0001-Update-to-Doxia-1.6.patch
@@ -0,0 +1,42 @@
+From 482abdc1f3887cc9a0f71888fc30bd50547b527a Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 4 Aug 2014 10:31:15 +0200
+Subject: [PATCH] Update to Doxia 1.6
+
+---
+ pom.xml | 2 +-
+ src/main/java/org/apache/maven/reporting/AbstractMavenReport.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index ba0fb78..b880637 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,7 +58,7 @@
+
+ <properties>
+ <mavenVersion>2.2.1</mavenVersion>
+- <doxiaVersion>1.2</doxiaVersion>
++ <doxiaVersion>1.6</doxiaVersion>
+ </properties>
+
+ <dependencies>
+diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+index ba44b38..ae6b921 100644
+--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
++++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+@@ -21,10 +21,10 @@ package org.apache.maven.reporting;
+
+ import org.apache.maven.doxia.sink.Sink;
+ import org.apache.maven.doxia.sink.SinkFactory;
+-import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.site.decoration.DecorationModel;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
++import org.apache.maven.doxia.siterenderer.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.plugin.AbstractMojo;
+--
+1.9.3
+
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index 754d0d5..e6230eb 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -9,6 +9,10 @@ URL: http://maven.apache.org/shared/maven-reporting-impl
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
+
+# Forwarded upstream: http://jira.codehaus.org/browse/MSHARED-344
+Patch0: 0001-Update-to-Doxia-1.6.patch
+
BuildArch: noarch
BuildRequires: maven-local
@@ -43,6 +47,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
cp -p %{SOURCE1} LICENSE.txt
%build
@@ -61,6 +66,7 @@ cp -p %{SOURCE1} LICENSE.txt
%changelog
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-11
- Fix build-requires on parent POM
+- Port to Doxia 1.6
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[maven-shared-jar] Fix build-requires on maven-shared
by Mikolaj Izdebski
commit 4e017fdf5dabd42feac1ae42d4481fbdd20740d0
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Aug 1 09:53:29 2014 +0200
Fix build-requires on maven-shared
maven-shared-jar.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-shared-jar.spec b/maven-shared-jar.spec
index b03c1df..5798275 100644
--- a/maven-shared-jar.spec
+++ b/maven-shared-jar.spec
@@ -1,6 +1,6 @@
Name: maven-shared-jar
Version: 1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
# Maven-shared defines maven-shared-jar version as 1.1
Epoch: 1
Summary: Maven JAR Utilities
@@ -13,7 +13,7 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(commons-collections:commons-collections)
BuildRequires: mvn(org.apache.bcel:bcel)
-BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
@@ -64,6 +64,9 @@ find -name 'pom.xml' -exec sed \
%changelog
+* Fri Aug 1 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.1-8
+- Fix build-requires on maven-shared
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[plexus-compiler] Fix build-requires on POM packages
by Mikolaj Izdebski
commit 286c2b51b97a77ce65d7ac48ca21605dcbd1e483
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 07:15:59 2014 +0200
Fix build-requires on POM packages
plexus-compiler.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index 62544c8..e83e416 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -20,9 +20,9 @@ BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.plugins:maven-gpg-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api)
-BuildRequires: mvn(org.codehaus.plexus:plexus-compilers)
+BuildRequires: mvn(org.codehaus.plexus:plexus-compilers:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires: mvn(org.codehaus.plexus:plexus-components)
+BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.tycho:org.eclipse.jdt.core)
@@ -96,7 +96,7 @@ cp %{SOURCE2} LICENSE.MIT
%changelog
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.3-6
-- Fix build-requires on plexus-compiler-pom
+- Fix build-requires on POM packages
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[xstream] Fix build-requires on codehaus-parent
by Mikolaj Izdebski
commit c5293629d44b0bfaf3f927e97e675ffbdbb2aeb8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 07:14:07 2014 +0200
Fix build-requires on codehaus-parent
xstream.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/xstream.spec b/xstream.spec
index b55b57a..22c1eba 100644
--- a/xstream.spec
+++ b/xstream.spec
@@ -32,7 +32,7 @@
Name: xstream
Version: 1.4.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java XML serialization library
License: BSD
URL: http://xstream.codehaus.org/
@@ -51,7 +51,7 @@ BuildRequires: mvn(net.sf.kxml:kxml2)
BuildRequires: mvn(net.sf.kxml:kxml2-min)
BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires: mvn(org.codehaus:codehaus-parent)
+BuildRequires: mvn(org.codehaus:codehaus-parent:pom:)
BuildRequires: mvn(org.codehaus.jettison:jettison)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
@@ -181,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir)
%doc LICENSE.txt
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.4.7-6
+- Fix build-requires on codehaus-parent
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[woodstox-core] Remove build-requires on jvnet-parent
by Mikolaj Izdebski
commit 48b04d3b7917514ac9c482b69176af9f00374d0d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 07:12:02 2014 +0200
Remove build-requires on jvnet-parent
woodstox-core.spec | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/woodstox-core.spec b/woodstox-core.spec
index 4d405d2..d4fff87 100644
--- a/woodstox-core.spec
+++ b/woodstox-core.spec
@@ -4,7 +4,7 @@
Name: %{core_name}
Version: 4.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: High-performance XML processor
License: ASL 2.0 or LGPLv2+ or BSD
URL: http://%{base_name}.codehaus.org/
@@ -19,9 +19,6 @@ BuildRequires: mvn(net.java.dev.msv:msv-core)
BuildRequires: mvn(net.java.dev.msv:xsdlib)
BuildRequires: mvn(org.apache.felix:org.osgi.core)
BuildRequires: mvn(org.codehaus.woodstox:stax2-api)
-# Transitive devel dependencies needed because some packages don't
-# install effective POMs:
-BuildRequires: mvn(net.java:jvnet-parent)
%description
Woodstox is a high-performance validating namespace-aware StAX-compliant
@@ -83,6 +80,9 @@ rm -rf src/test/stax2
%doc release-notes/asl release-notes/lgpl release-notes/bsd
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-6
+- Remove build-requires on jvnet-parent
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[testng] Fix build-requires on sonatype-oss-parent
by Mikolaj Izdebski
commit b82a4af215cceb277f25e6afc6faa874dfc0ad1b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 07:09:41 2014 +0200
Fix build-requires on sonatype-oss-parent
testng.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/testng.spec b/testng.spec
index fa75b1b..0c7ecdd 100644
--- a/testng.spec
+++ b/testng.spec
@@ -3,7 +3,7 @@
Name: testng
Version: 6.8.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java-based testing framework
# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
License: ASL 2.0 and CPL
@@ -20,7 +20,7 @@ BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.beanshell:bsh)
-BuildRequires: mvn(org.sonatype.oss:oss-parent)
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: mvn(org.yaml:snakeyaml)
BuildRequires: maven-local
@@ -85,6 +85,9 @@ mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt
%doc LICENSE.txt
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 6.8.8-3
+- Fix build-requires on sonatype-oss-parent
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months