Fix artifact metadata in JAR

gradle/publishing.gradle

@@ -35,17 +35,15 @@ task generateMinPom {
             |    <version>${project.version}</version>
             |""".stripMargin('|')
 
-        def dependencyTemplate = { dep -> """
-            <dependency>
-                <groupId>$dep.group</groupId>
-                <artifactId>$dep.name</artifactId>
-                <version>$dep.version</version>
-            </dependency>
-        """.stripIndent(4)
+        def dependencyTemplate = { dep -> """|        <dependency>
+                                             |            <groupId>$dep.group</groupId>
+                                             |            <artifactId>$dep.name</artifactId>
+                                             |            <version>$dep.version</version>
+                                             |        </dependency>""".stripMargin('|')
         }
 
         String deps = configurations.runtime.allDependencies.findAll({it.name!= 'unspecified'})
-            .collect({ dep -> dependencyTemplate(dep)}).join('')
+            .collect({ dep -> dependencyTemplate(dep)}).join('\n')
 
         String pom = pomHeader
         if (deps) {
@@ -55,6 +53,11 @@ task generateMinPom {
 
         project.file("$buildDir/tmp/maven").mkdirs()
         project.file("$buildDir/tmp/maven/pom.xml").text = pom
+        project.file("$buildDir/tmp/maven/pom.properties").text = """|# Generated by Gradle ${gradle.gradleVersion}
+            |version=${project.version}
+            |groupId=${project.group}
+            |artifactId=${project.name}
+            |""".stripMargin('|')
     }
 }
 
@@ -79,15 +82,6 @@ jar {
         from(rootProject.files('.')) {
             include 'LICENSE*'
         }
-        from(rootProject.file('src/maven')) {
-            into "maven/${project.group}/${project.name}"
-            expand(
-                'gradle_version': gradle.gradleVersion,
-                'project_version': project.version,
-                'project_group': project.group,
-                'project_name': project.name,
-            )
-        }
         from(file("$buildDir/tmp/maven")) {
             into "maven/${project.group}/${project.name}"
         }