From 34a7571192d268bf8f525362d53baa1f89a7d670 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sun, 17 Dec 2023 12:47:08 +0100 Subject: [PATCH] [MASSEMBLY-1013] Remove custom SAR UnArchiver It is implemented by newer plexus-archiver --- .../SarPlexusIoResourceCollection.java | 38 ------------------- .../internal/SarUnArchiverProvider.java | 38 ------------------- 2 files changed, 76 deletions(-) delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/internal/SarPlexusIoResourceCollection.java delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/internal/SarUnArchiverProvider.java diff --git a/src/main/java/org/apache/maven/plugins/assembly/internal/SarPlexusIoResourceCollection.java b/src/main/java/org/apache/maven/plugins/assembly/internal/SarPlexusIoResourceCollection.java deleted file mode 100644 index b3a766a7..00000000 --- a/src/main/java/org/apache/maven/plugins/assembly/internal/SarPlexusIoResourceCollection.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.maven.plugins.assembly.internal; - -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; - -import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection; -import org.codehaus.plexus.components.io.resources.PlexusIoZipFileResourceCollection; - -/** - * Provider for "sar" {@link PlexusIoResourceCollection}. - */ -@Singleton -@Named("sar") -public class SarPlexusIoResourceCollection implements Provider { - @Override - public PlexusIoResourceCollection get() { - return new PlexusIoZipFileResourceCollection(); - } -} diff --git a/src/main/java/org/apache/maven/plugins/assembly/internal/SarUnArchiverProvider.java b/src/main/java/org/apache/maven/plugins/assembly/internal/SarUnArchiverProvider.java deleted file mode 100644 index 2ecb9099..00000000 --- a/src/main/java/org/apache/maven/plugins/assembly/internal/SarUnArchiverProvider.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.maven.plugins.assembly.internal; - -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; - -import org.codehaus.plexus.archiver.UnArchiver; -import org.codehaus.plexus.archiver.zip.ZipUnArchiver; - -/** - * Provider for "sar" {@link UnArchiver}. - */ -@Singleton -@Named("sar") -public class SarUnArchiverProvider implements Provider { - @Override - public UnArchiver get() { - return new ZipUnArchiver(); - } -}