Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-war-plugin
Commits: 0516f362 by Emmanuel Bourg at 2022-12-26T15:36:58+01:00 Fixed the build failure with maven-filtering 3.3 (Closes: #1026656) - - - - - b0b40b67 by Emmanuel Bourg at 2022-12-26T15:37:08+01:00 Standards-Version updated to 4.6.2 - - - - - cf32e535 by Emmanuel Bourg at 2022-12-26T15:37:22+01:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/01-maven-filtering-compatibility.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +maven-war-plugin (3.3.2-2) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with maven-filtering 3.3 (Closes: #1026656) + * Standards-Version updated to 4.6.2 + + -- Emmanuel Bourg <[email protected]> Mon, 26 Dec 2022 15:37:15 +0100 + maven-war-plugin (3.3.2-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Build-Depends: Build-Depends-Indep: junit4, libmaven-archiver-java (>= 3.6), - libmaven-filtering-java, + libmaven-filtering-java (>= 3.3.0), libmaven-mapping-java, libmaven-plugin-testing-java, libmaven-plugin-tools-java, @@ -19,7 +19,7 @@ Build-Depends-Indep: libplexus-io-java, libplexus-utils-java, libxstream-java -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/maven-war-plugin.git Vcs-Browser: https://salsa.debian.org/java-team/maven-war-plugin Homepage: http://maven.apache.org/plugins/maven-war-plugin/ ===================================== debian/patches/01-maven-filtering-compatibility.patch ===================================== @@ -0,0 +1,67 @@ +Description: Fixes the compatibility with maven-filtering 3.3.0 +Author: Emmanuel Bourg <[email protected]> +Bug: https://github.com/apache/maven-war-plugin/pull/34 +--- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java ++++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java +@@ -51,12 +51,12 @@ + import org.apache.maven.plugins.war.packaging.WarProjectPackagingTask; + import org.apache.maven.plugins.war.util.WebappStructure; + import org.apache.maven.project.MavenProject; ++import org.apache.maven.shared.filtering.FilterWrapper; + import org.apache.maven.shared.filtering.MavenFileFilter; + import org.apache.maven.shared.filtering.MavenFilteringException; + import org.apache.maven.shared.filtering.MavenResourcesExecution; + import org.apache.maven.shared.filtering.MavenResourcesFiltering; + import org.apache.maven.shared.utils.StringUtils; +-import org.apache.maven.shared.utils.io.FileUtils; + import org.codehaus.plexus.archiver.Archiver; + import org.codehaus.plexus.archiver.jar.JarArchiver; + import org.codehaus.plexus.archiver.manager.ArchiverManager; +@@ -485,7 +485,7 @@ + new OverlayManager( overlays, mavenProject, getDependentWarIncludes(), getDependentWarExcludes(), + currentProjectOverlay ); + // CHECKSTYLE_ON: LineLength +- List<FileUtils.FilterWrapper> defaultFilterWrappers; ++ List<FilterWrapper> defaultFilterWrappers; + try + { + MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(); +@@ -584,7 +584,7 @@ + + private final OverlayManager overlayManager; + +- private final List<FileUtils.FilterWrapper> filterWrappers; ++ private final List<FilterWrapper> filterWrappers; + + private List<String> nonFilteredFileExtensions; + +@@ -613,7 +613,7 @@ + */ + DefaultWarPackagingContext( final File webappDirectory, final WebappStructure webappStructure, + final OverlayManager overlayManager, +- List<FileUtils.FilterWrapper> filterWrappers, ++ List<FilterWrapper> filterWrappers, + List<String> nonFilteredFileExtensions, + boolean filteringDeploymentDescriptors, ArtifactFactory artifactFactory, + String resourceEncoding, boolean useJvmChmod, +@@ -804,7 +804,7 @@ + } + + @Override +- public List<FileUtils.FilterWrapper> getFilterWrappers() ++ public List<FilterWrapper> getFilterWrappers() + { + return filterWrappers; + } +--- a/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java ++++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java +@@ -28,8 +28,8 @@ + import org.apache.maven.plugin.logging.Log; + import org.apache.maven.plugins.war.util.WebappStructure; + import org.apache.maven.project.MavenProject; ++import org.apache.maven.shared.filtering.FilterWrapper; + import org.apache.maven.shared.filtering.MavenFileFilter; +-import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper; + import org.codehaus.plexus.archiver.jar.JarArchiver; + import org.codehaus.plexus.archiver.manager.ArchiverManager; + ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +01-maven-filtering-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/maven-war-plugin/-/compare/108c3e98b155d8f866e9eaa0f51a8774ac8fc63c...cf32e535b0e38e90247c1e63249eb3a340cba63e -- View it on GitLab: https://salsa.debian.org/java-team/maven-war-plugin/-/compare/108c3e98b155d8f866e9eaa0f51a8774ac8fc63c...cf32e535b0e38e90247c1e63249eb3a340cba63e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
