From 45bbe23f5a0277e2b4a8eca9d856f16e0f02d1f6 Mon Sep 17 00:00:00 2001
From: Michael Hillcox <michaelhillcox@gmail.com>
Date: Fri, 20 Nov 2020 16:58:55 +0000
Subject: [PATCH] Updated changelog and modified the build gradle for jenkins

---
 build.gradle        | 55 ++++++++++++++++++++++++++++++---------------
 update/changelog.md |  2 ++
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 14a9e6fc7..4593514a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ buildscript {
 
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
+apply plugin: 'maven-publish'
 
 version = "1.12.2-r152"
 group = "de.ellpeck.actuallyadditions"
@@ -67,18 +68,21 @@ processResources {
 jar {
 
 }
-
 task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    from sourceSets.main.java
-    classifier = 'dev'
+    from(sourceSets.main.output)
+    archiveName = "${baseName}-${version}-deobf.${extension}"
+}
+
+task sourcesJar(type: Jar) {
+    from(sourceSets.main.allSource)
+    archiveName = "${baseName}-${version}-sources.${extension}"
 }
 
 task apiJar(type: Jar) {
-    from sourceSets.main.output
-    from sourceSets.main.java
-    classifier = 'api'
-    include 'de/ellpeck/actuallyadditions/api/**'
+    from(sourceSets.main.output)
+    from(sourceSets.main.java)
+    include("de/ellpeck/actuallyadditions/api/**")
+    archiveName = "${baseName}-${version}-api.${extension}"
 }
 
 javadoc {
@@ -90,21 +94,36 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier 'javadoc'
 }
 
-task sourcesJar(type: Jar) {
-    from sourceSets.main.java
-    classifier = 'sources'
+artifacts {
+    archives deobfJar
+    archives sourcesJar
+    archives apiJar
+    archives javadocJar
 }
 
-apply plugin: 'maven-publish'
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact jar
-            artifact apiJar
-            artifact javadocJar
-            artifact sourcesJar
-            artifact deobfJar
+            groupId project.group
+            artifactId project.archivesBaseName
+            version project.version
+            from components.java
+
+            artifact deobfJar {
+                classifier 'deobf'
+            }
+            artifact sourcesJar {
+                classifier 'sources'
+            }
+            artifact apiJar {
+                classifier 'api'
+            }
+
+            pom.withXml {
+                def node = asNode()
+                if (node.dependencies.size() > 0)
+                    node.remove(node.dependencies)
+            }
         }
     }
     repositories {
diff --git a/update/changelog.md b/update/changelog.md
index 6496cd8cc..7a6ac6604 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,5 +1,7 @@
 # 1.12.2-r152
 * CrankySupertoon: Fixed Crystal Flux Localization
+* Falcion: Updated russian translation
+* Jammehcow: Fixed a rare NPE with other mods on the worm entity
 
 # 1.12.2-r151
 * TomyLobo: Improved performance of the item interface.