[maven-gh-actions-shared] branch v2 updated: Site build improvement

[sj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 23ace8e  Site build improvement
23ace8e is described below

commit 23ace8e1f8f8842f68fc09bbfb7db877a4773b9e
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Mar 3 19:41:41 2022 +0100

    Site build improvement
    
    - build site only in ff
    - upload site as GH artifact
    - parent pom 35
    - example java code
---
 .github/workflows/maven-verify.yml         | 14 ++++----
 pom.xml                                    |  2 +-
 src/main/java/org/apache/test/TestApp.java | 51 ++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index f61ab6a..dc99077 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -169,11 +169,17 @@ jobs:
       - name: Build Maven Site
         run: ./mvnw --errors --batch-mode --show-version ${{ inputs.maven_args }} ${{ inputs.ff-site-goal }}
 
+      - name: Upload Maven Site
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ github.run_number }}-site-${{ inputs.ff-os }}-${{ inputs.ff-jdk }}-${{ inputs.ff-jdk-distribution }}
+          path: '**/target/site/**'
+
       - name: Upload artifact on failure
         uses: actions/upload-artifact@v3
         if: failure() && inputs.failure-upload-path != ''
         with:
-          name: failure-${{ inputs.ff-os }}-${{ inputs.ff-jdk }}-${{ inputs.ff-jdk-distribution }}
+          name: ${{ github.run_number }}-failure-${{ inputs.ff-os }}-${{ inputs.ff-jdk }}-${{ inputs.ff-jdk-distribution }}
           path: ${{ inputs.failure-upload-path }}
 
       - name: Show free disk space
@@ -234,15 +240,11 @@ jobs:
         if: steps.should-run.conclusion == 'success'
         run: ./mvnw --errors --batch-mode --show-version ${{ inputs.maven_args }} ${{ inputs.verify-goal }}
 
-      - name: Build Maven Site
-        if: steps.should-run.conclusion == 'success'
-        run: ./mvnw --errors --batch-mode --show-version ${{ inputs.maven_args }} ${{ inputs.verify-site-goal }}
-
       - name: Upload artifact on failure
         uses: actions/upload-artifact@v3
         if: steps.should-run.conclusion == 'success' && failure() && inputs.failure-upload-path != ''
         with:
-          name: failure-${{ matrix.os }}-${{ matrix.jdk }}-${{ matrix.distribution }}
+          name: ${{ github.run_number }}-failure-${{ matrix.os }}-${{ matrix.jdk }}-${{ matrix.distribution }}
           path: ${{ inputs.failure-upload-path }}
 
       - name: Show free disk space
diff --git a/pom.xml b/pom.xml
index 454cc8e..76ceeef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <parent>
       <artifactId>maven-parent</artifactId>
       <groupId>org.apache.maven</groupId>
-      <version>34</version>
+      <version>35</version>
       <relativePath/>
     </parent>
 
diff --git a/src/main/java/org/apache/test/TestApp.java b/src/main/java/org/apache/test/TestApp.java
new file mode 100644
index 0000000..852a5d0
--- /dev/null
+++ b/src/main/java/org/apache/test/TestApp.java
@@ -0,0 +1,51 @@
+package org.apache.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Test app
+ */
+public class TestApp
+{
+
+    public static void main( String[] args )
+    {
+        m1();
+        m2();
+    }
+
+    /**
+     * FIXME in javadoc
+     */
+    private static void m1()
+    {
+        System.out.println( "Hello" );
+    }
+
+    private static void m2()
+    {
+        System.out.println( "Hello" );
+    }
+
+    private static void m3()
+    {
+        // TODO test tag
+    }
+}