Compare commits

...
Sign in to create a new pull request.

20 commits

Author SHA1 Message Date
Jiri Vanek
27822741e3 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-30 00:47:05 +02:00
Fedora Release Engineering
cb41d9294e Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 22:28:00 +00:00
Mikolaj Izdebski
464c0242e8 Build with OpenJDK 25 2025-07-13 09:22:52 +02:00
Mikolaj Izdebski
3eba56b68f Switch javapackages test plan to f43 ref 2025-05-22 13:35:32 +02:00
Mikolaj Izdebski
f688858bda Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
9154eadca9 Remove javadoc subpackage 2025-03-03 12:54:05 +01:00
Fedora Release Engineering
a426cc6051 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 19:21:10 +00:00
Mikolaj Izdebski
659e398304 Update javadoc package description
[skip changelog]
2024-12-31 09:59:10 +01:00
Mikolaj Izdebski
3cdfaa1cd9 Unify spec style with the rest of Java/Maven packages
[skip changelog]
2024-12-30 16:01:19 +01:00
Mikolaj Izdebski
02ee52996f Update javapackages test plan to f42 2024-11-29 08:28:38 +01:00
Mikolaj Izdebski
97d9c929ac Convert to %autorelease and %autochangelog 2024-08-23 00:45:49 +02:00
Mikolaj Izdebski
c99471e4b8 Switch to non-numdered patches 2024-08-22 22:13:19 +02:00
Mikolaj Izdebski
81c96ec0f4 Switch from %setup to %autosetup 2024-08-20 16:33:57 +02:00
Mikolaj Izdebski
4ee585fe1d Switch javapackages tests to f41 branch 2024-07-31 20:53:30 +02:00
Fedora Release Engineering
ec8da848db Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 18:51:59 +00:00
Fedora Release Engineering
69ac32591f Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 08:17:13 +00:00
Fedora Release Engineering
af6b90803d Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 08:50:58 +00:00
Marian Koncek
791855cccc Add javapackages test plan 2023-12-05 15:54:22 +01:00
Marian Koncek
9348943be3 Package unretired
Update to upstream version 2022.7
2023-11-23 13:48:06 +01:00
e83921d6a7 Unretirement request: https://pagure.io/releng/issue/11791 2023-11-23 09:01:44 +01:00
11 changed files with 172 additions and 4 deletions

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

8
.gitignore vendored Normal file
View file

@ -0,0 +1,8 @@
msv-20050722.tar.gz
/msv-2009.1.tar.gz
/msv-2013.2.3.tar.gz
/msv-parent-2009.1.pom
/LICENSE-2.0.txt
/msv-2013.5.1-clean.tar.gz
/msv-2013.6.1-clean.tar.gz
/msv-2022.7.tar.gz

View file

@ -0,0 +1,24 @@
From a580f124197fcc2a62875e43100cd35b1fc4329e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 17 Aug 2023 09:30:08 +0200
Subject: [PATCH] Disable Apache XercesImpl
---
.../main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
index 4a4c4be..cdeab93 100644
--- a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
+++ b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
@@ -42,7 +42,6 @@ public abstract class RegExpFactory {
public static RegExpFactory createFactory() {
String[] classList = new String[] {
"com.sun.msv.datatype.regexp.InternalImpl",
- "com.sun.msv.datatype.xsd.regex.XercesImpl",
"com.sun.msv.datatype.xsd.regex.JDKImpl"
};
--
2.41.0

12
changelog Normal file
View file

@ -0,0 +1,12 @@
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Aug 07 2023 Marian Koncek <mkoncek@redhat.com> - 2022.7-1
- Package unretired
- Update to upstream version 2022.7

1
ci.fmf Normal file
View file

@ -0,0 +1 @@
resultsdb-testcase: separate

View file

@ -1,4 +0,0 @@
Retired, failed to install for 8+ weeks
https://pagure.io/releng/issue/10268
https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/

8
gating.yaml Normal file
View file

@ -0,0 +1,8 @@
--- !Policy
product_versions:
- fedora-*
decision_contexts:
- bodhi_update_push_testing
- bodhi_update_push_stable
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

29
generate-tarball.sh Executable file
View file

@ -0,0 +1,29 @@
#!/bin/bash
set -e
name=msv
version="$(sed -n 's/Version:\s*//p' ./*.spec)"
# RETRIEVE
wget "https://github.com/xmlark/msv/archive/${name}-${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
rm -rf tarball-tmp
mkdir tarball-tmp
pushd tarball-tmp
tar -xf "../${name}-${version}.orig.tar.gz"
mv "msv-msv-${version}" "${name}-${version}"
pushd "${name}-${version}"
mv docs/xsdlib/Apache-LICENSE-1.1.txt .
mv docs/xsdlib/license.txt .
mv docs/xsdlib/README.md README-xsdlib.md
# CLEAN TARBALL
find . -mindepth 1 -maxdepth 1 -type d ! -name 'xsdlib' -exec rm -rf {} +
rm -rf xsdlib/src/test
popd
tar -czf "../${name}-${version}.tar.gz" ./*
popd
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

81
msv.spec Normal file
View file

@ -0,0 +1,81 @@
Name: msv
Version: 2022.7
Release: %autorelease
Summary: Multi-Schema Validator Toolkit
# License breakdown
# Apache-1.1
# * xsdlib/src/main/java/com/sun/msv/datatype/regexp - All files except for InternalImpl.java
# BSD-3-Clause-Sun
# * pom.xml
# * xsdlib/src/main/java/com/sun/msv/datatype/regexp/InternalImpl.java
# BSD-3-Clause-Sun implied by docs/xsdlib/license.txt of the original tarball
# * xsdlib/src/main/java/com/sun/msv/datatype/xsd/CommandLineTester.java
# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages.properties
# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages_ja.properties
# BSD-3-Clause - All other .java files
License: Apache-1.1 AND BSD-3-Clause AND BSD-3-Clause-Sun
URL: https://xmlark.github.io/msv/
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
# ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz
Source1: generate-tarball.sh
Patch: 0001-Disable-Apache-XercesImpl.patch
BuildRequires: maven-local-openjdk25
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.jdom:jdom2)
BuildRequires: mvn(relaxngDatatype:relaxngDatatype)
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 2022.7-15
%description
The Multi Schema Validation toolkit is a Java based toolkit consisting of 8
different submodules. The core module is the Multi-Schema XML Validator (MSV)
for the validation of XML documents against several kinds of XML schemata The
core supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs, and a
subset of XML Schema Part 1.
%package xsdlib
Summary: Java implementation of W3Cs XML Schema Part 2
%description xsdlib
MSV XML Datatypes Library, Java implementation of W3Cs XML Schema Part 2, is
intended for use with applications that incorporate XML Schema Part 2.
%prep
%autosetup -p1 -C
# Disable runtime dependency on Apache Xerces
rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
%pom_xpath_remove 'pom:project/pom:modules'
%pom_xpath_inject 'pom:project' '<modules><module>xsdlib</module></modules>'
%pom_xpath_remove 'pom:build/pom:extensions'
%pom_remove_dep org.apache.maven.scm:maven-scm-provider-gitexe
%pom_remove_dep xerces:xercesImpl xsdlib
%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
%pom_remove_plugin -r :maven-javadoc-plugin
# We only build xsdlib
%mvn_package net.java.dev.msv:msv __noinstall
%build
%mvn_build -j -s
%install
%mvn_install
%files xsdlib -f .mfiles-xsdlib
%doc README.md README-xsdlib.md
%license Apache-LICENSE-1.1.txt license.txt
%changelog
%autochangelog

7
plans/javapackages.fmf Normal file
View file

@ -0,0 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: f43
execute:
how: tmt

1
sources Normal file
View file

@ -0,0 +1 @@
SHA512 (msv-2022.7.tar.gz) = 1fb7600af4a589bb68687b17fd7da3bd370362e06450d81509eb343f87a85366d3843f2b42f566560637428fdc8dc4abbd2eb5bc81444ab58ebf48c16d4d353e