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

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git


The following commit(s) were added to refs/heads/main by this push:
     new 16b2203  Fix `maven-wrapper.properties` line endings
16b2203 is described below

commit 16b22035e528e8290271d856005a38dcff7ef939
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Sat Feb 4 13:11:42 2023 +0100

    Fix `maven-wrapper.properties` line endings
---
 .gitattributes              |  2 ++
 .github/workflows/build.yml | 11 +----------
 mvnw                        |  1 -
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..c7934ea
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Maven Wrapper need LF line endings
+/.mvn/wrapper/maven-wrapper.properties eol=lf
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f9a1cd5..f744557 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,8 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        #os: [ macos-latest, ubuntu-latest, windows-latest ]
-        os: [ windows-latest ]
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
 
     steps:
 
@@ -64,20 +63,12 @@ jobs:
           architecture: x64
           cache: maven
 
-      # On Windows dowloading the Maven Wrapper fails if we use the `bash` 
script.
-      #- name: Check Maven Wrapper (Windows)
-      #  shell: cmd
-      #  env:
-      #    JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
-      #  run: mvnw --version
-
       # We could have used `verify`, but `clean install` is required while 
generating the build reproducibility report, which is performed in the next 
step.
       # For details, see: 
https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-to-test-my-maven-build-reproducibility
       - name: Build
         shell: bash
         env:
           JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
-          MVNW_VERBOSE: true
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
diff --git a/mvnw b/mvnw
index 10a3649..b7f0646 100755
--- a/mvnw
+++ b/mvnw
@@ -17,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 # ----------------------------------------------------------------------------
-set -x
 
 # ----------------------------------------------------------------------------
 # Apache Maven Wrapper startup batch script, version 3.1.1

Reply via email to