diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a59683ff7..18df714c84 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: jdk: [11, 17] - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest] fail-fast: true max-parallel: 4 steps: diff --git a/logback-access/pom.xml b/logback-access/pom.xml index c264ca5ffd..e2f7e14893 100755 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -8,7 +8,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro logback-access diff --git a/logback-classic-blackbox/pom.xml b/logback-classic-blackbox/pom.xml index 10a78630e0..28f6d0e9ea 100644 --- a/logback-classic-blackbox/pom.xml +++ b/logback-classic-blackbox/pom.xml @@ -8,7 +8,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro logback-classic-blackbox diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 93ddfa539b..e87a4086d9 100755 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -8,7 +8,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro logback-classic diff --git a/logback-classic/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/logback-classic/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider deleted file mode 100755 index 501df6ddd2..0000000000 --- a/logback-classic/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider +++ /dev/null @@ -1 +0,0 @@ -ch.qos.logback.classic.spi.LogbackServiceProvider \ No newline at end of file diff --git a/logback-core-blackbox/pom.xml b/logback-core-blackbox/pom.xml index 8544e03546..d473f119de 100644 --- a/logback-core-blackbox/pom.xml +++ b/logback-core-blackbox/pom.xml @@ -8,7 +8,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro logback-core-blackbox diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 77fb16efa0..04ff26916b 100755 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -8,7 +8,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro logback-core diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 83646b02c4..a91ea4cdb8 100755 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -8,7 +8,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro logback-examples diff --git a/pom.xml b/pom.xml index bc2e5d08b7..99bde5827a 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ ch.qos.logback logback-parent - 1.4.7 + 1.4.7-jpro pom Logback-Parent @@ -49,7 +49,7 @@ - 2023-04-19T18:39:00Z + 2023-05-11T16:18:34Z 11 ${jdk.version} UTF-8 @@ -409,12 +409,16 @@ - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + artifactory central + a0uvvlcxlpyjx-artifactory-primary-0-releases + https://sandec.jfrog.io/artifactory/repo - + + artifactory snapshots + a0uvvlcxlpyjx-artifactory-primary-0-snapshots + https://sandec.jfrog.io/artifactory/repo + diff --git a/release.sh b/release.sh index eca968703a..0a99e24f5a 100755 --- a/release.sh +++ b/release.sh @@ -1,25 +1,33 @@ -mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION_NUMBER} +if [[ "$JAVA_HOME" != *"temurin-11.jdk"* ]]; then + echo "###################################################" + echo "### Please use Temurin version 11 for the build ###" + echo "###################################################" + say "Use Java 11" + exit 1 +fi + +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=1.4.7-jpro mvn clean -mvn install +mvn install -DskipTests=true mvn animal-sniffer:check -mvn site:site +#mvn site:site #mvn javadoc:jar #mvn assembly:single -export GPG_TTY=$(tty) -password -mvn deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=passwd - +#export GPG_TTY=$(tty) +#password +#mvn deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=passwd +mvn deploy -DskipTests=true -P javadocjar # cleanHistory dep #uncomment diffie-hellman support in /etc/ssh/sshd_config -mvn site:deploy -N # with Java 8!!! +#mvn site:deploy -N # with Java 8!!! -git tag -m "tagging" -a v_${VERSION_NUMBER} -git push --tags +#git tag -m "tagging" -a v_${VERSION_NUMBER} +#git push --tags -release version and add next version on jira +#release version and add next version on jira