Accepting request 1196304 from Java:packages
3.0 OBS-URL: https://build.opensuse.org/request/show/1196304 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hamcrest?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f02d43898c
@ -1,131 +0,0 @@
|
||||
From d33031924faa557bb43ba0471f74d942ddfeae50 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Tue, 5 Nov 2019 14:50:23 +0100
|
||||
Subject: [PATCH] Fix build with OpenJDK 11
|
||||
|
||||
---
|
||||
.../src/main/java/org/hamcrest/collection/ArrayMatching.java | 3 ++-
|
||||
.../org/hamcrest/collection/IsArrayContainingInAnyOrder.java | 2 +-
|
||||
.../org/hamcrest/collection/IsArrayContainingInOrder.java | 2 +-
|
||||
.../hamcrest/collection/IsIterableContainingInAnyOrder.java | 2 +-
|
||||
.../collection/IsIterableContainingInRelativeOrder.java | 2 +-
|
||||
hamcrest/src/main/java/org/hamcrest/core/AllOf.java | 2 +-
|
||||
hamcrest/src/main/java/org/hamcrest/core/AnyOf.java | 2 +-
|
||||
.../src/main/java/org/hamcrest/core/CombinableMatcher.java | 4 ++--
|
||||
8 files changed, 10 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
|
||||
index fc968e0..baab775 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
|
||||
@@ -67,7 +67,8 @@ public class ArrayMatching {
|
||||
*/
|
||||
@SafeVarargs
|
||||
public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
|
||||
- return arrayContainingInAnyOrder(asList(itemMatchers));
|
||||
+ Collection<Matcher<? super E>> itemMatchersList = asList(itemMatchers);
|
||||
+ return new ArrayAsIterableMatcher<>(new IsIterableContainingInAnyOrder<>(itemMatchersList), itemMatchersList, "in any order");
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
|
||||
index 7e72a62..c0c7efc 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
|
||||
@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
|
||||
* a list of matchers, each of which must be satisfied by an entry in an examined array
|
||||
*/
|
||||
public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
|
||||
- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
|
||||
+ return new IsArrayContainingInAnyOrder<E>(Arrays.asList(itemMatchers));
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
|
||||
index c046914..2022f1a 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
|
||||
@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
|
||||
* the matchers that must be satisfied by the items in the examined array
|
||||
*/
|
||||
public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
|
||||
- return arrayContaining(asList(itemMatchers));
|
||||
+ return new IsArrayContainingInOrder<E>(asList(itemMatchers));
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
|
||||
index d6a9a33..9a7e6c0 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
|
||||
@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
|
||||
*/
|
||||
@SafeVarargs
|
||||
public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
|
||||
- return containsInAnyOrder(Arrays.asList(itemMatchers));
|
||||
+ return new IsIterableContainingInAnyOrder<T>(Arrays.asList(itemMatchers));
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
|
||||
index 0657768..06d6a57 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
|
||||
@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa
|
||||
*/
|
||||
@SafeVarargs
|
||||
public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
|
||||
- return containsInRelativeOrder(asList(itemMatchers));
|
||||
+ return new IsIterableContainingInRelativeOrder<E>(asList(itemMatchers));
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
|
||||
index b8c3faa..f8951bd 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
|
||||
@@ -56,6 +56,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
|
||||
*/
|
||||
@SafeVarargs
|
||||
public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
|
||||
- return allOf(Arrays.asList(matchers));
|
||||
+ return new AllOf<T>(Arrays.asList(matchers));
|
||||
}
|
||||
}
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
|
||||
index 7a22c22..5a63574 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
|
||||
@@ -46,6 +46,6 @@ public class AnyOf<T> extends ShortcutCombination<T> {
|
||||
*/
|
||||
@SafeVarargs
|
||||
public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
|
||||
- return anyOf(Arrays.asList(matchers));
|
||||
+ return new AnyOf<T>(Arrays.asList(matchers));
|
||||
}
|
||||
}
|
||||
diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
|
||||
index e37efce..6b44884 100644
|
||||
--- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
|
||||
+++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
|
||||
@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
|
||||
this.first = matcher;
|
||||
}
|
||||
public CombinableMatcher<X> and(Matcher<? super X> other) {
|
||||
- return new CombinableMatcher<>(first).and(other);
|
||||
+ return new CombinableMatcher<>(first).and((Matcher)other);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
|
||||
this.first = matcher;
|
||||
}
|
||||
public CombinableMatcher<X> or(Matcher<? super X> other) {
|
||||
- return new CombinableMatcher<>(first).or(other);
|
||||
+ return new CombinableMatcher<>(first).or((Matcher)other);
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
29
LICENSE
Normal file
29
LICENSE
Normal file
@ -0,0 +1,29 @@
|
||||
BSD 3-Clause License
|
||||
|
||||
Copyright (c) 2000-2024, www.hamcrest.org
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holder nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
27
LICENSE.txt
27
LICENSE.txt
@ -1,27 +0,0 @@
|
||||
BSD License
|
||||
|
||||
Copyright (c) 2000-2015 www.hamcrest.org
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
Redistributions of source code must retain the above copyright notice, this list of
|
||||
conditions and the following disclaimer. Redistributions in binary form must reproduce
|
||||
the above copyright notice, this list of conditions and the following disclaimer in
|
||||
the documentation and/or other materials provided with the distribution.
|
||||
|
||||
Neither the name of Hamcrest nor the names of its contributors may be used to endorse
|
||||
or promote products derived from this software without specific prior written
|
||||
permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||
SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
|
||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
|
||||
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGE.
|
||||
93
README.md
93
README.md
@ -1,63 +1,68 @@
|
||||
|
||||
|
||||
[](https://travis-ci.org/hamcrest/JavaHamcrest)
|
||||
[](https://github.com/hamcrest/JavaHamcrest/actions/workflows/build.yml)
|
||||
[](https://search.maven.org/artifact/org.hamcrest/hamcrest)
|
||||
[](LICENSE)
|
||||
|
||||
Java Hamcrest
|
||||
=============
|
||||
Licensed under [BSD License][].
|
||||
|
||||
What is Hamcrest?
|
||||
-----------------
|
||||
# Java Hamcrest
|
||||
|
||||
## What is Hamcrest?
|
||||
|
||||
Hamcrest is a library of matchers, which can be combined in to create flexible expressions of intent in tests.
|
||||
They've also been used for other purposes.
|
||||
|
||||
Downloads
|
||||
---------
|
||||
You can obtain Hamcrest binaries from [maven central][].
|
||||
The [tutorial](http://hamcrest.org/JavaHamcrest/tutorial) is good place to see how Hamcrest can be used.
|
||||
|
||||
Extensions
|
||||
----------
|
||||
## Downloads
|
||||
|
||||
For Hamcrest extension projects see the [hamcrest extensions page][].
|
||||
You can obtain Hamcrest binaries from [maven central](https://search.maven.org/artifact/org.hamcrest/hamcrest). If you
|
||||
are using build tooling such as Maven, Gradle, etc, you can simply add a dependency declaration to your build
|
||||
definition. Learn more at [Hamcrest Distributables](http://hamcrest.org/JavaHamcrest/distributables).
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation can be found on the [Hamcrest site](http://hamcrest.org).
|
||||
## Documentation
|
||||
|
||||
Reporting Bugs/Issues
|
||||
---------------------
|
||||
If you find an issue with Java Hamcrest, please report it via the
|
||||
[GitHub issue tracker](https://github.com/hamcrest/JavaHamcrest/issues),
|
||||
after first checking that it hasn't been raised already.
|
||||
Documentation can be found on the [Hamcrest site](http://hamcrest.org). For a detailed list of recent changes,
|
||||
see [CHANGES.md](CHANGES.md)
|
||||
|
||||
Source
|
||||
------
|
||||
To build, please read BUILDING.txt
|
||||
## Reporting Bugs/Issues
|
||||
|
||||
If you find an issue with Java Hamcrest, please report it via the
|
||||
[GitHub issue tracker](https://github.com/hamcrest/JavaHamcrest/issues),
|
||||
after first checking that it hasn't been raised already.
|
||||
|
||||
## Build from Source
|
||||
|
||||
Building Hamcrest from source requires a minimum of JDK 1.8.
|
||||
|
||||
Clone the repository, and from the top level directory in the repo workspace
|
||||
run the following command:
|
||||
|
||||
```shell
|
||||
./gradlew clean build javadoc
|
||||
```
|
||||
This will download the correct version of Gradle, do a full clean build,
|
||||
run all tests and (if successful) package the compiled classes in a jar
|
||||
file. The resulting look under the `hamcrest/build/libs` directory.
|
||||
|
||||
## Acknowledgements
|
||||
|
||||
Acknowledgements
|
||||
----------------
|
||||
Developers:
|
||||
|
||||
* Joe Walnes
|
||||
* Nat Pryce
|
||||
* Steve Freeman
|
||||
* Joe Walnes
|
||||
* Nat Pryce
|
||||
* Steve Freeman
|
||||
|
||||
Contributors:
|
||||
|
||||
* Robert Chatley
|
||||
* Tom White
|
||||
* Neil Dunn
|
||||
* Dan North
|
||||
* Magne Rasmussen
|
||||
* David Saff
|
||||
* Tom Denley
|
||||
* Robert Chatley
|
||||
* Tom White
|
||||
* Neil Dunn
|
||||
* Dan North
|
||||
* Magne Rasmussen
|
||||
* David Saff
|
||||
* Tom Denley
|
||||
* Joe Schmetzer
|
||||
|
||||
Also, thanks to everyone who has worked on DynaMock, nMock, jMock, EasyMock and MiniMock! These libraries inspired Hamcrest.
|
||||
|
||||
|
||||
[logo]: http://hamcrest.org/images/logo.jpg
|
||||
[website]: https://github.com/hamcrest/JavaHamcrest
|
||||
[BSD License]: http://opensource.org/licenses/BSD-3-Clause
|
||||
[Maven central]: http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.hamcrest
|
||||
[hamcrest extensions page]: https://github.com/hamcrest/JavaHamcrest/wiki/Related-Projects
|
||||
[GitHub issue tracker]: https://github.com/hamcrest/JavaHamcrest/issues
|
||||
Also, thanks to everyone who has worked on DynaMock, nMock, jMock, EasyMock
|
||||
and MiniMock! These libraries inspired Hamcrest.
|
||||
|
||||
2
_service
2
_service
@ -3,7 +3,7 @@
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/hamcrest/JavaHamcrest.git</param>
|
||||
<param name="subdir">hamcrest</param>
|
||||
<param name="revision">v2.2</param>
|
||||
<param name="revision">v3.0</param>
|
||||
<param name="match-tag">v*</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
|
||||
BIN
hamcrest-2.2.tar.xz
(Stored with Git LFS)
BIN
hamcrest-2.2.tar.xz
(Stored with Git LFS)
Binary file not shown.
@ -1,17 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<!-- This module was also published with a richer model, Gradle metadata, -->
|
||||
<!-- which should be used instead. Do not delete the following line which -->
|
||||
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
|
||||
<!-- that they should prefer consuming it instead. -->
|
||||
<!-- do_not_remove: published-with-gradle-metadata -->
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest</artifactId>
|
||||
<version>2.2</version>
|
||||
<version>3.0</version>
|
||||
<name>Hamcrest</name>
|
||||
<description>Core API and libraries of hamcrest matcher framework.</description>
|
||||
<url>http://hamcrest.org/JavaHamcrest/</url>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>BSD License 3</name>
|
||||
<url>http://opensource.org/licenses/BSD-3-Clause</url>
|
||||
<name>BSD-3-Clause</name>
|
||||
<url>https://raw.githubusercontent.com/hamcrest/JavaHamcrest/master/LICENSE</url>
|
||||
</license>
|
||||
</licenses>
|
||||
<developers>
|
||||
@ -29,7 +34,8 @@
|
||||
</developer>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection>git@github.com:hamcrest/JavaHamcrest.git</connection>
|
||||
<connection>scm:git:https://github.com/hamcrest/JavaHamcrest.git</connection>
|
||||
<developerConnection>scm:git:ssh://github.com/hamcrest/JavaHamcrest.git</developerConnection>
|
||||
<url>https://github.com/hamcrest/JavaHamcrest</url>
|
||||
</scm>
|
||||
</project>
|
||||
3
hamcrest-3.0.tar.xz
Normal file
3
hamcrest-3.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3b6ba8d4a02881ae353188db89127917f0b288e2899f34d081fe1038b63b11e4
|
||||
size 52256
|
||||
@ -10,9 +10,12 @@
|
||||
|
||||
<property name="project.groupId" value="org.hamcrest"/>
|
||||
<property name="project.artifactId" value="hamcrest"/>
|
||||
<property name="project.version" value="2.2"/>
|
||||
<property name="project.version" value="3.0"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="bundle.version" value="${project.version}.0"/>
|
||||
|
||||
<property name="compiler.release" value="8"/>
|
||||
<property name="compiler.source" value="1.${compiler.release}"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||
@ -45,6 +48,7 @@
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="${compiler.release}"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
@ -69,6 +73,7 @@
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="${compiler.release}"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
@ -187,9 +192,9 @@
|
||||
<attribute name="Bundle-ManifestVersion" value="2"/>
|
||||
<attribute name="Bundle-Name" value="${project.artifactId}"/>
|
||||
<attribute name="Bundle-SymbolicName" value="${project.groupId}"/>
|
||||
<attribute name="Bundle-Version" value="${project.version}"/>
|
||||
<attribute name="Export-Package" value="org.hamcrest.beans;version="${project.version}";uses:="org.hamcrest",org.hamcrest.collection;version="${project.version}";uses:="org.hamcrest",org.hamcrest.comparator;version="${project.version}";uses:="org.hamcrest",org.hamcrest.core;version="${project.version}";uses:="org.hamcrest",org.hamcrest.internal;version="${project.version}";uses:="org.hamcrest",org.hamcrest.io;version="${project.version}";uses:="org.hamcrest",org.hamcrest.number;version="${project.version}";uses:="org.hamcrest",org.hamcrest.object;version="${project.version}";uses:="org.hamcrest",org.hamcrest.text;version="${project.version}";uses:="org.hamcrest",org.hamcrest.xml;version="${project.version}";uses:="javax.xml.namespace,org.hamcrest,org.w3c.dom",org.hamcrest;version="${project.version}";uses:="javax.xml.namespace,org.hamcrest.collection,org.hamcrest.core,org.hamcrest.internal,org.w3c.dom""/>
|
||||
<attribute name="Import-Package" value="javax.xml.namespace;resolution:=optional,javax.xml.xpath;resolution:=optional,org.hamcrest.beans,org.hamcrest.collection,org.hamcrest.comparator,org.hamcrest.core,org.hamcrest.internal,org.hamcrest.number,org.hamcrest.object,org.hamcrest.text,org.hamcrest.xml,org.hamcrest,org.w3c.dom;resolution:=optional"/>
|
||||
<attribute name="Bundle-Version" value="${bundle.version}"/>
|
||||
<attribute name="Export-Package" value="org.hamcrest.beans;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.collection;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.comparator;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.core;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.internal;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.io;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.number;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.object;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.text;uses:="org.hamcrest";version="${bundle.version}",org.hamcrest.xml;uses:="javax.xml.namespace,org.hamcrest,org.w3c.dom";version="${bundle.version}",org.hamcrest;uses:="javax.xml.namespace,org.hamcrest.collection,org.hamcrest.core,org.hamcrest.internal,org.w3c.dom";version="${bundle.version}""/>
|
||||
<attribute name="Import-Package" value="javax.xml.namespace;resolution:=optional,javax.xml.xpath;resolution:=optional,org.hamcrest,org.hamcrest.beans,org.hamcrest.collection,org.hamcrest.comparator,org.hamcrest.core,org.hamcrest.internal,org.hamcrest.number,org.hamcrest.object,org.hamcrest.text,org.hamcrest.xml,org.w3c.dom;resolution:=optional"/>
|
||||
<attribute name="Implementation-Title" value="${project.artifactId}"/>
|
||||
<attribute name="Implementation-Vendor" value="${project.groupId}"/>
|
||||
<attribute name="Implementation-Version" value="${project.version}"/>
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 27 14:36:48 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 3.0
|
||||
* Breaking Changes
|
||||
+ From version 3.0, the jar distributed to Maven Central is now
|
||||
compiled to Java 1.8 bytecode, and is not compatible with
|
||||
previous versions of Java.
|
||||
Developers who use Java 1.7 earlier can still depend upon
|
||||
hamcrest-2.2.jar.
|
||||
* Improvements
|
||||
+ FileMatchersTest simplification
|
||||
+ License cleanup
|
||||
- Removed patches:
|
||||
* 0001-Fix-build-with-OpenJDK-11.patch
|
||||
+ not needed any more
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 09:10:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%bcond_with tests
|
||||
Name: hamcrest
|
||||
Version: 2.2
|
||||
Version: 3.0
|
||||
Release: 0
|
||||
Summary: Library of matchers for building test expressions
|
||||
License: BSD-3-Clause
|
||||
@ -27,9 +27,8 @@ URL: https://github.com/hamcrest/JavaHamcrest
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: %{name}-build.xml
|
||||
Source2: https://repo1.maven.org/maven2/org/hamcrest/%{name}/%{version}/%{name}-%{version}.pom
|
||||
Source3: https://raw.githubusercontent.com/hamcrest/JavaHamcrest/v2.2/LICENSE.txt
|
||||
Source4: https://raw.githubusercontent.com/hamcrest/JavaHamcrest/v2.2/README.md
|
||||
Patch0: 0001-Fix-build-with-OpenJDK-11.patch
|
||||
Source3: https://raw.githubusercontent.com/hamcrest/JavaHamcrest/v%{version}/LICENSE
|
||||
Source4: https://raw.githubusercontent.com/hamcrest/JavaHamcrest/v%{version}/README.md
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
@ -60,8 +59,6 @@ Javadoc for %{name}.
|
||||
cp %{SOURCE1} build.xml
|
||||
cp %{SOURCE3} %{SOURCE4} .
|
||||
|
||||
%patch -P 0 -p2
|
||||
|
||||
%build
|
||||
%{ant} \
|
||||
%if %{without tests}
|
||||
@ -89,11 +86,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%files -f .mfiles
|
||||
%{_javadir}/%{name}
|
||||
%license LICENSE.txt
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
|
||||
%files javadoc
|
||||
%license LICENSE.txt
|
||||
%license LICENSE
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user