Skip to content

Commit

Permalink
Merge pull request #71 from bjhargrave/issues/70
Browse files Browse the repository at this point in the history
Replace StubLogger implementation with a proxy to avoid directly implementing OSGi Logger.
  • Loading branch information
bjhargrave authored May 14, 2022
2 parents 80cd2e6 + 3c28e18 commit 0f03385
Show file tree
Hide file tree
Showing 13 changed files with 534 additions and 230 deletions.
File renamed without changes.
File renamed without changes.
23 changes: 15 additions & 8 deletions .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@ on:
push:
branches-ignore:
- 'dependabot/**'
paths-ignore:
- '.github/**/*codeql*'
- '.github/*.yml'
paths:
- '**'
- '!docs/**'
- '!.github/**'
- '.github/**/*ci*'
pull_request:
paths-ignore:
- '.github/**/*codeql*'
- '.github/*.yml'
paths:
- '**'
- '!docs/**'
- '!.github/**'
- '.github/**/*ci*'

env:
LC_ALL: en_US.UTF-8
Expand All @@ -41,6 +45,9 @@ defaults:
run:
shell: bash

permissions:
contents: read

jobs:
build:
strategy:
Expand All @@ -67,7 +74,7 @@ jobs:
- name: Build
id: build
run: |
./.github/scripts/build.sh
./.github/scripts/ci-build.sh
- name: Configure settings.xml for Publish
if: ${{ matrix.canonical }}
uses: actions/setup-java@v3
Expand All @@ -82,7 +89,7 @@ jobs:
- name: Publish
if: ${{ matrix.canonical }}
run: |
./.github/scripts/publish.sh -Possrh
./.github/scripts/ci-publish.sh -Possrh
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@ defaults:
run:
shell: bash

permissions:
contents: read

jobs:
analyze:
permissions:
# required for all workflows
security-events: write
security-events: write # for github/codeql-action/analyze to upload SARIF results
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
Loading

0 comments on commit 0f03385

Please sign in to comment.