[maven-shared-utils/f19] Sources
by tradej@fedoraproject.org
commit ca71b0e24400e31bf8f0d34aeceb1ad03150bf0b
Author: Tomas Radej <tradej(a)redhat.com>
Date: Fri May 3 15:48:23 2013 +0200
Sources
.gitignore | 1 +
sources | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ff20ab..5f78f50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/maven-shared-utils-0.2-source-release.zip
/maven-shared-utils-0.3-source-release.zip
+/maven-shared-utils-0.4-source-release.zip
diff --git a/sources b/sources
index f5e9235..65db798 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-88a9574a1df90bb6f2fcdd7bcafe882b maven-shared-utils-0.2-source-release.zip
-748fd7e4c1b8f8e1cf2c57f25a7aa4e5 maven-shared-utils-0.3-source-release.zip
+19eae55f89777e7f89b4b31537e32c4d maven-shared-utils-0.4-source-release.zip
10 years, 11 months
[hibernate/f19] fix broken deps references
by gil
commit 952686078731ca94ce39a704ea04d2ce69575a26
Author: gil <puntogil(a)libero.it>
Date: Fri May 3 15:13:48 2013 +0200
fix broken deps references
hibernate.spec | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/hibernate.spec b/hibernate.spec
index a9c4278..c4ff331 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -315,6 +315,14 @@ rm -r hibernate-c3p0/src/test/java/org \
hibernate-infinispan/src/test/java/org \
hibernate-proxool/src/test/java/org
+sed -i "s|jboss-logging:3.1.0.GA|jboss-logging/jboss-logging:3.1.0.GA|" libraries.gradle
+sed -i "s|mchange-commons|mchange-commons-java|" hibernate-c3p0/hibernate-c3p0.gradle
+# require maven2/empty.jar for empty commons-logging:commons-logging:99.0-does-not-exist
+sed -i "s|jcl_api:|//jcl_api:|" libraries.gradle
+sed -i "s|jcl:|//jcl:|" libraries.gradle
+sed -i "s|testRuntime( libraries.jcl_api )|//testRuntime( libraries.jcl_api )|" build.gradle
+sed -i "s|testRuntime( libraries.jcl )|//testRuntime( libraries.jcl )|" build.gradle
+
%build
unset JAVA_HOME
10 years, 11 months
[maven-shared-utils/f19] Updated to latest upstream version
by tradej@fedoraproject.org
commit 2d2a34f7ada956d13ed8aa786d137137e33b8128
Author: Tomas Radej <tradej(a)redhat.com>
Date: Fri May 3 14:44:37 2013 +0200
Updated to latest upstream version
- Fixed and reenabled tests
maven-shared-utils-tests.patch | 94 ++++++++++++++++++++++++++++++++++++++++
maven-shared-utils.spec | 15 +++++--
2 files changed, 105 insertions(+), 4 deletions(-)
---
diff --git a/maven-shared-utils-tests.patch b/maven-shared-utils-tests.patch
new file mode 100644
index 0000000..214108d
--- /dev/null
+++ b/maven-shared-utils-tests.patch
@@ -0,0 +1,94 @@
+diff --git a/pom.xml b/pom.xml
+index e12f7e6..bb0745f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -56,7 +56,7 @@
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>4.9</version>
++ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+diff --git a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
+index 298cb70..b032da9 100644
+--- a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
++++ b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
+@@ -73,6 +73,7 @@ public class ExpandTest
+ * @return
+ */
+ private File getTestTargetDir()
++ throws Exception
+ {
+ return tempFolder.newFolder( TEST_ZIP_TARGET_FOLDER );
+ }
+diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
+index 6d8cca3..e9e2ca5 100644
+--- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
++++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
+@@ -25,6 +25,7 @@ import java.lang.reflect.Constructor;
+
+ import static org.hamcrest.CoreMatchers.*;
+ import static org.junit.Assert.assertThat;
++import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
+
+ import static org.apache.maven.shared.utils.testhelpers.ExceptionHelper.*;
+@@ -116,8 +117,8 @@ public class ReflectorTest
+ public void newInstancePublicConstructor()
+ throws Exception
+ {
+- assertThat( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } ),
+- is( ReflectorTestHelper.class ) );
++ assertTrue( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } )
++ instanceof ReflectorTestHelper );
+ }
+
+ @Test( expected = NullPointerException.class )
+@@ -222,8 +223,8 @@ public class ReflectorTest
+ public void getSingletonPublicMethod()
+ throws Exception
+ {
+- assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } ),
+- is( ReflectorTestHelper.class ) );
++ assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } )
++ instanceof ReflectorTestHelper );
+ }
+
+ @Test( expected = NullPointerException.class )
+@@ -252,8 +253,8 @@ public class ReflectorTest
+ public void getSingletonNonStaticMethod()
+ throws Exception
+ {
+- assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } ),
+- is( ReflectorTestHelper.class ) );
++ assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } )
++ instanceof ReflectorTestHelper );
+ }
+
+ //// invoke( Object, String, Object[] )
+@@ -866,8 +867,8 @@ public class ReflectorTest
+ public void invokeStaticPublicMethod()
+ throws Exception
+ {
+- assertThat( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } ),
+- is( ReflectorTestHelper.class ) );
++ assertTrue( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } )
++ instanceof ReflectorTestHelper );
+ }
+
+ @Test( expected = NullPointerException.class )
+@@ -896,9 +897,9 @@ public class ReflectorTest
+ public void invokeStaticNonStaticMethod()
+ throws Exception
+ {
+- assertThat(
+- reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } ),
+- is( ReflectorTestHelper.class ) );
++ assertTrue(
++ reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } )
++ instanceof ReflectorTestHelper );
+ }
+
+ //// getConstructor( Class, Class[] )
diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec
index a33bea3..cc03216 100644
--- a/maven-shared-utils.spec
+++ b/maven-shared-utils.spec
@@ -1,10 +1,13 @@
Name: maven-shared-utils
-Version: 0.3
-Release: 2%{?dist}
+Version: 0.4
+Release: 1%{?dist}
Summary: Maven shared utility classes
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-shared-utils
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/...
+# Patching tests so that they are compatible with JUnit 4.11
+# (upstream bug http://jira.codehaus.org/browse/MSHARED-285)
+Patch0: %{name}-tests.patch
BuildArch: noarch
@@ -30,10 +33,10 @@ API documentation for %{name}.
%prep
%setup -q
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+%patch0 -p1
%build
-# tests don't work with junit >= 4.11
-%mvn_build -f
+%mvn_build
%install
%mvn_install
@@ -45,6 +48,10 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Mon Apr 22 2013 Tomas Radej <tradej(a)redhat.com> - 0.4-1
+- Updated to latest upstream version
+- Fixed and reenabled tests
+
* Mon Apr 08 2013 Michal Srb <msrb(a)redhat.com> - 0.3-2
- Disable tests (they don't work with junit >= 4.11)
10 years, 11 months
[apache-commons-codec/f19] Update to 1.8, rhbz #957598
by Mat Booth
commit e17c8a396a07a3811df7304acfa85040450e23d4
Author: Mat Booth <fedora(a)matbooth.co.uk>
Date: Fri May 3 13:41:07 2013 +0100
Update to 1.8, rhbz #957598
.gitignore | 1 +
apache-commons-codec.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ecff87..193c3e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/.project
/commons-codec-1.7-src.tar.gz
+/commons-codec-1.8-src.tar.gz
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 55b3c66..9729d7a 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.7
-Release: 5%{?dist}
+Version: 1.8
+Release: 1%{?dist}
Summary: Implementations of common encoders and decoders
Group: Development/Libraries
License: ASL 2.0
@@ -90,6 +90,9 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%{_javadocdir}/%{name}
%changelog
+* Fri May 03 2013 Mat Booth <fedora(a)matbooth.co.uk> - 1.8-1
+- Update to 1.8, rhbz #957598
+
* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.7-5
- Remove unneeded BR: maven-idea-plugin
diff --git a/sources b/sources
index 4f5a606..e2b015c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9532b9247c71475d12350e36b721c366 commons-codec-1.7-src.tar.gz
+60cdbb3f5319310242e3aacec22ef566 commons-codec-1.8-src.tar.gz
10 years, 11 months
Fixing tests
by Tomas Radej
Hi,
I took the liberty to fix sshj's tests as they were affected by the
update of JUnit to the newest version. If you wish that I don't make a
change like this in the future, please, let me know.
Thank you, Tomas Radej
--
Tomas Radej <tradej(a)redhat.com>
10 years, 11 months
Broken dependencies: maven-dependency-plugin
by Fedora Koji Build System
maven-dependency-plugin has broken dependencies in the F-19 tree:
On x86_64:
maven-dependency-plugin-2.7-1.fc19.noarch requires mvn(org.apache.commons:commons-io)
On i386:
maven-dependency-plugin-2.7-1.fc19.noarch requires mvn(org.apache.commons:commons-io)
Please resolve this as soon as possible.
10 years, 11 months