Merge "Fix for JERSEY-2420: jersey-guava-2.x-sources.jar is empty"

Author: Michal Gajdoš

bundles/repackaged/jersey-guava/build.gradle

@@ -88,4 +88,30 @@ task generateProGuardConfig << {
         conf << ("-keep public class ${it}${ln}")
         conf << ("-keepclassmembers public class ${it} { *; }${ln}")
     }
-}
+}
+
+task copyShadedJar(type: Copy) {
+    def version = project.hasProperty('jerseyVersion') ? jerseyVersion : ''
+    from ('target') {
+        include 'jersey-guava-' + version + '-shaded-sources.jar'
+    }
+    into 'target'
+
+    rename {
+        String fileName -> fileName.replace('shaded-sources', 'sources')
+    }
+}
+
+task deleteShadedJar(type: Delete) {
+    def version = project.hasProperty('jerseyVersion') ? jerseyVersion : ''
+    delete ('target/jersey-guava-' + version + '-shaded-sources.jar')
+}
+
+task renameShadedJar(dependsOn: ['copyShadedJar', 'deleteShadedJar'])
+deleteShadedJar.mustRunAfter copyShadedJar
+
+copyShadedJar.onlyIf {project.hasProperty('jerseyVersion')}
+deleteShadedJar.onlyIf {project.hasProperty('jerseyVersion')}
+renameShadedJar.onlyIf {project.hasProperty('jerseyVersion')}
+generateProGuardConfig.onlyIf {!project.hasProperty('jerseyVersion')}
+

bundles/repackaged/jersey-guava/pom.xml

@@ -40,7 +40,8 @@
     holder.
 
 -->
-<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 http://maven.apache.org/maven-v4_0_0.xsd">
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -153,23 +154,39 @@
                     <plugin>
                         <groupId>org.fortasoft</groupId>
                         <artifactId>gradle-maven-plugin</artifactId>
-                        <configuration>
-                            <tasks>
-                                <task>generateProGuardConfig</task>
-                            </tasks>
-                            <args>
-                                <arg>-q</arg>
-                                <arg>-PshadedPackage=${shade.package}</arg>
-                                <arg>-PabsolutePath=${project.parent.parent.parent.basedir}</arg>
-                                <arg>-PconfFile=${project.build.directory}/proguard.conf</arg>
-                            </args>
-                        </configuration>
                         <executions>
                             <execution>
+                                <id>proguard</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>invoke</goal>
                                 </goals>
+                                <configuration>
+                                    <tasks>
+                                        <task>generateProGuardConfig</task>
+                                    </tasks>
+                                    <args>
+                                        <arg>-q</arg>
+                                        <arg>-PshadedPackage=${shade.package}</arg>
+                                        <arg>-PabsolutePath=${project.parent.parent.parent.basedir}</arg>
+                                        <arg>-PconfFile=${project.build.directory}/proguard.conf</arg>
+                                    </args>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>renameShaddedJar</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>invoke</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <task>renameShadedJar</task>
+                                    </tasks>
+                                    <args>
+                                        <arg>-PjerseyVersion=${jersey.version}</arg>
+                                    </args>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>