3 Commits

4 changed files with 37 additions and 21 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3321826c252f7708902c89304288784d830d457da25574e350cf8333aa02390
size 197804

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26a4e8f8118e641efdf285864c1ea5d6d7dca1b18f4dd36a033a78c168b2950e
size 210855

View File

@@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jan 3 08:10:09 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.3.0
* New Feature
+ MRRESOURCES-154: Allow to require project properties by bundle
+ MRRESOURCES-155: Allow to override bundle resources by project
* Improvement
+ MRRESOURCES-150: Ensure reproducible order in bundle goal
output META-INF/maven/remote-resources.xml
+ MRRESOURCES-152: Add property for resourceBundles and
outputDirectory
* Task
+ MRRESOURCES-151: Deprecate includeProjectProperties parameter
* Dependency upgrade
+ MRRESOURCES-146: Upgrade Parent to 43
+ MRRESOURCES-147: Bump org.apache.maven.shared:maven-filtering
from 3.3.2 to 3.4.0
+ MRRESOURCES-148: Bump org.apache.velocity:velocity-engine-core
from 2.3 to 2.4.1
+ MRRESOURCES-149: Bump org.eclipse.sisu:org.eclipse.sisu.plexus
from 0.9.0.M2 to 0.9.0.M3
+ MRRESOURCES-153: Bump maven-archiver from 3.6.1 to 3.6.3
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 09:10:09 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Apr 2 09:10:09 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package maven-remote-resources-plugin # spec file for package maven-remote-resources-plugin
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,8 @@
# #
%bcond_with tests
Name: maven-remote-resources-plugin Name: maven-remote-resources-plugin
Version: 3.2.0 Version: 3.3.0
Release: 0 Release: 0
Summary: Maven Remote Resources Plugin Summary: Maven Remote Resources Plugin
License: Apache-2.0 License: Apache-2.0
@@ -29,10 +28,13 @@ BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: unzip BuildRequires: unzip
BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
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-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
BuildRequires: mvn(org.apache.maven.shared:maven-filtering) BuildRequires: mvn(org.apache.maven.shared:maven-filtering)
BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven:maven-archiver)
@@ -41,18 +43,14 @@ BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-model-builder) BuildRequires: mvn(org.apache.maven:maven-model-builder)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-resolver-provider)
BuildRequires: mvn(org.apache.velocity:velocity-engine-core) BuildRequires: mvn(org.apache.velocity:velocity-engine-core)
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-resources) BuildRequires: mvn(org.codehaus.plexus:plexus-resources)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.codehaus.plexus:plexus-xml)
BuildRequires: mvn(org.eclipse.aether:aether-util) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildArch: noarch BuildArch: noarch
%if %{with tests}
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
BuildRequires: mvn(org.apache.maven.shared:maven-verifier) >= 1.9
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4)
%endif
%description %description
Process resources packaged in JARs that have been deployed to Process resources packaged in JARs that have been deployed to
@@ -72,14 +70,8 @@ API documentation for %{name}.
%prep %prep
%setup -q %setup -q
%pom_remove_dep :plexus-xml
%build %build
%{mvn_build} \ %{mvn_build} -f -- \
%if %{without tests}
-f \
%endif
-- \
-Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \ -Dmaven.compiler.release=8 \