Skip to content

Commit 90426eb

Browse files
committed
Merge branch 'develop'
2 parents e912466 + 2e4452c commit 90426eb

File tree

3 files changed

+74
-79
lines changed

3 files changed

+74
-79
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ repositories {
1111

1212
dependencies {
1313
api group: 'directory-network', name: 'mina', version: '0.8.0'
14-
api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
15-
api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
16-
api group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.13.3'
14+
api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.2'
15+
api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.2'
16+
api group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.17.2'
1717

18-
testImplementation group: 'junit', name: 'junit', version: '4.13.1'
18+
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
1919
}
2020

2121
jar {

codeql-analysis.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ master ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ master ]
20+
schedule:
21+
- cron: '18 6 * * 3'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'java' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v2
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v1
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
52+
53+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54+
# If this step fails, then you should remove it and run the build manually (see below)
55+
- name: Autobuild
56+
uses: github/codeql-action/autobuild@v1
57+
58+
# ℹ️ Command-line programs to run using the OS shell.
59+
# 📚 https://git.io/JvXDl
60+
61+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62+
# and modify them (or add more) to build your code if your project
63+
# uses a compiled language
64+
65+
#- run: |
66+
# make bootstrap
67+
# make release
68+
69+
- name: Perform CodeQL Analysis
70+
uses: github/codeql-action/analyze@v1

readme.txt

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)