Merge pull request #227 from FatSaw/ver/1.12.2

Upstream paper pom changes with log4j fix

sources/pom.xml

@@ -30,7 +30,7 @@
  <dependency>
  <groupId>io.netty</groupId>
  <artifactId>netty-all</artifactId>
- <version>4.1.76.Final</version>
+ <version>4.1.78.Final</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
@@ -117,7 +117,7 @@
  <dependency>
  <groupId>com.lmax</groupId>
  <artifactId>disruptor</artifactId>
- <version>3.4.2</version>
+ <version>3.4.4</version>
  <scope>runtime</scope>
  </dependency>
 
@@ -134,7 +134,7 @@
  <version>1.3</version>
  <scope>test</scope>
  </dependency>
- 
+
  <!-- Akarin -->
  <dependency>
  <groupId>io.akarin</groupId>
@@ -154,7 +154,7 @@
  <dependency>
  <groupId>com.github.ben-manes.caffeine</groupId>
  <artifactId>caffeine</artifactId>
- <version>2.6.3-SNAPSHOT</version>
+ <version>2.9.3</version>
  </dependency>
  </dependencies>
 
@@ -163,10 +163,6 @@
  <id>elmakers-repo</id>
  <url>http://maven.elmakers.com/repository/</url>
  </repository>
- <repository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </repository>
  <repository>
  <id>spongepowered-repo</id>
  <url>https://repo.spongepowered.org/maven/</url>
@@ -203,8 +199,8 @@
 
  <pluginRepositories>
  <pluginRepository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+ <id>paper</id>
+ <url>https://papermc.io/repo/repository/maven-public/</url>
  </pluginRepository>
  </pluginRepositories>
 
@@ -245,6 +241,7 @@
  <Specification-Title>Bukkit</Specification-Title>
  <Specification-Version>${api.version}</Specification-Version>
  <Specification-Vendor>Bukkit Team</Specification-Vendor>
+ <Multi-Release>true</Multi-Release> <!-- Paper start - update log4j -->
  </manifestEntries>
  <manifestSections>
  <manifestSection>
@@ -272,7 +269,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.4</version>
  <executions>
  <execution>
  <phase>package</phase>
@@ -281,6 +278,24 @@
  </goals>
  <configuration>
  <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
+
+ <filters>
+ <filter>
+ <artifact>org.spigotmc:minecraft-server:**</artifact>
+ <excludes>
+ <exclude>org/apache/logging/log4j/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+
  <relocations>
  <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
  <!--<relocation>-->
@@ -312,27 +327,16 @@
  <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
  <resource>META-INF/services/java.sql.Driver</resource>
  </transformer>
- <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
+ <transformer implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer" />
  </transformers>
- <!-- Akarin - Avoid signature failure -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
  </configuration>
  </execution>
  </executions>
  <dependencies>
  <dependency>
- <groupId>com.github.edwgiz</groupId>
- <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
- <version>2.8.1</version>
+ <groupId>io.github.edwgiz</groupId>
+ <artifactId>log4j-maven-shade-plugin-extensions</artifactId>
+ <version>2.17.2</version>
  </dependency>
  </dependencies>
  </plugin>