October 2024 - openSUSE Commits - openSUSE Mailing Lists

commit openCryptoki for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openCryptoki for openSUSE:Factory checked in at 2024-10-16 23:48:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openCryptoki (Old) and /work/SRC/openSUSE:Factory/.openCryptoki.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openCryptoki" Wed Oct 16 23:48:21 2024 rev:79 rq:1208277 version:3.24.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openCryptoki/openCryptoki.changes 2024-10-07 21:49:50.212273114 +0200 +++ /work/SRC/openSUSE:Factory/.openCryptoki.new.19354/openCryptoki.changes 2024-10-16 23:49:30.103861060 +0200 @@ -5 +5,2 @@ -- Updated the %configure flags +- Updated the %configure flags for i586 +- Implemented a logic to exclude i586 arch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openCryptoki.spec ++++++ --- /var/tmp/diff_new_pack.XFEf58/_old 2024-10-16 23:49:32.467959655 +0200 +++ /var/tmp/diff_new_pack.XFEf58/_new 2024-10-16 23:49:32.483960322 +0200 @@ -157,7 +157,11 @@ %ifarch s390 s390x --enable-icatok --enable-ccatok --enable-ep11tok --enable-pkcsep11_migrate %else +%ifnarch i586 --disable-icatok --enable-ccatok --disable-ep11tok --disable-pkcsep11_migrate --enable-pkcscca_migrate +%else + --disable-icatok --disable-ccatok --disable-ep11tok --disable-pkcsep11_migrate --disable-pkcscca_migrate +%endif %endif make %{?_smp_mflags} @@ -256,7 +260,6 @@ # configuration directory %dir %{_sysconfdir}/opencryptoki %config %{_sysconfdir}/opencryptoki/opencryptoki.conf -%config %{_sysconfdir}/opencryptoki/ccatok.conf %ifarch s390 s390x %config %{_sysconfdir}/opencryptoki/ep11cpfilter.conf %config %{_sysconfdir}/opencryptoki/ep11tok.conf @@ -270,7 +273,10 @@ %ifarch s390 s390x %{_sbindir}/pkcsep11_session %endif +%ifnarch i586 +%config %{_sysconfdir}/opencryptoki/ccatok.conf %{_sbindir}/pkcscca +%endif %{_sbindir}/pkcsslotd %{_sbindir}/pkcsconf %{_sbindir}/pkcsicsf

1 0

commit python-nilearn for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-nilearn for openSUSE:Factory checked in at 2024-10-16 23:48:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nilearn (Old) and /work/SRC/openSUSE:Factory/.python-nilearn.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-nilearn" Wed Oct 16 23:48:02 2024 rev:5 rq:1208244 version:0.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nilearn/python-nilearn.changes 2024-02-22 21:00:41.595939478 +0100 +++ /work/SRC/openSUSE:Factory/.python-nilearn.new.19354/python-nilearn.changes 2024-10-16 23:49:21.287493374 +0200 @@ -1,0 +2,33 @@ +Wed Oct 16 02:30:41 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 0.10.4: + ## Highlights + * Use the appropriate HTML templates for nilearn.maskers.MultiNiftiMapsMasker + and nilearn.maskers.MultiNiftiLabelsMasker reports that would lead to + empty reports for MultiNiftiMapsMasker. + * Fix color bar handling with color map with only 1 level. + * Improve colorbar size and labels in mosaic display. + ## Fixes + * Fix plotting of carpet plot due to a change in the coming version of + matplolib (3.9.0). + * Fix errant warning when using stat_type in nilearn.glm.compute_contrast. + * Fix when thresholding is applied to images by GLM reports. + * Make masker report tables horizontally scrollable. + * Masker reports tables do not overlap with report image. + * Ensure that region_names_ can be generated by + nilearn.maskers.NiftiSpheresMasker.transform_single_imgs for deterministic + atlases that use floats or non-consecutive values as region_ids whether + they include background in their labels or not. + * Ensure that nilearn.interfaces.bids.save_glm_to_bids serializes numpy + arrays to list used as GLM parameters before saving them to JSON. + * Check that the view parameter in surface plotting functions is a pair of + int or float when it is not a string. + * Fix positions of the markers on the images on the sphere masker reports. + * Fix cut position in nifti maps maskers to match displayed map maximum. + * Make sure that nilearn.maskers.NiftiSpheresMasker reports displays + properly when it contains only 1 sphere. + ## Enhancements + * Add an avg_method parameter to nilearn.plotting.plot_surf_stat_map. +- Add patch support-new-scipy.patch, support new scipy changes. + +------------------------------------------------------------------- Old: ---- nilearn-0.10.3.tar.gz New: ---- nilearn-0.10.4.tar.gz support-new-scipy.patch BETA DEBUG BEGIN: New: * Add an avg_method parameter to nilearn.plotting.plot_surf_stat_map. - Add patch support-new-scipy.patch, support new scipy changes. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nilearn.spec ++++++ --- /var/tmp/diff_new_pack.lZxBGN/_old 2024-10-16 23:49:22.791556101 +0200 +++ /var/tmp/diff_new_pack.lZxBGN/_new 2024-10-16 23:49:22.795556268 +0200 @@ -19,13 +19,14 @@ # Run tests in parallel with pytest-xdist. On by default. %bcond_without pytest_xdist Name: python-nilearn -Version: 0.10.3 +Version: 0.10.4 Release: 0 Summary: Statistical learning tool for neuroimaging License: BSD-3-Clause -Group: Development/Languages/Python URL: https://github.com/nilearn/nilearn Source: https://files.pythonhosted.org/packages/source/n/nilearn/nilearn-%{version}… +# PATCH-FIX-UPSTREAM gh#nilearn/nilearn#4394 +Patch0: support-new-scipy.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module hatch_vcs} BuildRequires: %{python_module hatchling} @@ -52,6 +53,7 @@ BuildRequires: %{python_module packaging} BuildRequires: %{python_module pandas >= 1.1.5} %{?with_pytest_xdist:BuildRequires: %{python_module pytest-xdist}} +BuildRequires: %{python_module plotly} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests >= 2.25.0} BuildRequires: %{python_module rich} @@ -91,6 +93,8 @@ # unresolvable documentation package requirement docstring_parser ignorefiles="--ignore maint_tools/check_glossary_term.py" +# ignore cache files too +ignorefiles+=" --ignore nilearn_cache" if [[ $(getconf LONG_BIT) -eq 64 ]]; then # this is a noarch rpm package but the pure python code is only intended for 64-bit architectures ++++++ nilearn-0.10.3.tar.gz -> nilearn-0.10.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-nilearn/nilearn-0.10.3.tar.gz /work/SRC/openSUSE:Factory/.python-nilearn.new.19354/nilearn-0.10.4.tar.gz differ: char 17, line 1 ++++++ support-new-scipy.patch ++++++ From 5effd2789ed89042a41575fef4a6fc97922b0ac0 Mon Sep 17 00:00:00 2001 From: Remi Gau <remi_gau(a)hotmail.com> Date: Tue, 23 Apr 2024 13:58:35 +0200 Subject: [PATCH 1/2] changed cg parameters --- nilearn/_utils/segmentation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nilearn/_utils/segmentation.py b/nilearn/_utils/segmentation.py index 8c6367b847..3cc47d87f1 100644 --- a/nilearn/_utils/segmentation.py +++ b/nilearn/_utils/segmentation.py @@ -355,7 +355,7 @@ def _solve_cg(lap_sparse, B, tol): lap_sparse = lap_sparse.tocsc() X = [] for i in range(len(B)): - x0 = cg(lap_sparse, -B[i].todense(), tol=tol, atol="legacy")[0] + x0 = cg(lap_sparse, -B[i].todense(), rtol=tol, atol=0)[0] X.append(x0) X = np.array(X) From 9075d6a15d17cfe9cb684f3a5ac8537af98c3af3 Mon Sep 17 00:00:00 2001 From: Remi Gau <remi_gau(a)hotmail.com> Date: Wed, 24 Apr 2024 08:38:48 +0200 Subject: [PATCH 2/2] fix compat support scipy < 1.12 [test nightly] --- nilearn/_utils/segmentation.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nilearn/_utils/segmentation.py b/nilearn/_utils/segmentation.py index 3cc47d87f1..844e018807 100644 --- a/nilearn/_utils/segmentation.py +++ b/nilearn/_utils/segmentation.py @@ -11,10 +11,12 @@ import warnings import numpy as np -from scipy import ndimage as ndi, sparse +from scipy import __version__, ndimage as ndi, sparse from scipy.sparse.linalg import cg from sklearn.utils import as_float_array +from nilearn._utils.helpers import compare_version + def _make_graph_edges_3d(n_x, n_y, n_z): """Return a list of edges for a 3D image. @@ -355,7 +357,14 @@ def _solve_cg(lap_sparse, B, tol): lap_sparse = lap_sparse.tocsc() X = [] for i in range(len(B)): - x0 = cg(lap_sparse, -B[i].todense(), rtol=tol, atol=0)[0] + # TODO Python 3.8 + # consider remove if/else block when dropping support for 3.8 + # would require pinning scipy to >= 1.12 + # See https://github.com/nilearn/nilearn/pull/4394 + if compare_version(__version__, ">=", "1.12"): + x0 = cg(lap_sparse, -B[i].todense(), rtol=tol, atol=0)[0] + else: + x0 = cg(lap_sparse, -B[i].todense(), tol=tol, atol="legacy")[0] X.append(x0) X = np.array(X)

1 0

commit python-pure-protobuf for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pure-protobuf for openSUSE:Factory checked in at 2024-10-16 23:47:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pure-protobuf (Old) and /work/SRC/openSUSE:Factory/.python-pure-protobuf.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pure-protobuf" Wed Oct 16 23:47:48 2024 rev:6 rq:1208238 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pure-protobuf/python-pure-protobuf.changes 2024-08-17 12:41:46.472834441 +0200 +++ /work/SRC/openSUSE:Factory/.python-pure-protobuf.new.19354/python-pure-protobuf.changes 2024-10-16 23:49:11.143070302 +0200 @@ -1,0 +2,8 @@ +Tue Oct 15 21:47:22 UTC 2024 - Richard Rahl <rrahl0(a)opensuse.org> + +- update to 3.1.3: + * drop support for python 3.8 + * add support for python 3.13 + * prepare for python 3.14 + +------------------------------------------------------------------- Old: ---- pure_protobuf-3.1.2.tar.gz python-pure-protobuf-tests-3.1.2.tar.gz New: ---- pure_protobuf-3.1.3.tar.gz python-pure-protobuf-tests-3.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pure-protobuf.spec ++++++ --- /var/tmp/diff_new_pack.I4xh0i/_old 2024-10-16 23:49:13.267158887 +0200 +++ /var/tmp/diff_new_pack.I4xh0i/_new 2024-10-16 23:49:13.287159721 +0200 @@ -18,11 +18,10 @@ %{?sle15_python_module_pythons} Name: python-pure-protobuf -Version: 3.1.2 +Version: 3.1.3 Release: 0 Summary: Protocol Buffers using Python type annotations License: MIT -Group: Development/Libraries/Python URL: https://github.com/eigenein/protobuf Source: https://files.pythonhosted.org/packages/source/p/pure-protobuf/pure_protobu… Source1: %{name}-tests-%{version}.tar.gz @@ -43,7 +42,6 @@ BuildRequires: %{python_module pytest-benchmark} BuildRequires: %{python_module pytest-cov} BuildArch: noarch -Requires: python-get-annotations Requires: python-typing-extensions %python_subpackages ++++++ pure_protobuf-3.1.2.tar.gz -> pure_protobuf-3.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/PKG-INFO new/pure_protobuf-3.1.3/PKG-INFO --- old/pure_protobuf-3.1.2/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/pure_protobuf-3.1.3/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +1,23 @@ Metadata-Version: 2.1 Name: pure-protobuf -Version: 3.1.2 +Version: 3.1.3 Summary: Protocol Buffers using Python type annotations Home-page: https://github.com/eigenein/protobuf License: MIT Keywords: protobuf,protocol-buffers Author: Pavel Perestoronin Author-email: eigenein(a)gmail.com -Requires-Python: >=3.8.0,<4.0.0 +Requires-Python: >=3.9.0,<4.0.0 Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3.12 +Classifier: Programming Language :: Python :: 3.13 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Topic :: Software Development :: Libraries Classifier: Topic :: Software Development :: Libraries :: Python Modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/_accumulators.py new/pure_protobuf-3.1.3/pure_protobuf/_accumulators.py --- old/pure_protobuf-3.1.2/pure_protobuf/_accumulators.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/_accumulators.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,4 +1,5 @@ -from typing import Generic, Iterable, List, Optional, Type +from collections.abc import Iterable +from typing import Generic, Optional from pure_protobuf.interfaces._repr import ReprWithInner from pure_protobuf.interfaces._vars import MessageT, RecordT @@ -21,12 +22,12 @@ return accumulator -class AccumulateAppend(Accumulate[List[RecordT], RecordT]): +class AccumulateAppend(Accumulate[list[RecordT], RecordT]): def __call__( self, - accumulator: Optional[List[RecordT]], + accumulator: Optional[list[RecordT]], other: Iterable[RecordT], - ) -> List[RecordT]: + ) -> list[RecordT]: """Append all items from the `other` into the accumulator.""" if accumulator is None: accumulator = [] @@ -35,12 +36,12 @@ class AccumulateMessages(Accumulate[MessageT, MessageT], ReprWithInner): - inner: Type[MessageT] + inner: type[MessageT] __slots__ = ("inner",) # noinspection PyProtocol - def __init__(self, inner: Type[MessageT]) -> None: + def __init__(self, inner: type[MessageT]) -> None: self.inner = inner def __call__(self, lhs: Optional[MessageT], rhs: Iterable[MessageT]) -> MessageT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/_mergers.py new/pure_protobuf-3.1.3/pure_protobuf/_mergers.py --- old/pure_protobuf-3.1.2/pure_protobuf/_mergers.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/_mergers.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,4 +1,4 @@ -from typing import Generic, List, Optional +from typing import Generic, Optional from pure_protobuf._accumulators import AccumulateMessages from pure_protobuf.interfaces._repr import ReprWithInner @@ -18,12 +18,12 @@ return rhs -class MergeConcatenate(Merge[List[RecordT]], Generic[RecordT]): +class MergeConcatenate(Merge[list[RecordT]], Generic[RecordT]): def __call__( self, - lhs: Optional[List[RecordT]], - rhs: Optional[List[RecordT]], - ) -> Optional[List[RecordT]]: + lhs: Optional[list[RecordT]], + rhs: Optional[list[RecordT]], + ) -> Optional[list[RecordT]]: if lhs is None: return rhs if rhs is None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/descriptors/_field.py new/pure_protobuf-3.1.3/pure_protobuf/descriptors/_field.py --- old/pure_protobuf-3.1.2/pure_protobuf/descriptors/_field.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/descriptors/_field.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,9 +1,8 @@ from __future__ import annotations from dataclasses import dataclass -from typing import TYPE_CHECKING, Any, Generic, Optional, Type, cast +from typing import TYPE_CHECKING, Annotated, Any, Generic, Optional, cast -from typing_extensions import Annotated from typing_extensions import get_args as get_type_args from typing_extensions import get_origin as get_type_origin @@ -64,7 +63,7 @@ @classmethod def from_attribute( cls, - message_type: Type[BaseMessage], + message_type: type[BaseMessage], attribute_hint: Any, ) -> Optional[_FieldDescriptor[Any, Any]]: """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/descriptors/record.py new/pure_protobuf-3.1.3/pure_protobuf/descriptors/record.py --- old/pure_protobuf-3.1.2/pure_protobuf/descriptors/record.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/descriptors/record.py 2024-10-15 22:46:56.160412000 +0200 @@ -2,7 +2,8 @@ from dataclasses import dataclass from enum import IntEnum -from typing import TYPE_CHECKING, Any, ByteString, ClassVar, Dict, Generic, Type +from types import GenericAlias +from typing import TYPE_CHECKING, Any, ClassVar, Generic from urllib.parse import ParseResult from typing_extensions import Self @@ -69,13 +70,13 @@ merge: Merge[RecordT] = MergeLastOneWins() """Merge two values of the same field from different messages. Only called in a message merger.""" - __PREDEFINED__: ClassVar[Dict[Any, RecordDescriptor]] + __PREDEFINED__: ClassVar[dict[Any, RecordDescriptor]] """Pre-defined descriptors for primitive types.""" @classmethod def _from_inner_type_hint( cls, - message_type: Type[BaseMessage], + message_type: type[BaseMessage], inner_hint: Any, ) -> RecordDescriptor[Any]: """ @@ -115,7 +116,10 @@ write=WriteEnum[inner_hint](), read=ReadMaybePacked[inner_hint](ReadEnum(inner_hint), WireType.VARINT), ) - if issubclass(inner_hint, BaseMessage): + if ( + not isinstance(inner_hint, GenericAlias) # TODO: remove with Python 3.9 end-of-life. + and issubclass(inner_hint, BaseMessage) + ): return inner_hint._init_embedded_descriptor() raise UnsupportedAnnotationError(f"type annotation `{inner_hint!r}` is not supported") @@ -171,7 +175,6 @@ bool: BOOL_DESCRIPTOR, bytes: BYTES_DESCRIPTOR, bytearray: BYTES_DESCRIPTOR, - ByteString: BYTES_DESCRIPTOR, fixed32: UNSIGNED_INT32_DESCRIPTOR, fixed64: UNSIGNED_INT64_DESCRIPTOR, float: FLOAT_DESCRIPTOR, @@ -201,3 +204,10 @@ read=ReadMaybePacked[int](ReadCallback(ReadZigZagVarint()), WireType.VARINT), ), } + +try: + from collections.abc import ByteString +except ImportError: + pass +else: + RecordDescriptor.__PREDEFINED__[ByteString] = BYTES_DESCRIPTOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/helpers/_dataclasses.py new/pure_protobuf-3.1.3/pure_protobuf/helpers/_dataclasses.py --- old/pure_protobuf-3.1.2/pure_protobuf/helpers/_dataclasses.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/helpers/_dataclasses.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,4 +1,4 @@ -"""Backwards compatibility for Python 3.8 and 3.9.""" +"""Backwards compatibility with Python 3.9.""" from sys import version_info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/helpers/_typing.py new/pure_protobuf-3.1.3/pure_protobuf/helpers/_typing.py --- old/pure_protobuf-3.1.2/pure_protobuf/helpers/_typing.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/helpers/_typing.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,5 +1,5 @@ from collections.abc import Iterable -from typing import Any, List, Tuple, Union +from typing import Any, Union from typing_extensions import TypeGuard, get_args, get_origin @@ -22,7 +22,7 @@ DEFAULT = Sentinel() -def extract_repeated(hint: Any) -> Tuple[Any, TypeGuard[List]]: +def extract_repeated(hint: Any) -> tuple[Any, TypeGuard[list]]: """Extract a possible repeated flag.""" origin = get_origin(hint) if isinstance(origin, type) and (origin is Iterable or issubclass(origin, list)): @@ -30,7 +30,7 @@ return hint, False -def extract_optional(hint: Any) -> Tuple[Any, bool]: +def extract_optional(hint: Any) -> tuple[Any, bool]: """Extract a possible optional flag.""" if get_origin(hint) is Union: cleaned_args = tuple(arg for arg in get_args(hint) if arg is not NoneType) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/helpers/datetime.py new/pure_protobuf-3.1.3/pure_protobuf/helpers/datetime.py --- old/pure_protobuf-3.1.2/pure_protobuf/helpers/datetime.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/helpers/datetime.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,8 +1,7 @@ from math import modf -from typing import Tuple -def split_seconds(seconds: float) -> Tuple[int, int]: +def split_seconds(seconds: float) -> tuple[int, int]: """Split seconds into whole seconds and nanoseconds.""" fraction, whole = modf(seconds) return int(whole), int(fraction * 1_000_000_000.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/helpers/itertools.py new/pure_protobuf-3.1.3/pure_protobuf/helpers/itertools.py --- old/pure_protobuf-3.1.2/pure_protobuf/helpers/itertools.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/helpers/itertools.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,4 +1,5 @@ -from typing import Callable, Generic, Iterator, TypeVar +from collections.abc import Iterator +from typing import Callable, Generic, TypeVar from typing_extensions import ParamSpec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/interfaces/accumulate.py new/pure_protobuf-3.1.3/pure_protobuf/interfaces/accumulate.py --- old/pure_protobuf-3.1.2/pure_protobuf/interfaces/accumulate.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/interfaces/accumulate.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,5 +1,6 @@ from abc import abstractmethod -from typing import Iterable, Optional, Protocol +from collections.abc import Iterable +from typing import Optional, Protocol from pure_protobuf.interfaces._repr import Repr from pure_protobuf.interfaces._vars import FieldT, RecordT_contra diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/interfaces/read.py new/pure_protobuf-3.1.3/pure_protobuf/interfaces/read.py --- old/pure_protobuf-3.1.2/pure_protobuf/interfaces/read.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/interfaces/read.py 2024-10-15 22:46:56.160412000 +0200 @@ -1,5 +1,6 @@ from abc import abstractmethod -from typing import IO, Iterator, Protocol +from collections.abc import Iterator +from typing import IO, Protocol from pure_protobuf.interfaces._repr import Repr from pure_protobuf.interfaces._vars import RecordT_co diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/io/struct_.py new/pure_protobuf-3.1.3/pure_protobuf/io/struct_.py --- old/pure_protobuf-3.1.2/pure_protobuf/io/struct_.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/io/struct_.py 2024-10-15 22:46:56.161412000 +0200 @@ -1,5 +1,6 @@ +from collections.abc import Iterator from struct import Struct -from typing import IO, Generic, Iterator +from typing import IO, Generic from pure_protobuf.helpers.io import read_checked from pure_protobuf.interfaces._repr import ReprWithInner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/io/url.py new/pure_protobuf-3.1.3/pure_protobuf/io/url.py --- old/pure_protobuf-3.1.2/pure_protobuf/io/url.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/io/url.py 2024-10-15 22:46:56.161412000 +0200 @@ -1,6 +1,7 @@ """Reading and writing parsed URLs.""" -from typing import IO, Iterator +from collections.abc import Iterator +from typing import IO from urllib.parse import ParseResult, urlparse, urlunparse from pure_protobuf.interfaces.read import Read diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/io/varint.py new/pure_protobuf-3.1.3/pure_protobuf/io/varint.py --- old/pure_protobuf-3.1.2/pure_protobuf/io/varint.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/io/varint.py 2024-10-15 22:46:56.161412000 +0200 @@ -6,10 +6,11 @@ """ +from collections.abc import Iterator from enum import IntEnum from itertools import count from sys import byteorder -from typing import IO, Iterator, Type, TypeVar +from typing import IO, TypeVar from pure_protobuf.exceptions import IncorrectValueError from pure_protobuf.helpers.io import read_byte_checked @@ -127,7 +128,7 @@ __slots__ = ("enum_type",) # noinspection PyProtocol - def __init__(self, enum_type: Type[EnumT]) -> None: + def __init__(self, enum_type: type[EnumT]) -> None: self.enum_type = enum_type def __call__(self, io: IO[bytes]) -> Iterator[EnumT]: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/io/wrappers.py new/pure_protobuf-3.1.3/pure_protobuf/io/wrappers.py --- old/pure_protobuf-3.1.2/pure_protobuf/io/wrappers.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/io/wrappers.py 2024-10-15 22:46:56.161412000 +0200 @@ -1,5 +1,6 @@ +from collections.abc import Iterable, Iterator from io import BytesIO -from typing import IO, Generic, Iterable, Iterator, Optional, cast +from typing import IO, Generic, Optional, cast from pure_protobuf.exceptions import UnexpectedWireTypeError from pure_protobuf.interfaces._repr import ReprWithInner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/message.py new/pure_protobuf-3.1.3/pure_protobuf/message.py --- old/pure_protobuf-3.1.2/pure_protobuf/message.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/message.py 2024-10-15 22:46:56.161412000 +0200 @@ -1,8 +1,9 @@ from __future__ import annotations from abc import ABC +from collections.abc import Mapping from io import BytesIO -from typing import IO, Any, ClassVar, Dict, Tuple +from typing import IO, Any, ClassVar from typing_extensions import Self @@ -36,10 +37,10 @@ __slots__ = () - __PROTOBUF_FIELDS_BY_NUMBER__: ClassVar[Dict[int, Tuple[str, _FieldDescriptor]]] - __PROTOBUF_FIELDS_BY_NAME__: ClassVar[Dict[str, _FieldDescriptor]] + __PROTOBUF_FIELDS_BY_NUMBER__: ClassVar[dict[int, tuple[str, _FieldDescriptor]]] + __PROTOBUF_FIELDS_BY_NAME__: ClassVar[dict[str, _FieldDescriptor]] - __PROTOBUF_SKIP__: ClassVar[Dict[WireType, Skip]] = { + __PROTOBUF_SKIP__: ClassVar[Mapping[WireType, Skip]] = { WireType.VARINT: skip_varint, WireType.I64: skip_fixed_64, WireType.LEN: skip_bytes, @@ -53,7 +54,7 @@ cls.__PROTOBUF_FIELDS_BY_NUMBER__ = {} cls.__PROTOBUF_FIELDS_BY_NAME__ = {} - type_hints: Dict[str, Any] = get_annotations(cls, eval_str=True) + type_hints: dict[str, Any] = get_annotations(cls, eval_str=True) for name, hint in type_hints.items(): descriptor = _FieldDescriptor.from_attribute(cls, hint) if descriptor is not None: @@ -67,7 +68,7 @@ def read_from(cls, io: IO[bytes]) -> Self: """Read a message from the file.""" - values: Dict[str, Any] = {} + values: dict[str, Any] = {} while True: try: tag = Tag.read_from(io) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/one_of.py new/pure_protobuf-3.1.3/pure_protobuf/one_of.py --- old/pure_protobuf-3.1.2/pure_protobuf/one_of.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/one_of.py 2024-10-15 22:46:56.161412000 +0200 @@ -1,6 +1,7 @@ from __future__ import annotations -from typing import Any, Callable, Generic, List, MutableMapping, Optional, Tuple, Type, TypeVar +from collections.abc import MutableMapping +from typing import Any, Callable, Generic, Optional, TypeVar from pure_protobuf.message import BaseMessage @@ -22,7 +23,7 @@ A [`Field`][pure_protobuf.annotations.Field] then should be assigned to the group via the [`one_of`][pure_protobuf.annotations.Field.one_of] parameter. """ - self._fields: List[Tuple[int, str]] = [] + self._fields: list[tuple[int, str]] = [] def _add_field(self, number: int, name: str) -> None: self._fields.append((number, name)) @@ -41,7 +42,7 @@ if other_number != keep_number: super(BaseMessage, message).__setattr__(other_name, None) - def __get__(self, instance: Any, type_: Type[Any]) -> Optional[OneOfT]: # noqa: D105 + def __get__(self, instance: Any, type_: type[Any]) -> Optional[OneOfT]: # noqa: D105 if not isinstance(instance, BaseMessage): # Allows passing the descriptor by reference, and we need to move the descriptor from # the corresponding annotation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pure_protobuf/well_known.py new/pure_protobuf-3.1.3/pure_protobuf/well_known.py --- old/pure_protobuf-3.1.2/pure_protobuf/well_known.py 2024-08-16 16:45:32.681418200 +0200 +++ new/pure_protobuf-3.1.3/pure_protobuf/well_known.py 2024-10-15 22:46:56.161412000 +0200 @@ -2,14 +2,13 @@ from __future__ import annotations +from collections.abc import Mapping from dataclasses import dataclass from datetime import datetime, timedelta, timezone from io import BytesIO -from typing import Any, Mapping, Optional, Type, cast +from typing import Annotated, Any, Optional, cast from urllib.parse import ParseResult -from typing_extensions import Annotated - from pure_protobuf.annotations import Field from pure_protobuf.helpers._dataclasses import KW_ONLY, SLOTS from pure_protobuf.helpers.datetime import split_seconds, unsplit_seconds @@ -112,5 +111,5 @@ locals=locals_, globals=globals_, ) - class_ = cast(Type[BaseMessage], getattr(module, self.type_url.path)) + class_ = cast(type[BaseMessage], getattr(module, self.type_url.path)) return class_.read_from(BytesIO(self.value)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pure_protobuf-3.1.2/pyproject.toml new/pure_protobuf-3.1.3/pyproject.toml --- old/pure_protobuf-3.1.2/pyproject.toml 2024-08-16 16:45:40.205445000 +0200 +++ new/pure_protobuf-3.1.3/pyproject.toml 2024-10-15 22:47:06.058315300 +0200 @@ -13,7 +13,7 @@ name = "pure-protobuf" readme = "README.md" repository = "https://github.com/eigenein/protobuf" -version = "3.1.2" +version = "3.1.3" classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", @@ -21,11 +21,11 @@ "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Python Modules", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "License :: OSI Approved :: MIT License", "Typing :: Typed", ] @@ -36,26 +36,26 @@ [tool.poetry.dependencies] get-annotations = { version = "^0.1.2", python = "<3.10" } -python = "^3.8.0" +python = "^3.9.0" typing-extensions = "^4.4.0" [tool.poetry.group.dev] optional = true [tool.poetry.group.dev.dependencies] -black = "24.8.0" +black = "24.10.0" cairosvg = "2.7.1" -mkdocs-autorefs = "1.0.1" -mkdocs-git-revision-date-localized-plugin = "1.2.6" -mkdocs-material = "9.5.31" -mkdocstrings = { version = "0.25.2", extras = ["python"] } -mypy = "1.11.1" +mkdocs-autorefs = "1.2.0" +mkdocs-git-revision-date-localized-plugin = "1.2.9" +mkdocs-material = "9.5.41" +mkdocstrings = { version = "0.26.2", extras = ["python"] } +mypy = "1.12.0" pillow = "10.4.0" -pydantic = "2.8.2" -pytest = "8.3.2" +pydantic = "2.9.2" +pytest = "8.3.3" pytest-benchmark = "4.0.0" pytest-cov = "5.0.0" -ruff = "0.6.0" +ruff = "0.6.9" [tool.poetry.urls] "Changelog" = "https://github.com/eigenein/protobuf/blob/master/CHANGELOG.md" @@ -95,11 +95,11 @@ [tool.black] line-length = 120 -target-version = ["py38", "py39", "py310", "py311", "py312"] +target-version = ["py39", "py310", "py311", "py312", "py313", "py314"] [tool.ruff] line-length = 120 -target-version = "py38" +target-version = "py39" [tool.ruff.lint] select = [ @@ -148,9 +148,7 @@ "PT013", "RET505", "TRY003", - "UP006", # 3.9 "UP007", # 3.10 - "UP033", # 3.9 ] [tool.ruff.lint.per-file-ignores] ++++++ python-pure-protobuf-tests-3.1.2.tar.gz -> python-pure-protobuf-tests-3.1.3.tar.gz ++++++

1 0

commit jetty-minimal for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jetty-minimal for openSUSE:Factory checked in at 2024-10-16 23:47:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jetty-minimal (Old) and /work/SRC/openSUSE:Factory/.jetty-minimal.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jetty-minimal" Wed Oct 16 23:47:34 2024 rev:24 rq:1208241 version:9.4.56 Changes: -------- --- /work/SRC/openSUSE:Factory/jetty-minimal/jetty-alpn.changes 2024-10-14 13:06:39.183308325 +0200 +++ /work/SRC/openSUSE:Factory/.jetty-minimal.new.19354/jetty-alpn.changes 2024-10-16 23:48:55.346411503 +0200 @@ -1,0 +2,14 @@ +Tue Oct 15 21:27:27 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to version 9.4.56.v20240826 + * Security fixes: + + CVE-2024-8184, bsc#1231651, ThreadLimitHandler.getRemote() + vulnerable to remote DoS attacks + * Changes: + + #12201 backport ThreadLimitHandler improvements from Jetty 12 + + #11938 - Updating URL refs from eclipse.org/jetty and + eclipse.dev/jetty to jetty.org (including XML dtd references) + + #10805 - Jetty response with an invalid HTTP2 packet if the + client set the hpack table size as 0 + +------------------------------------------------------------------- jetty-http2.changes: same change jetty-minimal.changes: same change jetty-unixsocket.changes: same change jetty-websocket.changes: same change Old: ---- jetty.project-jetty-9.4.54.v20240208.tar.gz New: ---- jetty.project-jetty-9.4.56.v20240826.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jetty-alpn.spec ++++++ --- /var/tmp/diff_new_pack.ytOwkv/_old 2024-10-16 23:49:00.734636219 +0200 +++ /var/tmp/diff_new_pack.ytOwkv/_new 2024-10-16 23:49:00.738636385 +0200 @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20240208 +%global addver .v20240826 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-alpn -Version: 9.4.54 +Version: 9.4.56 Release: 0 Summary: The alpn modules for Jetty License: Apache-2.0 OR EPL-1.0 ++++++ jetty-http2.spec ++++++ --- /var/tmp/diff_new_pack.ytOwkv/_old 2024-10-16 23:49:00.770637720 +0200 +++ /var/tmp/diff_new_pack.ytOwkv/_new 2024-10-16 23:49:00.770637720 +0200 @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20240208 +%global addver .v20240826 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-http2 -Version: 9.4.54 +Version: 9.4.56 Release: 0 Summary: The http2 modules for Jetty License: Apache-2.0 OR EPL-1.0 ++++++ jetty-minimal.spec ++++++ --- /var/tmp/diff_new_pack.ytOwkv/_old 2024-10-16 23:49:00.798638888 +0200 +++ /var/tmp/diff_new_pack.ytOwkv/_new 2024-10-16 23:49:00.798638888 +0200 @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20240208 +%global addver .v20240826 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-minimal -Version: 9.4.54 +Version: 9.4.56 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 ++++++ jetty-unixsocket.spec ++++++ --- /var/tmp/diff_new_pack.ytOwkv/_old 2024-10-16 23:49:00.826640055 +0200 +++ /var/tmp/diff_new_pack.ytOwkv/_new 2024-10-16 23:49:00.826640055 +0200 @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20240208 +%global addver .v20240826 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-unixsocket -Version: 9.4.54 +Version: 9.4.56 Release: 0 Summary: The unixsocket modules for Jetty License: Apache-2.0 OR EPL-1.0 ++++++ jetty-websocket.spec ++++++ --- /var/tmp/diff_new_pack.ytOwkv/_old 2024-10-16 23:49:00.858641390 +0200 +++ /var/tmp/diff_new_pack.ytOwkv/_new 2024-10-16 23:49:00.858641390 +0200 @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20240208 +%global addver .v20240826 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-websocket -Version: 9.4.54 +Version: 9.4.56 Release: 0 Summary: The websocket modules for Jetty License: Apache-2.0 OR EPL-1.0 ++++++ jetty.project-jetty-9.4.54.v20240208.tar.gz -> jetty.project-jetty-9.4.56.v20240826.tar.gz ++++++ /work/SRC/openSUSE:Factory/jetty-minimal/jetty.project-jetty-9.4.54.v20240208.tar.gz /work/SRC/openSUSE:Factory/.jetty-minimal.new.19354/jetty.project-jetty-9.4.56.v20240826.tar.gz differ: char 13, line 1

1 0

commit maven-dependency-plugin for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-dependency-plugin for openSUSE:Factory checked in at 2024-10-16 23:47:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-dependency-plugin (Old) and /work/SRC/openSUSE:Factory/.maven-dependency-plugin.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-dependency-plugin" Wed Oct 16 23:47:13 2024 rev:5 rq:1208225 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-dependency-plugin/maven-dependency-plugin.changes 2023-09-28 00:38:31.068939898 +0200 +++ /work/SRC/openSUSE:Factory/.maven-dependency-plugin.new.19354/maven-dependency-plugin.changes 2024-10-16 23:48:45.638006614 +0200 @@ -1,0 +2,49 @@ +Tue Oct 15 19:16:33 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to version 3.8.0 + * Bug + + MDEP-875: Regression: list-repositories may produce NPE + + MDEP-835: dependency:tree no longer shows optional flag + + MDEP-838: "Artifact has not been packaged yet" error message + is not very helpful + + MDEP-938: 'mdep.overIfNewer' is misnamed from its usage of + 'mdep.overWriteIfNewer' + + MDEP-943: [REGRESSION] appendOutput for tree goal broken for + multi-module project + * New Feature + + MDEP-317: Add goal dependency:analyze-exclusions - check for + invalid excludes + + MDEP-799: improve mvn dependency:tree - add optional JSON + output of the results + + MDEP-928: Allow to exclude classes from dependency:analyze + * Improvement + + MDEP-669: Optimize the documentation of <outputProperty> of + build-classpath-mojo + + MDEP-893: Get rid of commons-lang3 + + MDEP-894: Use @Component instead of @Parameter for + session/project + + MDEP-896: Removing unused code + + MDEP-897: Remove old style JavaDoc Plexus docs + + MDEP-899: Upgrade maven-plugin parent to 42 + + MDEP-917: dependency:analyze-exclusions - use Resolver API + instead of ProjectBuilder + + MDEP-924: Get rid of maven-artifact-transfer from list-classes + goal + + MDEP-925: Require Maven 3.6.3 + + MDEP-939: Lock down classifier in dependency:sources goal + + MDEP-940: Use Resolver API instead of m-a-t for resolving + artifacts + * Test + + MDEP-710: reenable TestTreeMojo + * Task + + MDEP-912: Use version for plexus-utils/plexus-xml from parent + + MDEP-914: collect goal description broken in documentation + + MDEP-918: Use standard updatePolicy for repositories in ITs + + MDEP-923: Code cleanups + + MDEP-935: Improvement ITs for dependency:tree + + MDEP-941: Deprecate dependency:sources in favor of + dependency:resolve-sources + + MDEP-945: Fix documentation about get goal + + MDEP-913: dependency:collect missing from index page + +------------------------------------------------------------------- @@ -4 +53 @@ -- Update to verion 3.6.0 +- Update to version 3.6.0 Old: ---- maven-dependency-plugin-3.6.0-source-release.zip New: ---- maven-dependency-plugin-3.8.0-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-dependency-plugin.spec ++++++ --- /var/tmp/diff_new_pack.aSigWC/_old 2024-10-16 23:48:46.894058998 +0200 +++ /var/tmp/diff_new_pack.aSigWC/_new 2024-10-16 23:48:46.894058998 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-dependency-plugin # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: maven-dependency-plugin -Version: 3.6.0 +Version: 3.8.0 Release: 0 Summary: Plugin to manipulate, copy and unpack local and remote artifacts License: Apache-2.0 @@ -27,8 +27,7 @@ BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(org.apache.commons:commons-collections4) +BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) @@ -36,25 +35,27 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) +BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-api) +BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-util) BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-dependency-analyzer) +BuildRequires: mvn(org.apache.maven.shared:maven-dependency-analyzer) >= 1.14.1 BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) -BuildRequires: mvn(org.apache.maven:maven-aether-provider) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) +BuildRequires: mvn(org.apache.maven:maven-resolver-provider) BuildRequires: mvn(org.apache.maven:maven-settings) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-i18n) BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.eclipse.aether:aether-api) -BuildRequires: mvn(org.eclipse.aether:aether-util) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildArch: noarch ++++++ maven-dependency-plugin-3.6.0-source-release.zip -> maven-dependency-plugin-3.8.0-source-release.zip ++++++ ++++ 12422 lines of diff (skipped)

1 0

commit maven-doxia-sitetools for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-doxia-sitetools for openSUSE:Factory checked in at 2024-10-16 23:47:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old) and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-doxia-sitetools" Wed Oct 16 23:47:06 2024 rev:11 rq:1208220 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes 2024-09-30 15:40:36.637545288 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19354/maven-doxia-sitetools.changes 2024-10-16 23:48:35.037564524 +0200 @@ -1,0 +2,115 @@ +Mon Oct 7 07:37:13 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream version 2.0.0 + * Bug + + DOXIASITETOOLS-251: Plexus to Sisu migration misses Singleton + annotation + + DOXIASITETOOLS-263: Don't inject a default decoration model + when inheritance is at play + + DOXIASITETOOLS-266: Don't create anchors behind the user's + back + + DOXIASITETOOLS-299: Site descriptor interpolation does not + properly escape reserved XML chars + + DOXIASITETOOLS-305: Removal of 0-byte site descriptors from + the local repo does not put remote repos into consideration + * New Feature + + DOXIASITETOOLS-238: Pass input file name as reference to + parser + + DOXIASITETOOLS-291: Add timezone field to site descriptor + PublishDate object and pass onto Velocity tools context + + DOXIASITETOOLS-324: Allow configuration of parser per markup + * Improvement + + DOXIASITETOOLS-253: Clarify "border", "width" and "height" for + Banner and LinkItem + + DOXIASITETOOLS-257: Require a skin if a site descriptor + (site.xml) has been provided + + DOXIASITETOOLS-268: Don't open version resource file on every + call to render + + DOXIASITETOOLS-271: Overhaul locale support (make Locale#ROOT + instead of Locale#ENGLISH default and use full locale) + + DOXIASITETOOLS-278: Remove menu items link in the sidebar to + submodule that do not generate any site in the same build + + DOXIASITETOOLS-293: Remove menu items link in the sidebar to + submodule that are not present in the same build (reactor) + + DOXIASITETOOLS-294: Replace legacy artifact resolution with + Maven Resolver + + DOXIASITETOOLS-300: Don't populate Velocity context with XML + entities + + DOXIASITETOOLS-301: Automatically remove the 0-byte site + descriptors from the local repo + + DOXIASITETOOLS-302: Harmonize path separator in + DocumentRenderingContext + + DOXIASITETOOLS-332: Create anchors for indexable entries + automatically + + DOXIASITETOOLS-334: Pass project relative source path to + Parser.parse(...) as reference argument + + DOXIASITETOOLS-336: Make SiteRenderingContext#siteDirectories + editable aware + + DOXIASITETOOLS-340: Rearrange title order in Velocity context + + DOXIASITETOOLS-344: Improve performance of case-sensitive file + key checking + + DOXIASITETOOLS-348: Extend site descriptor to enforce a parent + + DOXIASITETOOLS-349: Remove plexus-component-metadata plugin + * Wish + + DOXIASITETOOLS-174: rename site.xml root tag from "project" to + "site" + * Task + + DOXIASITETOOLS-156: Fail if deprecated ${reports}, + ${parentProject} or ${modules} is found + + DOXIASITETOOLS-167: Replace deprecated Maven 2 + MavenProjectBuilder with Maven 3 ProjectBuilder + + DOXIASITETOOLS-239: Remove Doxia Sitetools Doc Renderer + + DOXIASITETOOLS-241: Replace Plexus Container Default with Sisu + Plexus Shim + + DOXIASITETOOLS-242: Remove all deprecated code + + DOXIASITETOOLS-244: Clean up exceptions and log messages + + DOXIASITETOOLS-245: Upgrade to Java 8 + + DOXIASITETOOLS-247: Replace Plexus Annotations with Java + Inject along with JUnit 5 + + DOXIASITETOOLS-254: Clarify inconsistencies in Doxia site + model + + DOXIASITETOOLS-258: Don't inject bannerLeft is none is set + + DOXIASITETOOLS-259: Deprecate Google-related site descriptor + properties + + DOXIASITETOOLS-264: Remove usage of default skin during + testing + + DOXIASITETOOLS-265: Drop MiscVerifier + + DOXIASITETOOLS-270: Remove internal (pseudo) skin and use + Maven Fluido Skin by default + + DOXIASITETOOLS-272: Remove support for Maven 1.x style site + directory layout + + DOXIASITETOOLS-281: Deprecate SiteTool#getParentProject() in + favor of MavenProject#getParent() + + DOXIASITETOOLS-282: Deprecate support for Maven 1.x style site + directory layout + + DOXIASITETOOLS-285: Deprecate + SiteRenderingContext#defaultWindowTitle in favor of + SiteRenderingContext#defaultTitle + + DOXIASITETOOLS-287: Remove Google-related site descriptor + properties + + DOXIASITETOOLS-289: Remove SiteTool#getParentProject() + + DOXIASITETOOLS-290: Remove + SiteRenderingContext#defaultWindowTitle + + DOXIASITETOOLS-295: Rename o.a.m.doxia.siterenderer.Renderer + to o.a.m.doxia.siterenderer.SiteRenderer + + DOXIASITETOOLS-296: Rename + o.a.m.doxia.siterenderer.RenderingContext to + o.a.m.doxia.siterenderer.DocumentRenderingContext + + DOXIASITETOOLS-298: Rename doxia-decoration-model to + doxia-site-model + + DOXIASITETOOLS-303: Implement workaround for + MNG-7758/MRESOLVER-335 + + DOXIASITETOOLS-306: Clean up and simplify thrown exceptions + + DOXIASITETOOLS-309: Add resource bundle property "External + Links" to site-renderer.properties + + DOXIASITETOOLS-310: Add resource bundle property "Edit" to + site-renderer.properties + + DOXIASITETOOLS-311: Rework and simplify the site model + + DOXIASITETOOLS-319: Improve DocumentRenderer + interface/DocumentRenderingContext class API +- Modified patch: + * 0002-Remove-dependency-on-velocity-tools.patch -> + 0001-Remove-dependency-on-velocity-tools.patch + + rediff + +------------------------------------------------------------------- Old: ---- 0002-Remove-dependency-on-velocity-tools.patch doxia-sitetools-1.11.1-source-release.zip New: ---- 0001-Remove-dependency-on-velocity-tools.patch _service maven-doxia-sitetools-2.0.0.tar.xz BETA DEBUG BEGIN: Old:- Modified patch: * 0002-Remove-dependency-on-velocity-tools.patch -> 0001-Remove-dependency-on-velocity-tools.patch BETA DEBUG END: BETA DEBUG BEGIN: New: * 0002-Remove-dependency-on-velocity-tools.patch -> 0001-Remove-dependency-on-velocity-tools.patch + rediff BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-doxia-sitetools.spec ++++++ --- /var/tmp/diff_new_pack.9L32iR/_old 2024-10-16 23:48:36.557627918 +0200 +++ /var/tmp/diff_new_pack.9L32iR/_new 2024-10-16 23:48:36.561628085 +0200 @@ -16,51 +16,40 @@ # -%global parent maven-doxia -%global subproj sitetools -Name: %{parent}-%{subproj} -Version: 1.11.1 +Name: maven-doxia-sitetools +Version: 2.0.0 Release: 0 Summary: Doxia content generation framework License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/doxia/ -Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{ver… +Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.tar.xz -Patch1: 0002-Remove-dependency-on-velocity-tools.patch +Patch1: 0001-Remove-dependency-on-velocity-tools.patch BuildRequires: ant -BuildRequires: apache-commons-collections BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 +BuildRequires: atinject BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 BuildRequires: maven-doxia-core -BuildRequires: maven-doxia-logging-api -BuildRequires: maven-doxia-module-fo -BuildRequires: maven-doxia-module-xhtml +BuildRequires: maven-doxia-module-xhtml5 BuildRequires: maven-doxia-sink-api BuildRequires: maven-lib BuildRequires: maven-reporting-api -BuildRequires: modello >= 2.0.0 -BuildRequires: plexus-containers-component-annotations +BuildRequires: maven-resolver-api +BuildRequires: modello BuildRequires: plexus-i18n BuildRequires: plexus-interpolation BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: plexus-xml +BuildRequires: sisu-inject BuildRequires: sisu-plexus -BuildRequires: unzip -BuildRequires: velocity -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: xz -BuildRequires: mvn(org.apache.maven.doxia:doxia-module-apt) -BuildRequires: mvn(org.apache.maven.doxia:doxia-module-fml) -BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xdoc) -BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xhtml5) -BuildRequires: mvn(org.apache.maven:maven-parent:pom:) +BuildRequires: slf4j +BuildRequires: velocity-engine-core BuildArch: noarch %description @@ -78,78 +67,57 @@ API documentation for %{name}. %prep -%setup -q -n doxia-%{subproj}-%{version} -a1 +%setup -q -a1 %patch -P 1 -p1 -# migrate to maven 3 -%pom_xpath_set //pom:mavenVersion 3.8.6 doxia-integration-tools -%pom_change_dep :maven-artifact-manager :maven-core doxia-integration-tools -%pom_change_dep :maven-project :maven-compat doxia-integration-tools - -# complains -%pom_remove_plugin :apache-rat-plugin - -%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin -%pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml -%pom_remove_dep -r :velocity-tools - -rm -rf $(find -type d -name itext) -%pom_remove_dep -r :doxia-module-itext - -%pom_remove_dep -r :doxia-module-markdown - -for i in doxia-decoration-model doxia-doc-renderer doxia-integration-tools doxia-site-renderer; do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} -done - -%{mvn_alias} :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools +%pom_remove_dep -r :velocity-tools-generic %build mkdir -p lib build-jar-repository -s lib \ - apache-commons-collections \ apache-commons-lang3 \ + atinject \ commons-io \ maven-doxia/doxia-core \ - maven-doxia/doxia-logging-api \ - maven-doxia/doxia-module-fo \ - maven-doxia/doxia-module-xhtml \ maven-doxia/doxia-module-xhtml5 \ maven-doxia/doxia-sink-api \ maven/maven-artifact \ maven/maven-core \ - maven/maven-plugin-api \ - maven/maven-project \ + maven/maven-model \ maven-reporting-api/maven-reporting-api \ + maven-resolver/maven-resolver-api \ + org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus-containers/plexus-component-annotations \ plexus-i18n/plexus-i18n \ plexus/interpolation \ plexus/utils \ - plexus/xml \ plexus-velocity/plexus-velocity \ - velocity -# tests can't run because of missing deps -%{ant} -Dtest.skip=true package javadoc + plexus/xml \ + slf4j/api \ + velocity-engine/velocity-engine-core + +ant package javadoc -mkdir -p target/site/apidocs +%install +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} for i in \ - doxia-decoration-model \ + doxia-site-model \ doxia-skin-model \ - doxia-integration-tools \ - doxia-site-renderer; do - %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar + doxia-site-renderer \ + doxia-integration-tools; do + install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} if [ -d ${i}/target/site/apidocs ]; then - cp -r ${i}/target/site/apidocs target/site/apidocs/${i} + cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i} fi done - -%install -%mvn_install %fdupes -s %{buildroot}%{_javadocdir} -%files -f .mfiles -%dir %{_javadir}/%{name} +%files -f .mfiles-doxia-integration-tools -f .mfiles-doxia-site-model -f .mfiles-doxia-site-renderer -f .mfiles-doxia-skin-model -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} ++++++ 0002-Remove-dependency-on-velocity-tools.patch -> 0001-Remove-dependency-on-velocity-tools.patch ++++++ --- /work/SRC/openSUSE:Factory/maven-doxia-sitetools/0002-Remove-dependency-on-velocity-tools.patch 2023-09-25 20:51:36.375067846 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19354/0001-Remove-dependency-on-velocity-tools.patch 2024-10-16 23:48:31.513417549 +0200 @@ -1,92 +1,99 @@ -From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001 +From 7b2073aa38961c5069508c40274b1b644ccb195d Mon Sep 17 00:00:00 2001 From: Michael Simacek <msimacek(a)redhat.com> Date: Mon, 6 Feb 2017 14:27:53 +0100 -Subject: [PATCH 2/2] Remove dependency on velocity-tools +Subject: [PATCH] Remove dependency on velocity-tools --- - .../doxia/siterenderer/DefaultSiteRenderer.java | 58 +--------------------- - 1 file changed, 2 insertions(+), 56 deletions(-) + .../siterenderer/DefaultSiteRenderer.java | 65 +------------------ + 2 files changed, 2 insertions(+), 68 deletions(-) diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java -index c31688d..58058b3 100644 +index 7e41c4a..6efdcaf 100644 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java -@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.mod - import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; - import org.apache.maven.doxia.util.XmlValidator; - import org.apache.velocity.Template; -+import org.apache.velocity.VelocityContext; - import org.apache.velocity.context.Context; - import org.apache.velocity.exception.ParseErrorException; - import org.apache.velocity.exception.ResourceNotFoundException; - import org.apache.velocity.exception.VelocityException; --import org.apache.velocity.tools.Scope; --import org.apache.velocity.tools.ToolManager; --import org.apache.velocity.tools.config.ConfigurationUtils; --import org.apache.velocity.tools.config.EasyFactoryConfiguration; --import org.apache.velocity.tools.config.FactoryConfiguration; --import org.apache.velocity.tools.generic.AlternatorTool; --import org.apache.velocity.tools.generic.ClassTool; --import org.apache.velocity.tools.generic.ComparisonDateTool; --import org.apache.velocity.tools.generic.ContextTool; --import org.apache.velocity.tools.generic.ConversionTool; --import org.apache.velocity.tools.generic.DisplayTool; --import org.apache.velocity.tools.generic.EscapeTool; --import org.apache.velocity.tools.generic.FieldTool; --import org.apache.velocity.tools.generic.LinkTool; --import org.apache.velocity.tools.generic.LoopTool; --import org.apache.velocity.tools.generic.MathTool; --import org.apache.velocity.tools.generic.NumberTool; --import org.apache.velocity.tools.generic.RenderTool; --import org.apache.velocity.tools.generic.ResourceTool; --import org.apache.velocity.tools.generic.SortTool; --import org.apache.velocity.tools.generic.XmlTool; - import org.codehaus.plexus.PlexusContainer; - import org.codehaus.plexus.component.annotations.Component; - import org.codehaus.plexus.component.annotations.Requirement; -@@ -495,41 +475,7 @@ public class DefaultSiteRenderer - */ - protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext ) - { -- Locale locale = siteRenderingContext.getLocale(); -- String dateFormat = siteRenderingContext.getDecoration().getPublishDate().getFormat(); -- -- EasyFactoryConfiguration config = new EasyFactoryConfiguration( false ); -- config.property( "safeMode", Boolean.FALSE ); -- config.toolbox( Scope.REQUEST ) -- .tool( ContextTool.class ) -- .tool( LinkTool.class ) -- .tool( LoopTool.class ) -- .tool( RenderTool.class ); -- config.toolbox( Scope.APPLICATION ).property( "locale", locale ) -- .tool( AlternatorTool.class ) -- .tool( ClassTool.class ) -- .tool( ComparisonDateTool.class ).property( "format", dateFormat ) -- .tool( ConversionTool.class ).property( "dateFormat", dateFormat ) -- .tool( DisplayTool.class ) -- .tool( EscapeTool.class ) -- .tool( FieldTool.class ) -- .tool( MathTool.class ) -- .tool( NumberTool.class ) -- .tool( ResourceTool.class ).property( "bundles", new String[] { "site-renderer" } ) -- .tool( SortTool.class ) -- .tool( XmlTool.class ); -- -- FactoryConfiguration customConfig = ConfigurationUtils.findInClasspath( TOOLS_LOCATION ); -- -- if ( customConfig != null ) -- { -- config.addConfiguration( customConfig ); -- } -- -- ToolManager manager = new ToolManager( false, false ); -- manager.configure( config ); -- -- return manager.createContext(); -+ return new VelocityContext(); - } - - /** +@@ -70,31 +70,11 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext.SiteDirectory; + import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.doxia.util.XmlValidator; + import org.apache.velocity.Template; ++import org.apache.velocity.VelocityContext; + import org.apache.velocity.context.Context; + import org.apache.velocity.exception.ParseErrorException; + import org.apache.velocity.exception.ResourceNotFoundException; + import org.apache.velocity.exception.VelocityException; +-import org.apache.velocity.tools.Scope; +-import org.apache.velocity.tools.ToolManager; +-import org.apache.velocity.tools.config.ConfigurationUtils; +-import org.apache.velocity.tools.config.EasyFactoryConfiguration; +-import org.apache.velocity.tools.config.FactoryConfiguration; +-import org.apache.velocity.tools.generic.AlternatorTool; +-import org.apache.velocity.tools.generic.ClassTool; +-import org.apache.velocity.tools.generic.ComparisonDateTool; +-import org.apache.velocity.tools.generic.ContextTool; +-import org.apache.velocity.tools.generic.ConversionTool; +-import org.apache.velocity.tools.generic.DisplayTool; +-import org.apache.velocity.tools.generic.EscapeTool; +-import org.apache.velocity.tools.generic.FieldTool; +-import org.apache.velocity.tools.generic.LinkTool; +-import org.apache.velocity.tools.generic.LoopTool; +-import org.apache.velocity.tools.generic.MathTool; +-import org.apache.velocity.tools.generic.NumberTool; +-import org.apache.velocity.tools.generic.RenderTool; +-import org.apache.velocity.tools.generic.ResourceTool; +-import org.apache.velocity.tools.generic.SortTool; +-import org.apache.velocity.tools.generic.XmlTool; + import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.util.DirectoryScanner; + import org.codehaus.plexus.util.FileUtils; +@@ -425,48 +405,7 @@ public class DefaultSiteRenderer implements Renderer { + * @return a Velocity tools managed context + */ + protected Context createToolManagedVelocityContext(SiteRenderingContext siteRenderingContext) { +- Locale locale = siteRenderingContext.getLocale(); +- String dateFormat = siteRenderingContext.getSiteModel().getPublishDate().getFormat(); +- String timeZoneId = siteRenderingContext.getSiteModel().getPublishDate().getTimezone(); +- TimeZone timeZone = +- "system".equalsIgnoreCase(timeZoneId) ? TimeZone.getDefault() : TimeZone.getTimeZone(timeZoneId); +- +- EasyFactoryConfiguration config = new EasyFactoryConfiguration(false); +- config.property("safeMode", Boolean.FALSE); +- config.toolbox(Scope.REQUEST) +- .tool(ContextTool.class) +- .tool(LinkTool.class) +- .tool(LoopTool.class) +- .tool(RenderTool.class); +- config.toolbox(Scope.APPLICATION) +- .property("locale", locale) +- .tool(AlternatorTool.class) +- .tool(ClassTool.class) +- .tool(ComparisonDateTool.class) +- .property("format", dateFormat) +- .property("timezone", timeZone) +- .tool(ConversionTool.class) +- .property("dateFormat", dateFormat) +- .tool(DisplayTool.class) +- .tool(EscapeTool.class) +- .tool(FieldTool.class) +- .tool(MathTool.class) +- .tool(NumberTool.class) +- .tool(ResourceTool.class) +- .property("bundles", new String[] {"site-renderer"}) +- .tool(SortTool.class) +- .tool(XmlTool.class); +- +- FactoryConfiguration customConfig = ConfigurationUtils.findInClasspath(TOOLS_LOCATION); +- +- if (customConfig != null) { +- config.addConfiguration(customConfig); +- } +- +- ToolManager manager = new ToolManager(false, false); +- manager.configure(config); +- +- return manager.createContext(); ++ return new VelocityContext(); + } + + /** -- -2.9.3 +2.46.1 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven-doxia-sitetools.git</param> <param name="revision">doxia-sitetools-2.0.0</param> <param name="match-tag">doxia-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">doxia-sitetools-(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ maven-doxia-sitetools-build.tar.xz ++++++ ++++ 1609 lines of diff (skipped)

1 0

commit maven-bundle-plugin for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-bundle-plugin for openSUSE:Factory checked in at 2024-10-16 23:46:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-bundle-plugin (Old) and /work/SRC/openSUSE:Factory/.maven-bundle-plugin.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-bundle-plugin" Wed Oct 16 23:46:55 2024 rev:4 rq:1208218 version:5.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-bundle-plugin/maven-bundle-plugin.changes 2024-09-24 17:32:56.612243491 +0200 +++ /work/SRC/openSUSE:Factory/.maven-bundle-plugin.new.19354/maven-bundle-plugin.changes 2024-10-16 23:48:18.216863017 +0200 @@ -1,0 +2,8 @@ +Thu Oct 3 10:26:07 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Build against maven-doxia >= 2.0.0 +- Modified patch: + * new-reporting-api.patch + + adapt to the maven-doxia 2.0.0 APIs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-bundle-plugin.spec ++++++ --- /var/tmp/diff_new_pack.wRhv1D/_old 2024-10-16 23:48:20.380953271 +0200 +++ /var/tmp/diff_new_pack.wRhv1D/_new 2024-10-16 23:48:20.380953271 +0200 @@ -32,7 +32,7 @@ BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository) BuildRequires: mvn(org.apache.felix:org.apache.felix.utils) -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) >= 2.0.0 BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) ++++++ new-reporting-api.patch ++++++ --- /var/tmp/diff_new_pack.wRhv1D/_old 2024-10-16 23:48:20.432955439 +0200 +++ /var/tmp/diff_new_pack.wRhv1D/_new 2024-10-16 23:48:20.436955606 +0200 @@ -1,16 +1,12 @@ ---- maven-bundle-plugin-5.1.1/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2020-07-09 18:44:18.000000000 +0200 -+++ maven-bundle-plugin-5.1.1/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2022-03-11 07:46:59.951664164 +0100 -@@ -324,6 +324,12 @@ +--- maven-bundle-plugin-5.1.9/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2024-09-30 22:01:52.149300507 +0200 ++++ maven-bundle-plugin-5.1.9/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2024-09-30 22:03:05.556458439 +0200 +@@ -324,7 +324,7 @@ return !skip && outputDirectory != null; } +- public void generate( @SuppressWarnings( "deprecation" ) org.codehaus.doxia.sink.Sink sink, Locale locale ) + public void generate( org.apache.maven.doxia.sink.Sink sink, Locale locale ) -+ throws MavenReportException -+ { -+ generate( (org.codehaus.doxia.sink.Sink) sink, locale ); -+ } -+ - public void generate( @SuppressWarnings( "deprecation" ) org.codehaus.doxia.sink.Sink sink, Locale locale ) throws MavenReportException { + final Context ctx = new Context();

1 0

commit maven-doxia for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-doxia for openSUSE:Factory checked in at 2024-10-16 23:46:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-doxia (Old) and /work/SRC/openSUSE:Factory/.maven-doxia.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-doxia" Wed Oct 16 23:46:46 2024 rev:15 rq:1208214 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-doxia/maven-doxia.changes 2024-09-30 15:40:35.581501301 +0200 +++ /work/SRC/openSUSE:Factory/.maven-doxia.new.19354/maven-doxia.changes 2024-10-16 23:48:03.592253099 +0200 @@ -1,0 +2,121 @@ +Thu Oct 3 14:00:26 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream version 2.0.0 + * Sub-task + + DOXIA-599: Replace <a /> element's name attribute with id + attribute + + DOXIA-668: Remove all obsolete attributes in HTML5 + + DOXIA-672: Parse id attribute only on <a /> elements by + default + + DOXIA-674: Replace table border handling with new CSS class + + DOXIA-675: Replace table alignment attributes with CSS styles + * Bug + + DOXIA-590: Either provided element class or default class + gets ignored + + DOXIA-598: Generated XHTML5 content does not pass W3 HTML5 + Validation Service + + DOXIA-619: Sink.sectionTitle1() creates <h2> instead of <h1> + + DOXIA-641: AptParser throws exception if title is not present + + DOXIA-649: Plexus to Sisu migration missed singleton + annotation + + DOXIA-662: Non unique IDs generated by IndexingSink + + DOXIA-671: Double quotes contained in markdown page are + removed in HTML output + + DOXIA-689: Restore incorrectly removed (HTML5) attributes + + DOXIA-690: Markdown Parser: Multiline metadata incorrectly + rendered + + DOXIA-691: APT: Emit multiple authors in separate meta tags + + DOXIA-692: Markdown Sink: Incorrect escape characters + + DOXIA-693: Markdown Sink: Incorrect ordered list item prefixes + + DOXIA-694: Markdown Sink: Too many line separators + + DOXIA-695: Support of h6 in xhtml output is broken + + DOXIA-699: Xhtml5Parser may emit sectionX() without + sectionX_() when using both <hX> and <section> + + DOXIA-704: style and class attributes not merged when + user-supplied in XHTML5 sink + + DOXIA-706: Sink.text(String, SinkEventAttributes) not properly + supported by Xhtml5BaseSink + + DOXIA-714: MarkdownSink: Fix table justification and figures + + DOXIA-715: Sink.text(String, SinkEventAttributes) not properly + supported by AptSink and MarkdownSink + + DOXIA-724: Sink pipeline returned by + AbstractParser.getWrappedSink(...) has wrong order + + DOXIA-726: MarkdownSink: Incorrect escaping of <,>,",' and & + + DOXIA-727: MarkdownSink: Incorrect escaping inside code spans + + DOXIA-734: XHTML 1.0 elements/attributes which are obsolete in + XHTML5 no longer detected by XdocParser/FmlParser + + DOXIA-737: [REGRESSION] Making EmitAnchorsForIndexableEntries + by default does not extract document titles anymore + + DOXIA-740: Rendering Markdown silently truncates files that + skip a heading level + * New Feature + + DOXIA-569: Add Markdown Sink to be able to convert anything to + Markdown + + DOXIA-660: Add ability to hide table rows via CSS + + DOXIA-722: Optionally create anchors for indexable entries + (used in TOC macro) + * Improvement + + DOXIA-617: doxia-module-markdown: Add support for --- header + section marks + + DOXIA-665: Add anchors around FML parts + + DOXIA-667: Add <summary> and <details> to recognized tag list + + DOXIA-669: Improve/rework CachedFileEntityResolver + + DOXIA-676: Remove all obsolete elements in HTML5 and add new + ones + + DOXIA-679: Introduce Sink#tableRows(void) method + + DOXIA-680: Don't wrap elements in anchors + + DOXIA-684: replace flexmark-all dependency with core + only + the used extensions + + DOXIA-685: Replace SinkEventAttributes#BOXED with #SOURCE to + clearly separate between regular verbatim and verbatim source + (code) + + DOXIA-687: Introduce Sink#verbatim(void) method + + DOXIA-700: Streamline, update and simplify Doxia ID generation + + DOXIA-709: Clarify usage of overlapping Sink methods + + DOXIA-711: Introduce SinkWrapper with factory + + DOXIA-716: Update and unify XMLReader creation and + configuration + + DOXIA-723: Optionally expose document location in Sink + + DOXIA-728: MarkdownSink: Support blockquotes + + DOXIA-731: Simplify HTML emitted from Sink.verbatim(...) + + DOXIA-732: Do not fail for duplicate anchor names + + DOXIA-738: Add Footnote extention for Markdown module + + DOXIA-739: Disable source code highlighters for verbatim + blocks for Markdown + * Task + + DOXIA-534: Remove Doxia Logging API + + DOXIA-630: Remove all deprecated modules + + DOXIA-631: Remove all deprecated macros + + DOXIA-632: Remove remaining deprecated code + + DOXIA-633: Drop and replace usage of HttpComponents in Core + + DOXIA-634: Drop and replace usage of Commons Lang in Core + + DOXIA-635: Drop and replace usage of Commons IO in Markdown + Module + + DOXIA-638: Replace Plexus Container Default with Sisu Plexus + Shim + + DOXIA-643: Upgrade to Java 8 + + DOXIA-644: Replace Plexus Annotations with Java Inject along + with JUnit 5 + + DOXIA-645: Clean up exceptions + + DOXIA-650: Make MarkdownParser to be a text parser with text + markup + + DOXIA-652: Drop build-info.properties in favor of default + pom.properties + + DOXIA-656: Make XHTML5 default implementation of HTML + + DOXIA-657: Deprecate XHML(4) module + + DOXIA-663: Remove deprecated XHTML module + + DOXIA-666: Remove code duplication Xhtml5Sink + + DOXIA-670: Drop dead XdocSink#link(String, String) method + + DOXIA-673: Remove compat handling of absent Sink#tableRows() + calls + + DOXIA-678: Add missing elements in Xhtml5BaseParser + + DOXIA-688: Remove empty alt attribute value on images which + causes the browser not to render replacement icon + + DOXIA-702: Fix dependency warnings in Markdown module + + DOXIA-705: Remove remaining deprecated/duplicated code +- Removed patch: + * 0002-Commons-configuration2.patch + + The upstream version is already ported to + commons-configuration2 + +------------------------------------------------------------------- Old: ---- 0002-Commons-configuration2.patch doxia-1.12.0-source-release.zip New: ---- LICENSE-2.0.txt _service maven-doxia-2.0.0.tar.xz BETA DEBUG BEGIN: Old:- Removed patch: * 0002-Commons-configuration2.patch + The upstream version is already ported to BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-doxia.spec ++++++ --- /var/tmp/diff_new_pack.qitjGS/_old 2024-10-16 23:48:05.988353028 +0200 +++ /var/tmp/diff_new_pack.qitjGS/_new 2024-10-16 23:48:05.992353195 +0200 @@ -17,40 +17,29 @@ Name: maven-doxia -Version: 1.12.0 +Version: 2.0.0 Release: 0 Summary: Content generation framework License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/doxia/ -Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxi… +Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.tar.xz -Patch0: 0002-Commons-configuration2.patch +Source2: https://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant -BuildRequires: apache-commons-configuration2 +BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-text -BuildRequires: commons-collections +BuildRequires: atinject BuildRequires: fdupes -BuildRequires: httpcomponents-client -BuildRequires: httpcomponents-core -BuildRequires: javapackages-local -BuildRequires: modello >= 2.0.0 -BuildRequires: parboiled -BuildRequires: pegdown -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-metadata-generator +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 +BuildRequires: jetbrains-annotations +BuildRequires: modello BuildRequires: plexus-utils BuildRequires: plexus-xml -BuildRequires: sisu-plexus -BuildRequires: unzip -BuildRequires: xmlgraphics-commons -BuildRequires: xmlgraphics-fop -BuildRequires: xmlunit -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(log4j:log4j) -BuildRequires: mvn(org.apache.maven:maven-parent:pom:) +BuildRequires: sisu-inject +BuildRequires: slf4j BuildArch: noarch %description @@ -62,19 +51,22 @@ %package core Summary: Core module for %{name} Group: Development/Libraries/Java -Obsoletes: %{name}-module-itext -Obsoletes: %{name}-module-markdown +# Make the upgrades easier. The last version +# before 2.0.0 was 1.12.0 +Obsoletes: %{name}-logging-api < 1.13 +Obsoletes: %{name}-module-confluence < 1.13 +Obsoletes: %{name}-module-docbook-simple < 1.13 +Obsoletes: %{name}-module-fo < 1.13 +Obsoletes: %{name}-module-itext < 1.13 +Obsoletes: %{name}-module-latex < 1.13 +Obsoletes: %{name}-module-markdown < 1.13 +Obsoletes: %{name}-module-rtf < 1.13 +Obsoletes: %{name}-module-twiki < 1.13 +Obsoletes: %{name}-module-xhtml < 1.13 %description core This package provides %{summary}. -%package logging-api -Summary: Logging-api module for %{name} -Group: Development/Libraries/Java - -%description logging-api -This package provides %{summary}. - %package module-apt Summary: APT module for %{name} Group: Development/Libraries/Java @@ -82,20 +74,6 @@ %description module-apt This package provides %{summary}. -%package module-confluence -Summary: Confluence module for %{name} -Group: Development/Libraries/Java - -%description module-confluence -This package provides %{summary}. - -%package module-docbook-simple -Summary: Simplified DocBook module for %{name} -Group: Development/Libraries/Java - -%description module-docbook-simple -This package provides %{summary}. - %package module-fml Summary: FML module for %{name} Group: Development/Libraries/Java @@ -103,34 +81,6 @@ %description module-fml This package provides %{summary}. -%package module-fo -Summary: FO module for %{name} -Group: Development/Libraries/Java - -%description module-fo -This package provides %{summary}. - -%package module-latex -Summary: Latex module for %{name} -Group: Development/Libraries/Java - -%description module-latex -This package provides %{summary}. - -%package module-rtf -Summary: RTF module for %{name} -Group: Development/Libraries/Java - -%description module-rtf -This package provides %{summary}. - -%package module-twiki -Summary: TWiki module for %{name} -Group: Development/Libraries/Java - -%description module-twiki -This package provides %{summary}. - %package module-xdoc Summary: XDoc module for %{name} Group: Development/Libraries/Java @@ -138,13 +88,6 @@ %description module-xdoc This package provides %{summary}. -%package module-xhtml -Summary: XHTML module for %{name} -Group: Development/Libraries/Java - -%description module-xhtml -This package provides %{summary}. - %package module-xhtml5 Summary: XHTML5 module for %{name} Group: Development/Libraries/Java @@ -174,120 +117,74 @@ API documentation for %{name}. %prep -%setup -q -n doxia-%{version} -a1 -%patch -P 0 -p1 - -# we don't have clirr-maven-plugin -%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml - -# complains -%pom_remove_plugin :apache-rat-plugin - -# requires network -rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java - -%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-core -for i in doxia-module-docbook-simple doxia-module-fml doxia-module-fo doxia-module-itext doxia-module-markdown doxia-module-xdoc doxia-module-xhtml doxia-module-xhtml5; do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-modules/${i} -done - -%pom_disable_module doxia-module-itext doxia-modules -%pom_disable_module doxia-module-markdown doxia-modules - -%{mvn_package} :doxia __noinstall -%{mvn_package} :doxia-modules __noinstall -%{mvn_package} :{*} @1 +%setup -q -a1 +cp %{SOURCE2} LICENSE %build mkdir -p lib build-jar-repository -s lib \ - apache-commons-text \ - commons-configuration2 \ - commons-lang3 \ - httpcomponents/httpclient \ - httpcomponents/httpcore \ - org.eclipse.sisu.plexus \ - parboiled/core \ - pegdown \ - plexus-containers/plexus-component-annotations \ + apache-commons-lang3 \ + apache-commons-text/commons-text \ + atinject \ + commons-io \ + jetbrains-annotations \ + org.eclipse.sisu.inject \ plexus/utils \ plexus/xml \ - xmlgraphics-commons \ - xmlgraphics-fop + slf4j/api -%{ant} -Dtest.skip=true \ - package javadoc +ant package javadoc mkdir -p target/site/apidocs -%{mvn_artifact} pom.xml +%install +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} + for i in \ - doxia-logging-api \ doxia-sink-api \ doxia-test-docs \ doxia-core; do - %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar + install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} if [ -d ${i}/target/site/apidocs ]; then - cp -r ${i}/target/site/apidocs target/site/apidocs/${i} + cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i} fi done -%{mvn_artifact} doxia-modules/pom.xml for i in \ doxia-module-apt \ - doxia-module-confluence \ - doxia-module-docbook-simple \ doxia-module-fml \ - doxia-module-fo \ - doxia-module-latex \ - doxia-module-rtf \ - doxia-module-twiki \ doxia-module-xdoc \ - doxia-module-xhtml \ doxia-module-xhtml5; do - %{mvn_artifact} doxia-modules/${i}/pom.xml doxia-modules/${i}/target/${i}-%{version}.jar + install -pm 0644 doxia-modules/${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar + %{mvn_install_pom} doxia-modules/${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i} if [ -d doxia-modules/${i}/target/site/apidocs ]; then - cp -r doxia-modules/${i}/target/site/apidocs target/site/apidocs/${i} + cp -r doxia-modules/${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i} fi done -%install -%mvn_install %fdupes -s %{buildroot}%{_javadocdir} %files core -f .mfiles-doxia-core - -%files logging-api -f .mfiles-doxia-logging-api %license LICENSE -%doc NOTICE %files module-apt -f .mfiles-doxia-module-apt -%files module-confluence -f .mfiles-doxia-module-confluence - -%files module-docbook-simple -f .mfiles-doxia-module-docbook-simple - %files module-fml -f .mfiles-doxia-module-fml -%files module-fo -f .mfiles-doxia-module-fo - -%files module-latex -f .mfiles-doxia-module-latex - -%files module-rtf -f .mfiles-doxia-module-rtf - -%files module-twiki -f .mfiles-doxia-module-twiki - %files module-xdoc -f .mfiles-doxia-module-xdoc -%files module-xhtml -f .mfiles-doxia-module-xhtml - %files module-xhtml5 -f .mfiles-doxia-module-xhtml5 %files sink-api -f .mfiles-doxia-sink-api %files test-docs -f .mfiles-doxia-test-docs -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE -%doc NOTICE ++++++ LICENSE-2.0.txt ++++++ Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven-doxia.git</param> <param name="revision">doxia-2.0.0</param> <param name="match-tag">doxia-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">doxia-(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ maven-doxia-build.tar.xz ++++++ ++++ 4241 lines of diff (skipped)

1 0

commit maven-reporting-api for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-reporting-api for openSUSE:Factory checked in at 2024-10-16 23:46:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-reporting-api (Old) and /work/SRC/openSUSE:Factory/.maven-reporting-api.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-reporting-api" Wed Oct 16 23:46:37 2024 rev:6 rq:1208210 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-reporting-api/maven-reporting-api.changes 2023-09-25 20:51:42.919304259 +0200 +++ /work/SRC/openSUSE:Factory/.maven-reporting-api.new.19354/maven-reporting-api.changes 2024-10-16 23:47:42.431370586 +0200 @@ -1,0 +2,16 @@ +Thu Oct 3 22:04:11 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream version 4.0.0 + * Improvement + + MSHARED-193: API change: let MavenReportRenderer#render() + throw an exception + + MSHARED-1032: API change: let MavenReport#canGenerateReport() + throw an exception + * Task + + MSHARED-1159: Require locale to be not null + + MSHARED-1231: Remove unused default-report.xml file + + MSHARED-1326: Improve MavenReport interface and + AbstractMavenReport class API +- Fetch sources by source service from Github + +------------------------------------------------------------------- Old: ---- maven-reporting-api-3.1.1-source-release.zip New: ---- _service maven-reporting-api-4.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-reporting-api.spec ++++++ --- /var/tmp/diff_new_pack.ISiGuR/_old 2024-10-16 23:47:43.815428308 +0200 +++ /var/tmp/diff_new_pack.ISiGuR/_new 2024-10-16 23:47:43.819428474 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-reporting-api # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,19 @@ Name: maven-reporting-api -Version: 3.1.1 +Version: 4.0.0 Release: 0 Summary: API to manage report generation License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/shared/maven-reporting-api -Source0: https://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-r… +Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local -BuildRequires: maven-doxia-sink-api -BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve +BuildRequires: javapackages-local >= 6 +BuildRequires: maven-doxia-sink-api >= 2.0 BuildArch: noarch %description @@ -54,26 +51,29 @@ cp %{SOURCE1} LICENSE.txt cp %{SOURCE2} build.xml -%pom_remove_parent - -# Previous package provides groupIds org.apache.maven.shared and org.apache.maven.reporting -%{mvn_alias} : org.apache.maven.shared:maven-reporting-api - %build mkdir -p lib build-jar-repository -s lib \ maven-doxia/doxia-sink-api -%{ant} jar javadoc - -%{mvn_artifact} pom.xml target/%{name}-%{version}.jar +ant jar javadoc %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a org.apache.maven.shared:maven-reporting-api +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE.txt -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE.txt ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven-reporting-api.git</param> <param name="revision">maven-reporting-api-4.0.0</param> <param name="match-tag">maven-reporting-api-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">maven-reporting-api-(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ maven-reporting-api-build.xml ++++++ --- /var/tmp/diff_new_pack.ISiGuR/_old 2024-10-16 23:47:43.887431310 +0200 +++ /var/tmp/diff_new_pack.ISiGuR/_new 2024-10-16 23:47:43.891431477 +0200 @@ -10,22 +10,23 @@ <property name="project.groupId" value="org.apache.maven.reporting"/> <property name="project.artifactId" value="maven-reporting-api"/> - <property name="project.name" value="Maven Reporting API"/> - <property name="project.version" value="3.1.1"/> + <property name="project.version" value="4.0.0"/> - <property name="project.organization.name" - value="The Apache Software Foundation"/> + <property name="spec.version" value="4.0"/> + + <property name="project.organization.name" value="The Apache Software Foundation"/> + <property name="project.name" value="Apache Maven Reporting API"/> <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}"/> + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/>  @@ -53,24 +54,21 @@ <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <javac destdir="${build.outputDir}" - encoding="UTF-8" nowarn="false" debug="true" optimize="false" deprecation="true" - release="${compiler.release}" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" + encoding="utf-8" source="${compiler.source}"> <src> <pathelement location="${build.srcDir}"/> </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> </target>  @@ -82,8 +80,8 @@ packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" - source="${compiler.source}" verbose="false" + locale="en" version="true" use="true" author="true" @@ -95,9 +93,10 @@ nohelp="false" nonavbar="false" serialwarn="false" - encoding="UTF-8" + encoding="utf-8" linksource="false" - breakiterator="false"> + breakiterator="false" + source="${compiler.source}"> <classpath refid="build.classpath"/> </javadoc> </target> @@ -114,19 +113,15 @@ excludes="**/package.html"> <manifest> <attribute name="Implementation-Title" value="${project.name}"/> - <attribute name="Implementation-URL" - value="http://maven.apache.org/shared/${project.artifactId}/"/> - <attribute name="Implementation-Vendor" - value="${project.organization.name}"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> <attribute name="Implementation-Version" value="${project.version}"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> <attribute name="Specification-Title" value="${project.name}"/> - <attribute name="Specification-Vendor" - value="${project.organization.name}"/> - <attribute name="Specification-Version" value="${project.version}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${spec.version}"/> </manifest> </jar> </target>

1 0

commit maven-reporting-exec for openSUSE:Factory
by Source-Sync 16 Oct '24

16 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-reporting-exec for openSUSE:Factory checked in at 2024-10-16 23:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-reporting-exec (Old) and /work/SRC/openSUSE:Factory/.maven-reporting-exec.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-reporting-exec" Wed Oct 16 23:46:32 2024 rev:6 rq:1208209 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-reporting-exec/maven-reporting-exec.changes 2022-03-24 23:00:09.296375326 +0100 +++ /work/SRC/openSUSE:Factory/.maven-reporting-exec.new.19354/maven-reporting-exec.changes 2024-10-16 23:47:33.767009239 +0200 @@ -1,0 +2,23 @@ +Tue Oct 15 18:38:58 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to version 2.0.0 + * Bug + + MSHARED-1298: Missing site report should be detected + * Improvement + + MSHARED-1236: Supply execution id of caller (Maven Site + Plugin) to MavenReportExecutorRequest + + MSHARED-1329: Add field to MavenReportExecution whether + it is user-defined or autodetected + * Task + + MSHARED-1060: Upgrade to Java 8 + + MSHARED-1061: Replace Plexus Logger with SLF4J + + MSHARED-1064: Reintroduce org.codehaus.doxia.sink.Sink + + MSHARED-1105: Replace Plexus Annotations with JSR 330 and + upgrade relevant dependencies + + MSHARED-1193: Remove Maven 2 compat code + + MSHARED-1207: Deprecate + MavenReportExecutorRequest#localRepository + + MSHARED-1387: Clean up dependencies +- Fetch sources using source service + +------------------------------------------------------------------- Old: ---- maven-reporting-exec-1.6.0-source-release.zip New: ---- LICENSE-2.0.txt _service maven-reporting-exec-2.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-reporting-exec.spec ++++++ --- /var/tmp/diff_new_pack.j6Rmfm/_old 2024-10-16 23:47:36.747133525 +0200 +++ /var/tmp/diff_new_pack.j6Rmfm/_new 2024-10-16 23:47:36.755133858 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-reporting-exec # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,34 +17,33 @@ Name: maven-reporting-exec -Version: 1.6.0 +Version: 2.0.0 Release: 0 Summary: Classes to manage report plugin executions with Maven 3 License: Apache-2.0 Group: Development/Libraries/Java -URL: https://maven.apache.org/shared/maven-reporting-exec/ -Source0: https://dlcdn.apache.org/maven/reporting/%{name}-%{version}-source-release.… +URL: https://maven.apache.org/shared/maven-reporting-exec +Source0: %{name}-%{version}.tar.xz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: fdupes BuildRequires: maven-local -BuildRequires: unzip +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-api) +BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-util) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-settings) -BuildRequires: mvn(org.apache.maven:maven-settings-builder) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.eclipse.aether:aether-api) -BuildRequires: mvn(org.eclipse.aether:aether-util) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) -Requires: java-headless +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch %description @@ -59,11 +58,7 @@ %prep %setup -q - -# convert CR+LF to LF -sed -i 's/\r//g' pom.xml src/main/java/org/apache/maven/reporting/exec/* - -%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin +cp %{SOURCE1} LICENSE.txt %build %{mvn_build} -f -- \ @@ -77,10 +72,9 @@ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles -%license LICENSE -%doc NOTICE DEPENDENCIES +%license LICENSE.txt +%doc README.md %files javadoc -f .mfiles-javadoc -%license LICENSE -%doc NOTICE +%license LICENSE.txt ++++++ LICENSE-2.0.txt ++++++ Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven-reporting-exec.git</param> <param name="revision">maven-reporting-exec-2.0.0</param> <param name="match-tag">maven-reporting-exec-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">maven-reporting-exec-(.*)</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>

1 0