Skip to content

Commit e9971b0

Browse files
authored
Upgrade: xmlunit version to 1.6 (#15158)
1 parent e5bebc9 commit e9971b0

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2007-2013, Jeff Martin, Tim Bacon
3+
Copyright (c) 2007-2014, Jeff Martin, Tim Bacon
44
All rights reserved.
55
66
Redistribution and use in source and binary forms, with or without
@@ -45,18 +45,18 @@ POSSIBILITY OF SUCH DAMAGE.
4545
<artifactId>xmlunit</artifactId>
4646
<packaging>jar</packaging>
4747
<name>XMLUnit for Java</name>
48-
<version>1.5</version>
49-
<url>http://xmlunit.sourceforge.net/</url>
48+
<version>1.6</version>
49+
<url>http://www.xmlunit.org/</url>
5050
<description>XMLUnit compares a control XML document to a test document or the result of a transformation, validates documents, and compares the results of XPath expressions.</description>
5151
<licenses>
5252
<license>
5353
<name>BSD License</name>
54-
<url>http://xmlunit.svn.sourceforge.net/viewvc/*checkout*/xmlunit/trunk/xmlunit/LICENSE.txt</url>
54+
<url>https://sourceforge.net/p/xmlunit/code/HEAD/tree/trunk/LICENSE.txt</url>
5555
</license>
5656
</licenses>
5757
<scm>
58-
<url>http://xmlunit.svn.sourceforge.net/viewvc/xmlunit/</url>
59-
<connection>scm:svn:https://xmlunit.svn.sourceforge.net/svnroot/xmlunit/branches/xmlunit-1.x</connection>
58+
<url>https://sourceforge.net/p/xmlunit/code/HEAD/tree/trunk/</url>
59+
<connection>scm:svn:https://svn.code.sf.net/p/xmlunit/code/trunk</connection>
6060
</scm>
6161
<dependencies>
6262
<dependency>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
3-
"xmlunit-1.5-src.zip": "ae2f340dfa730e3932bd970b2008a67696b32517ae8bf74f49e7149caa1842ae",
4-
"xmlunit-1.5.pom": "092e64f9d645761c83d9a11969f0233cb7ccf0fa7cf2804437595ec9ca113a1e"
3+
"xmlunit-1.6-src.zip": "d3aeb0c9737c1184e7c70bb1f8eb986dc449c03f09f6d3c65406d51a7f879c8c",
4+
"xmlunit-1.6.pom": "47b78933906b5b52e40152fd518806b145ede63c897037eb7ba18e6fe378782e"
55
}
66
}

SPECS-EXTENDED/xmlunit/xmlunit.spec

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Distribution: Azure Linux
33
#
44
# spec file for package xmlunit
55
#
6-
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
6+
# Copyright (c) 2022 SUSE LLC
77
# Copyright (c) 2000-2008, JPackage Project
88
#
99
# All modifications and additions to the file contributed by third parties
@@ -20,14 +20,14 @@ Distribution: Azure Linux
2020

2121

2222
Name: xmlunit
23-
Version: 1.5
24-
Release: 10%{?dist}
23+
Version: 1.6
24+
Release: 1%{?dist}
2525
Summary: Provides classes to do asserts on XML
2626
License: BSD-3-Clause
2727
Group: Development/Libraries/Java
2828
URL: http://xmlunit.sourceforge.net/
29-
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
30-
Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
29+
Source0: https://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
30+
Source1: https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
3131
BuildRequires: ant
3232
BuildRequires: ant-junit
3333
BuildRequires: fdupes
@@ -59,10 +59,9 @@ Group: Documentation/HTML
5959
Javadoc for %{name}. Also contains userguide.
6060

6161
%prep
62-
%setup -q
62+
%autosetup
6363

64-
perl -pi -e 's/
65-
$//g' README.txt LICENSE.txt
64+
perl -pi -e 's/\r$//g' README.txt LICENSE.txt
6665

6766
# remove all binary libs and javadocs
6867
find . -name "*.jar" -delete
@@ -81,7 +80,7 @@ EOF
8180

8281
export CLASSPATH=
8382
export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
84-
ant -Djavac.source=1.6 -Djavac.target=1.6 -Dbuild.compiler=modern -Dhaltonfailure=yes jar javadocs
83+
ant -Djavac.source=1.8 -Djavac.target=1.8 -Dbuild.compiler=modern -Dhaltonfailure=yes jar javadocs
8584

8685
%install
8786
mkdir -p %{buildroot}%{_javadir}
@@ -91,6 +90,8 @@ install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
9190
# Javadoc
9291
mkdir -p %{buildroot}%{_javadocdir}/%{name}
9392
cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
93+
mv %{buildroot}/usr/share/javadoc/xmlunit/api/legal/ADDITIONAL_LICENSE_INFO .
94+
mv %{buildroot}/usr/share/javadoc/xmlunit/api/legal/LICENSE .
9495
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
9596

9697
# poms
@@ -112,9 +113,15 @@ install -m 644 %{SOURCE1} \
112113

113114
%files javadoc
114115
%doc userguide
116+
%license ADDITIONAL_LICENSE_INFO
117+
%license LICENSE
115118
%{_javadocdir}/%{name}
116119

117120
%changelog
121+
* Mon Nov 24 2025 Archana Shettigar <v-shettigara@microsoft.com> - 1.6-1
122+
- Upgrade to 1.6
123+
- License Verified
124+
118125
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.5-10
119126
- Converting the 'Release' tag to the '[number].[distribution]' format.
120127

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30777,8 +30777,8 @@
3077730777
"type": "other",
3077830778
"other": {
3077930779
"name": "xmlunit",
30780-
"version": "1.5",
30781-
"downloadUrl": "http://download.sourceforge.net/xmlunit/xmlunit-1.5-src.zip"
30780+
"version": "1.6",
30781+
"downloadUrl": "https://download.sourceforge.net/xmlunit/xmlunit-1.6-src.zip"
3078230782
}
3078330783
}
3078430784
},

0 commit comments

Comments
 (0)