onixbyte/onixbyte-bom
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into development

Browse Source 
# Conflicts:
#	devkit-core/src/main/resources/logback.xml
#	devkit-utils/src/main/resources/logback.xml
#	guid/src/main/resources/logback.xml
#	property-guard-spring-boot-starter/src/main/resources/logback.xml
#	simple-jwt-authzero/src/main/resources/logback.xml
#	simple-jwt-facade/src/main/resources/logback.xml
#	simple-jwt-jjwt/src/main/resources/logback.xml
#	simple-jwt-spring-boot-starter/src/main/resources/logback.xml
#	webcal/src/main/resources/logback.xml
This commit is contained in:
Zihlu Wang
2024-03-31 17:52:47 +08:00
parent bb79c126fa 9975d25d30
commit cb537a6844
22 changed files with 289 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
property-guard-spring-boot-starter/build.gradle.kts
+23 -6
View File
@@ -1,7 +1,24 @@
/*
* Copyright (C) 2023 CodeCraftersCN.
*
* Licensed 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.
*/
import java.net.URI
val sGroupId: String by project
val sVersion: String by project
val buildGroupId: String by project
val buildVersion: String by project
val projectUrl: String by project
val projectGithubUrl: String by project
val licenseName: String by project
@@ -9,8 +26,8 @@ val licenseUrl: String by project
val springBootVersion: String by project
group = sGroupId
version = sVersion
group = buildGroupId
version = buildVersion
dependencies {
implementation(project(":devkit-utils"))
@@ -34,9 +51,9 @@ tasks.test {
publishing {
publications {
create<MavenPublication>("propertyGuardSpringBootStarter") {
groupId = sGroupId
groupId = buildGroupId
artifactId = "property-guard-spring-boot-starter"
version = sVersion
version = buildVersion
pom {
name = "Property Guard Spring Boot Starter"
property-guard-spring-boot-starter/src/main/resources/logback.xml
+3 -5
View File
@@ -17,12 +17,10 @@
-->
<configuration>
<property name="COLOURFUL_OUTPUT"
value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
<property name="STANDARD_OUTPUT"
value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${COLOURFUL_OUTPUT}</pattern>