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-parent.git


The following commit(s) were added to refs/heads/main by this push:
     new a47a3ac  Use default Java packaging and architecture
a47a3ac is described below

commit a47a3aca0992e167e46b0bfce79def149da14215
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Fri Apr 26 09:38:52 2024 +0200

    Use default Java packaging and architecture
---
 .github/workflows/build-reusable.yaml                        | 2 --
 .github/workflows/deploy-release-reusable.yaml               | 2 --
 .github/workflows/deploy-site-reusable.yaml                  | 2 --
 .github/workflows/deploy-snapshot-reusable.yaml              | 2 --
 .github/workflows/merge-dependabot-reusable.yaml             | 2 --
 src/changelog/.11.x.x/remove_java_architecture_packaging.xml | 7 +++++++
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-reusable.yaml 
b/.github/workflows/build-reusable.yaml
index 4a234e1..17f8704 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -53,8 +53,6 @@ jobs:
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
-          java-package: jdk
-          architecture: x64
           cache: maven
 
       # We could have used `verify`, but `clean install` is required while 
generating the build reproducibility report, which is performed in the next 
step.
diff --git a/.github/workflows/deploy-release-reusable.yaml 
b/.github/workflows/deploy-release-reusable.yaml
index 6d25789..1e45770 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -58,8 +58,6 @@ jobs:
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
-          java-package: jdk
-          architecture: x64
           cache: maven
           server-id: apache.releases.https
           server-username: NEXUS_USERNAME
diff --git a/.github/workflows/deploy-site-reusable.yaml 
b/.github/workflows/deploy-site-reusable.yaml
index c6242ef..98d717b 100644
--- a/.github/workflows/deploy-site-reusable.yaml
+++ b/.github/workflows/deploy-site-reusable.yaml
@@ -61,8 +61,6 @@ jobs:
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
-          java-package: jdk
-          architecture: x64
           cache: maven
           gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
 
diff --git a/.github/workflows/deploy-snapshot-reusable.yaml 
b/.github/workflows/deploy-snapshot-reusable.yaml
index a3cbf35..6ad6c8f 100644
--- a/.github/workflows/deploy-snapshot-reusable.yaml
+++ b/.github/workflows/deploy-snapshot-reusable.yaml
@@ -45,8 +45,6 @@ jobs:
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
-          java-package: jdk
-          architecture: x64
           cache: maven
           server-id: apache.snapshots.https
           server-username: NEXUS_USERNAME
diff --git a/.github/workflows/merge-dependabot-reusable.yaml 
b/.github/workflows/merge-dependabot-reusable.yaml
index 689b36c..71a0329 100644
--- a/.github/workflows/merge-dependabot-reusable.yaml
+++ b/.github/workflows/merge-dependabot-reusable.yaml
@@ -72,8 +72,6 @@ jobs:
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}
-          java-package: jdk
-          architecture: x64
           cache: maven
           server-id: apache.releases.https
           server-username: NEXUS_USERNAME
diff --git a/src/changelog/.11.x.x/remove_java_architecture_packaging.xml 
b/src/changelog/.11.x.x/remove_java_architecture_packaging.xml
new file mode 100644
index 0000000..a48e7ca
--- /dev/null
+++ b/src/changelog/.11.x.x/remove_java_architecture_packaging.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xmlns="https://logging.apache.org/xml/ns";
+       xsi:schemaLocation="https://logging.apache.org/xml/ns 
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
+       type="fixed">
+  <description format="asciidoc">Use default Java SE architecture and 
packaging (JDK) in workflows.</description>
+</entry>

Reply via email to