[ant] Add hamcrest to ant-junit classpath
by Mikolaj Izdebski
commit 29490a37e4b3e8570fc68d862c16658e34e08f3f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 11:29:26 2015 +0100
Add hamcrest to ant-junit classpath
ant.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 9e96361..8d3cba3 100644
--- a/ant.spec
+++ b/ant.spec
@@ -36,7 +36,7 @@
Name: ant
Version: 1.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -337,7 +337,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
#install jars
-build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis hamcrest
+build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis hamcrest/core
# Fix file-not-utf8 rpmlint warning
iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
@@ -434,8 +434,8 @@ echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sy
echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
-echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
-echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
+echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
+echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
%if %with javadoc
@@ -581,6 +581,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.9.4-7
+- Add hamcrest to ant-junit classpath
+
* Mon Jan 26 2015 Michael Simacek <msimacek(a)redhat.com> - 0:1.9.4-6
- Add hamcrest into classpath
9 years, 3 months
[cobertura-maven-plugin] Fix BR on mojo-parent
by Mikolaj Izdebski
commit 73751707d342a1f38eda0505d615b6c37cdfbfe1
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 09:59:14 2015 +0100
Fix BR on mojo-parent
- Resolves: rhbz#1188794
cobertura-maven-plugin.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/cobertura-maven-plugin.spec b/cobertura-maven-plugin.spec
index f599b32..f2c0e3e 100644
--- a/cobertura-maven-plugin.spec
+++ b/cobertura-maven-plugin.spec
@@ -1,6 +1,6 @@
Name: cobertura-maven-plugin
Version: 2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugin providing the features of Cobertura within Maven
Group: Development/Libraries
@@ -29,7 +29,7 @@ BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-project)
-BuildRequires: mvn(org.codehaus.mojo:mojo-parent)
+BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(urbanophile:java-getopt)
@@ -81,6 +81,10 @@ rm -Rf src/it/mcobertura-65
%doc LICENSE
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.6-4
+- Fix BR on mojo-parent
+- Resolves: rhbz#1188794
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months
[xmvn] Update to upstream version 2.2.1
by Mikolaj Izdebski
commit e8216bbd3df0fa2eb80a1ce76a6936108341d275
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 09:00:15 2015 +0100
Update to upstream version 2.2.1
.gitignore | 1 +
sources | 2 +-
xmvn.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55daf66..af7580c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
/xmvn-2.1.0.tar.xz
/xmvn-2.1.1.tar.xz
/xmvn-2.2.0.tar.xz
+/xmvn-2.2.1.tar.xz
diff --git a/sources b/sources
index 3318800..49095e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdd4121385b202aa1dcbdf1db5d584b3 xmvn-2.2.0.tar.xz
+3efed9dced4d404ad90f88aa174df5c3 xmvn-2.2.1.tar.xz
diff --git a/xmvn.spec b/xmvn.spec
index 01b0017..452bcb8 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -3,7 +3,7 @@
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^osgi\\($
Name: xmvn
-Version: 2.2.0
+Version: 2.2.1
Release: 1%{?dist}
Summary: Local Extensions for Apache Maven
License: ASL 2.0
@@ -301,6 +301,9 @@ end
%doc LICENSE NOTICE
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.1-1
+- Update to upstream version 2.2.1
+
* Fri Jan 23 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.0-1
- Update to upstream version 2.2.0
- Add connector-gradle subpackage
9 years, 3 months
[maven-hpi-plugin] Update to upstream version 1.112
by Michal Srb
commit 00d20f0c67eab2b03e514d35bcb3c73354b49700
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Feb 4 08:39:41 2015 +0100
Update to upstream version 1.112
.gitignore | 1 +
maven-hpi-plugin.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c41b302..2431458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/maven-hpi-plugin-1.106.tar.gz
/maven-hpi-plugin-1.108.tar.gz
/maven-hpi-plugin-1.109.tar.gz
+/maven-hpi-plugin-1.112.tar.gz
diff --git a/maven-hpi-plugin.spec b/maven-hpi-plugin.spec
index 713e5de..f000594 100644
--- a/maven-hpi-plugin.spec
+++ b/maven-hpi-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-hpi-plugin
-Version: 1.109
-Release: 2%{?dist}
+Version: 1.112
+Release: 1%{?dist}
Summary: Maven plugin to build Jenkins plugins
# Project is licensed under ASL 2.0, but following
@@ -115,6 +115,9 @@ rm src/main/java/org/jenkinsci/maven/plugins/hpi/CreateMojo.java
%changelog
+* Wed Feb 04 2015 Michal Srb <msrb(a)redhat.com> - 1.112-1
+- Update to upstream version 1.112
+
* Tue Nov 18 2014 Michal Srb <msrb(a)redhat.com> - 1.109-2
- Correctly identify core plugins
diff --git a/sources b/sources
index 133fe19..4fdb882 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
0f3abd1e8ab49fa980c02e7b8e543fc3 LICENSE-MIT.txt
-6d95132f39bfab1df0b45937dcd3a72e maven-hpi-plugin-1.109.tar.gz
+909ba8f92f369ee5c58e4dba38e3a65c maven-hpi-plugin-1.112.tar.gz
9 years, 3 months
[aether] Update to upstream version 1.0.1
by Mikolaj Izdebski
commit 4902fcc8bcaba9926a1368302d596c9c3c38b45d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 07:23:04 2015 +0100
Update to upstream version 1.0.1
.gitignore | 1 +
...433953-Remove-support-for-Plexus-IoC-fram.patch | 29 +++++++++++---------
aether.spec | 9 ++++--
sources | 2 +-
4 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38b6eef..b193711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/aether-0.9.0.v20140226.tar.bz2
/aether-0.9.1.v20140329.tar.bz2
/aether-1.0.0.v20140518.tar.bz2
+/aether-1.0.1.v20141111.tar.bz2
diff --git a/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch b/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch
index 8630982..85986c7 100644
--- a/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch
+++ b/0001-Revert-Bug-433953-Remove-support-for-Plexus-IoC-fram.patch
@@ -1,6 +1,6 @@
-From 7c7d1f459729d60cc4fa96ad723fbfcefaffc9ef Mon Sep 17 00:00:00 2001
+From b74b2f6299605ec0dfca4aabb21fb3fe13844d47 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-Date: Wed, 21 May 2014 10:08:34 +0200
+Date: Wed, 4 Feb 2015 07:26:24 +0100
Subject: [PATCH] Revert "Bug 433953 - Remove support for Plexus IoC framework"
This reverts commit c5edb824e8ae5336cf10fc8cbe745a01ca760d6d.
@@ -51,7 +51,7 @@ This reverts commit c5edb824e8ae5336cf10fc8cbe745a01ca760d6d.
create mode 100644 aether-transport-http/src/test/java/org/eclipse/aether/transport/http/PlexusSupportTest.java
diff --git a/aether-connector-basic/pom.xml b/aether-connector-basic/pom.xml
-index ee208a8..08429a3 100644
+index 747f9dc..5363540 100644
--- a/aether-connector-basic/pom.xml
+++ b/aether-connector-basic/pom.xml
@@ -51,6 +51,17 @@
@@ -231,7 +231,7 @@ index 0000000..e57e508
+
+}
diff --git a/aether-impl/pom.xml b/aether-impl/pom.xml
-index 9627aff..a39794f 100644
+index cad3afd..832ed85 100644
--- a/aether-impl/pom.xml
+++ b/aether-impl/pom.xml
@@ -51,6 +51,18 @@
@@ -843,7 +843,7 @@ index 561ba8c..7bce2be 100644
throws RepositoryOfflineException
{
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
-index ccb618a..fa2cf89 100644
+index 8a54d62..7b13b3f 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
@@ -1,5 +1,5 @@
@@ -853,16 +853,16 @@ index ccb618a..fa2cf89 100644
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
-@@ -17,6 +17,8 @@ import java.util.ListIterator;
+@@ -18,6 +18,8 @@ import java.util.ListIterator;
import javax.inject.Inject;
import javax.inject.Named;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+ import org.eclipse.aether.RepositoryCache;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.impl.RemoteRepositoryManager;
- import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
-@@ -38,14 +40,18 @@ import org.eclipse.aether.util.StringUtils;
+@@ -40,6 +42,7 @@ import org.eclipse.aether.util.StringUtils;
/**
*/
@Named
@@ -870,6 +870,9 @@ index ccb618a..fa2cf89 100644
public class DefaultRemoteRepositoryManager
implements RemoteRepositoryManager, Service
{
+@@ -77,10 +80,13 @@ public class DefaultRemoteRepositoryManager
+
+ }
+ @Requirement( role = LoggerFactory.class )
private Logger logger = NullLoggerFactory.LOGGER;
@@ -881,7 +884,7 @@ index ccb618a..fa2cf89 100644
private ChecksumPolicyProvider checksumPolicyProvider;
public DefaultRemoteRepositoryManager()
-@@ -75,6 +81,12 @@ public class DefaultRemoteRepositoryManager
+@@ -110,6 +116,12 @@ public class DefaultRemoteRepositoryManager
return this;
}
@@ -1616,7 +1619,7 @@ index 0000000..26324ef
+
+}
diff --git a/aether-transport-classpath/pom.xml b/aether-transport-classpath/pom.xml
-index b980591..8d7dc0e 100644
+index 41d0506..c7775cb 100644
--- a/aether-transport-classpath/pom.xml
+++ b/aether-transport-classpath/pom.xml
@@ -51,6 +51,17 @@
@@ -1746,7 +1749,7 @@ index 0000000..c984df6
+
+}
diff --git a/aether-transport-file/pom.xml b/aether-transport-file/pom.xml
-index 35bf5b1..0d4a252 100644
+index 40a2190..2a30814 100644
--- a/aether-transport-file/pom.xml
+++ b/aether-transport-file/pom.xml
@@ -51,6 +51,17 @@
@@ -1872,7 +1875,7 @@ index 0000000..f579995
+
+}
diff --git a/aether-transport-http/pom.xml b/aether-transport-http/pom.xml
-index feb9adb..c911c0e 100644
+index e86dcc7..e7432ea 100644
--- a/aether-transport-http/pom.xml
+++ b/aether-transport-http/pom.xml
@@ -68,6 +68,17 @@
@@ -2043,5 +2046,5 @@ index 5d91358..be57919 100644
* Sets the wagon provider to use to acquire and release wagon instances.
*
--
-1.9.0
+2.1.0
diff --git a/aether.spec b/aether.spec
index 6799256..3e73b12 100644
--- a/aether.spec
+++ b/aether.spec
@@ -1,9 +1,9 @@
-%global vertag v20140518
+%global vertag v20141111
Name: aether
Epoch: 1
-Version: 1.0.0
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
Summary: Library to resolve, install and deploy artifacts the Maven way
License: EPL
URL: http://eclipse.org/aether
@@ -182,6 +182,9 @@ rm -rf aether-transport-http/src/test
%doc epl-v10.html notice.html
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.1-1
+- Update to upstream version 1.0.1
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 8570003..b0f865d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abc98e42c2df50436728e721bd56cdbe aether-1.0.0.v20140518.tar.bz2
+512224326be56bac3caf9780224311b8 aether-1.0.1.v20141111.tar.bz2
9 years, 3 months