Fix maven shade and optimize CI

henriquetruta · henriquetruta · commit 471422175524 · 2020-04-21T11:46:21.000+02:00
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -27,17 +27,19 @@ jobs:
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-    - name: Build with Maven
+    - name: Build
       env:
         CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
-      run: |
-        mvn clean verify -Pcoverage -Ppack --file pom.xml --batch-mode -Dsytle.colors=always --errors
-        bash <(curl -s https://codecov.io/bash) -t $CODECOV_TOKEN -F unittests -f ./target/site/jacoco/jacoco.xml -n codecov-umbrella
-    - name: Release
-      # if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-      uses: samuelmeuli/action-maven-publish@v1
+      run: mvn -B package --file pom.xml -Pcoverage -Dsytle.colors=always --errors
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
       with:
-        gpg_private_key: ${{ secrets.gpg_private_key }}
-        gpg_passphrase: ${{ secrets.gpg_passphrase }}
-        nexus_username: ${{ secrets.nexus_username }}
-        nexus_password: ${{ secrets.nexus_password }}
+        token: ${{ secrets.CODECOV_TOKEN }}
+    - name: Release
+        # if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: samuelmeuli/action-maven-publish@v1
+        with:
+          gpg_private_key: ${{ secrets.gpg_private_key }}
+          gpg_passphrase: ${{ secrets.gpg_passphrase }}
+          nexus_username: ${{ secrets.nexus_username }}
+          nexus_password: ${{ secrets.nexus_password }}
diff --git a/pom.xml b/pom.xml
@@ -304,47 +304,6 @@
         </build>
         </profile>
 
-        <profile>
-            <id>pack</id>
-            <build>
-                <plugins>
-                    <!--Based on: https://www.baeldung.com/executable-jar-with-maven-->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-shade-plugin</artifactId>
-                        <version>3.2.0</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>shade</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactSet>
-                                        <includes>
-                                            <include>${project.groupId}:${project.artifactId}</include>
-                                            <include>com.squareup.okhttp3</include>
-                                            <include>com.squareup.okio</include>
-                                        </includes>
-                                    </artifactSet>
-                                    <relocations>
-                                        <relocation>
-                                            <pattern>okhttp3</pattern>
-                                            <shadedPattern>${shade.id}.okhttp3</shadedPattern>
-                                        </relocation>
-                                        <relocation>
-                                            <pattern>okio</pattern>
-                                            <shadedPattern>${shade.id}.okio</shadedPattern>
-                                        </relocation>
-                                    </relocations>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>deploy</id>
             <!-- Based on: https://central.sonatype.org/pages/apache-maven.html-->
@@ -396,9 +355,6 @@
                                 </goals>
                             </execution>
                         </executions>
-                        <configuration>
-                            <source>8</source>
-                        </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
@@ -510,6 +466,38 @@
                     <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${project.groupId}:${project.artifactId}</include>
+                                    <include>com.squareup.okhttp3</include>
+                                    <include>com.squareup.okio</include>
+                                </includes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>okhttp3</pattern>
+                                    <shadedPattern>${shade.id}.okhttp3</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>okio</pattern>
+                                    <shadedPattern>${shade.id}.okio</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
