You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/01/03 23:57:36 UTC
[logging-log4j-tools] branch master updated: Big bang?
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 3184d5c Big bang?
3184d5c is described below
commit 3184d5c3642e78420200d8a00c3c9777ac2b32fd
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Jan 4 00:57:52 2023 +0100
Big bang?
---
.github/workflows/build.yml | 16 +++++-----
.github/workflows/maven-settings.xml | 28 -----------------
.github/workflows/simplelogger.properties | 51 -------------------------------
pom.xml | 12 ++------
4 files changed, 9 insertions(+), 98 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 182ca93..82ab6d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,7 +109,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # 3.2.0
- - name: Setup JDK 11
+ - name: Setup Java & GPG
uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b # 3.7.0
with:
distribution: temurin
@@ -166,17 +166,15 @@ jobs:
- name: Deploy
run: |
gpg --list-secret-keys
- cat ~/.m2/settings.xml
./mvnw \
--show-version --batch-mode --errors --no-transfer-progress \
- -Dgpg.skip=true \
- -DskipTests=true \
- --settings .github/workflows/maven-settings.xml \
- package install:install deploy:deploy
+ -P release
env:
- NEXUS_USER: ${{ secrets.NEXUS_USER }}
- NEXUS_PW: ${{ secrets.NEXUS_PW }}
- MAVEN_OPTS: "-Djavax.net.debug=ssl -Djava.util.logging.config.file=.github/workflows/simplelogger.properties"
+ # `NEXUS_USERNAME` and `NEXUS_PASSWORD` are used in `~/.m2/settings.xml` created by `setup-java` action
+ NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
+ NEXUS_PASSWORD: ${{ secrets.NEXUS_PW }}
+ # `SIGN_KEY` is used by `sign-maven-plugin`
+ SIGN_KEY: ${{ secrets.GPG_SECRET_KEY }}
- name: Create artifacts (RELEASE)
if: startsWith(github.ref, 'refs/heads/release/')
diff --git a/.github/workflows/maven-settings.xml b/.github/workflows/maven-settings.xml
deleted file mode 100644
index c7453df..0000000
--- a/.github/workflows/maven-settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!--
- ~ 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.
- -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
- <servers>
- <server>
- <id>apache.snapshots.https</id>
- <username>${env.NEXUS_USER}</username>
- <password>${env.NEXUS_PW}</password>
- </server>
- </servers>
-</settings>
diff --git a/.github/workflows/simplelogger.properties b/.github/workflows/simplelogger.properties
deleted file mode 100644
index dd7c6f0..0000000
--- a/.github/workflows/simplelogger.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-# https://support.sonatype.com/entries/23656571-Configuring-Maven-HTTP-Wagon-Detailed-Logging
-# ==========================================================================================================
-# === 1) copy this file to $M2_HOME/conf/logging/simplelogger.properties
-# === 2) MAVEN_OPTS should include reference to this file. Example:
-# === *nix: export MAVEN_OPTS="$MAVEN_OPTS -Djava.util.logging.config.file=$M2_HOME/conf/logging/simplelogger.properties"
-# === *win: set MAVEN_OPTS "%MAVEN_OPTS% -Djava.util.logging.config.file=%M2_HOME%/conf/logging/simplelogger.properties"
-# ==========================================================================================================
-
-# === Maven 2.2.1 and Maven 3.0.x section
-.level = INFO
-
-handlers=java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.ConsoleHandler.level = ALL
-
-# lightweight wagon - evil
-sun.net.www.level = FINEST
-
-# Maven 2.2.1 + wagon-http 2.1 + commons-httpclient 3.1 loaded via as extension dependency
-# may require slf4j-jdk14 as build extension if slf4j is also loaded via transitive extension
-httpclient.wire.header.level=FINEST
-org.apache.commons.httpclient.level=FINE
-
-# Maven 2.2.1 / 3.0.x + wagon-http 2.1 + httpclient 4x
-org.apache.http.level = FINEST
-org.apache.http.wire.level = SEVERE
-org.apache.http.impl.conn.level = FINEST
-org.apache.http.impl.client.level = FINEST
-org.apache.http.client.level = FINEST
-
-# wagon-http 2.2+ + httpclient 4x is shaded
-org.apache.maven.wagon.providers.http.httpclient.level = FINEST
-org.apache.maven.wagon.providers.http.httpclient.wire.level = SEVERE
-
-# === Maven 3.1.x+ section
-
-# http://maven.apache.org/maven-logging.html Default Overrides
-org.slf4j.simpleLogger.defaultLogLevel=trace
-org.slf4j.simpleLogger.showDateTime=true
-org.slf4j.simpleLogger.showThreadName=true
-org.slf4j.simpleLogger.showLogName=true
-org.slf4j.simpleLogger.logFile=System.out
-org.slf4j.simpleLogger.levelInBrackets=true
-org.slf4j.simpleLogger.log.Sisu=info
-org.slf4j.simpleLogger.warnLevelString=WARNING
-
-# HTTP logging overrides
-org.slf4j.simpleLogger.log.org.apache.http=DEBUG
-org.slf4j.simpleLogger.log.org.apache.http.wire=ERROR
-org.slf4j.simplelogger.log.org.apache.maven.wagon.providers.http=DEBUG
-org.slf4j.simplelogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=ERROR
diff --git a/pom.xml b/pom.xml
index 44e03dd..879baad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,7 @@
<id>release</id>
<properties>
+ <deployAtEnd>true</deployAtEnd>
<installAtEnd>true</installAtEnd>
<skipTests>true</skipTests>
<spotbugs.skip>true</spotbugs.skip>
@@ -154,7 +155,7 @@
<build>
- <defaultGoal>package sign:sign install:install deploy:deploy</defaultGoal>
+ <defaultGoal>deploy</defaultGoal>
<plugins>
@@ -184,15 +185,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>${maven-deploy-plugin.version}</version>
- <configuration>
- <deployAtEnd>true</deployAtEnd>
- </configuration>
- </plugin>
-
</plugins>
</build>