From c78afbc4f13ac4d6cb488fb14b31379960f03fff Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Thu, 10 Jun 2021 10:19:18 +0200
Subject: [PATCH] Remove tarball module (#11377)

Motivation:

We don't publish any tarballs these days so we can just remove the module

Modifications:

Remove tarball module and also adjust release scripts

Result:

Less code / config to mantain
---
 pom.xml                   |   4 -
 scripts/finish_release.sh |   2 +-
 tarball/assembly.xml      |  51 --------
 tarball/pom.xml           | 261 --------------------------------------
 4 files changed, 1 insertion(+), 317 deletions(-)
 delete mode 100644 tarball/assembly.xml
 delete mode 100644 tarball/pom.xml

diff --git a/pom.xml b/pom.xml
index a3c7e2fcde..6a13ce1f6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,7 +523,6 @@
     <module>resolver</module>
     <module>resolver-dns</module>
     <module>resolver-dns-native-macos</module>
-    <module>tarball</module>
     <module>transport</module>
     <module>transport-native-unix-common-tests</module>
     <module>transport-native-unix-common</module>
@@ -1316,9 +1315,6 @@
           <skip>${skipDeploy}</skip>
         </configuration>
       </plugin>
-      <!-- After artifacts were deployed from linux and macos we need to execute the following on macOS (in the root of the project).
-           mvn -Psonatype-oss-release,full,uber-staging -pl transport-native-kqueue,transport-native-unix-common,all,tarball clean package gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DstagingRepositoryId=${netty-id} -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging
-      -->
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <!-- Downgrade to 2.4.1 if release fails -->
diff --git a/scripts/finish_release.sh b/scripts/finish_release.sh
index 78e5ed2948..22f1b67f57 100755
--- a/scripts/finish_release.sh
+++ b/scripts/finish_release.sh
@@ -42,7 +42,7 @@ export JAVA_HOME="$JAVA8_HOME"
 
 ./mvnw -Psonatype-oss-release -am -pl resolver-dns-native-macos,transport-native-unix-common,transport-native-kqueue clean package gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DstagingRepositoryId="$1" -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging -DskipTests=true
 
-./mvnw -Psonatype-oss-release,full,uber-staging -pl all,tarball clean package gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DstagingRepositoryId="$1" -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging -DskipTests=true
+./mvnw -Psonatype-oss-release,full,uber-staging -pl all clean package gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DstagingRepositoryId="$1" -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging -DskipTests=true
 
 ./mvnw org.sonatype.plugins:nexus-staging-maven-plugin:rc-close org.sonatype.plugins:nexus-staging-maven-plugin:rc-release -DstagingRepositoryId="$1" -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging -DskipTests=true -DstagingProgressTimeoutMinutes=10
 
diff --git a/tarball/assembly.xml b/tarball/assembly.xml
deleted file mode 100644
index 1ad3974fc7..0000000000
--- a/tarball/assembly.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>tarball</id>
-  <formats>
-    <format>tar.bz2</format>
-  </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/..</directory>
-      <outputDirectory/>
-      <includes>
-        <include>*.txt</include>
-        <include>*.md</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/..</directory>
-      <outputDirectory/>
-      <includes>
-        <include>license/**/*.txt</include>
-        <include>license/**/*.md</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/jars</directory>
-      <outputDirectory>jar</outputDirectory>
-      <includes>
-        <include>**/*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/jars-all</directory>
-      <outputDirectory>jar/all-in-one</outputDirectory>
-      <includes>
-        <include>**/*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/apidocs-all</directory>
-      <outputDirectory>javadoc</outputDirectory>
-      <includes>
-        <include>**/*.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-
diff --git a/tarball/pom.xml b/tarball/pom.xml
deleted file mode 100644
index 564b1d313f..0000000000
--- a/tarball/pom.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 The Netty Project
-  ~
-  ~ The Netty Project 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:
-  ~
-  ~   https://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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>io.netty</groupId>
-    <artifactId>netty-parent</artifactId>
-    <version>4.1.66.Final-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>netty-tarball</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Netty/Tarball</name>
-  <properties>
-    <!-- Do not deploy this module -->
-    <skipDeploy>true</skipDeploy>
-  </properties>
-
-  <dependencies>
-    <!-- The example depends on all modules either directly or transitively -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netty-example</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <!-- All-in-one JAR -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netty-all</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-first</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Disable animal sniffer -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default</id>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Disable checkstyle -->
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>check-style</id>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <!-- If the uber profile is used it will automatically fetch the missing native jar from maven and add it to the all jar as well. -->
-    <profile>
-      <id>uber-staging</id>
-      <repositories>
-        <repository>
-          <id>staged-releases</id>
-          <name>Staged Releases</name>
-          <url>https://oss.sonatype.org/service/local/repositories/${stagingRepositoryId}/content/</url>
-        </repository>
-      </repositories>
-
-      <dependencies>
-        <!-- Depend on all our native jars -->
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>netty-transport-native-epoll</artifactId>
-          <version>${project.version}</version>
-          <classifier>linux-x86_64</classifier>
-          <scope>compile</scope>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
-          <version>${project.version}</version>
-          <classifier>osx-x86_64</classifier>
-          <scope>compile</scope>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>netty-resolver-dns-native-macos</artifactId>
-          <version>${project.version}</version>
-          <classifier>osx-x86_64</classifier>
-          <scope>compile</scope>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>uber-snapshot</id>
-      <dependencies>
-        <!-- Depend on all our native jars -->
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>netty-transport-native-epoll</artifactId>
-          <version>${project.version}</version>
-          <classifier>linux-x86_64</classifier>
-          <scope>compile</scope>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>netty-transport-native-kqueue</artifactId>
-          <version>${project.version}</version>
-          <classifier>osx-x86_64</classifier>
-          <scope>compile</scope>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>netty-resolver-dns-native-macos</artifactId>
-          <version>${project.version}</version>
-          <classifier>osx-x86_64</classifier>
-          <scope>compile</scope>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>full</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-jars</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/jars</outputDirectory>
-                  <includeGroupIds>${project.groupId}</includeGroupIds>
-                  <excludeArtifactIds>netty-all</excludeArtifactIds>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-sources</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <classifier>sources</classifier>
-                  <outputDirectory>${project.build.directory}/jars</outputDirectory>
-                  <includeGroupIds>${project.groupId}</includeGroupIds>
-                  <excludeArtifactIds>netty-all</excludeArtifactIds>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-jars-all-in-one</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/jars-all</outputDirectory>
-                  <includeGroupIds>${project.groupId}</includeGroupIds>
-                  <includeArtifactIds>netty-all</includeArtifactIds>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-sources-all-in-one</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <classifier>sources</classifier>
-                  <outputDirectory>${project.build.directory}/jars-all</outputDirectory>
-                  <includeGroupIds>${project.groupId}</includeGroupIds>
-                  <includeArtifactIds>netty-all</includeArtifactIds>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-apidocs-all-in-one</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <classifier>javadoc</classifier>
-                  <outputDirectory>${project.build.directory}/apidocs-all</outputDirectory>
-                  <includeGroupIds>${project.groupId}</includeGroupIds>
-                  <includeArtifactIds>netty-all</includeArtifactIds>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>build-tarball</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <finalName>netty-${project.version}</finalName>
-                  <appendAssemblyId>false</appendAssemblyId>
-                  <attach>false</attach>
-                  <descriptors>
-                    <descriptor>${project.basedir}/assembly.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
-