Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit 67dc702

Browse files
authored
Merge branch 'development' into localwrapper-console
2 parents bbe3e61 + a323902 commit 67dc702

File tree

603 files changed

+21153
-16234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

603 files changed

+21153
-16234
lines changed

.github/stale.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: stale
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: true

.github/workflows/workflow.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: CloudNet Build
2+
3+
on: [create, push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
java: ['8', '11', '12']
11+
12+
steps:
13+
- uses: actions/checkout@v1
14+
- name: Set up Java ${{ matrix.java }}
15+
uses: actions/setup-java@v1
16+
with:
17+
java-version: ${{ matrix.java }}
18+
architecture: x64
19+
- name: Build with Maven
20+
run: mvn clean test package
21+
- name: Repackage with Maven
22+
run: mvn package
23+
- name: Release ZIP
24+
run: |
25+
mkdir -p temp;
26+
cp -r .template/* temp/;
27+
cp cloudnet-core/target/CloudNet-Master.jar temp/CloudNet-Master/;
28+
cp cloudnet-wrapper/target/CloudNet-Wrapper.jar temp/CloudNet-Wrapper/;
29+
find cloudnet-tools/ -type f -name "cloudnet-tools-*.jar" -and -not -name "*-sources.jar" -and -not -name "*-javadoc.jar" -exec cp "{}" temp/tools/ ';'
30+
- uses: actions/upload-artifact@master
31+
with:
32+
name: CloudNet-V2
33+
path: temp/

.gitignore

Lines changed: 163 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,175 @@
1-
# Eclipse stuff
2-
.classpath
3-
.project
4-
.settings/
1+
# Created by .ignore support plugin (hsz.mobi)
2+
### Java template
3+
# Compiled class file
4+
*.class
5+
6+
# Log file
7+
*.log
8+
9+
# BlueJ files
10+
*.ctxt
11+
12+
# Mobile Tools for Java (J2ME)
13+
.mtj.tmp/
14+
15+
# Package Files #
16+
*.jar
17+
*.war
18+
*.nar
19+
*.ear
20+
*.zip
21+
*.tar.gz
22+
*.rar
23+
24+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
25+
hs_err_pid*
26+
27+
### JetBrains template
28+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
29+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
30+
31+
# User-specific stuff
32+
.idea/**/workspace.xml
33+
.idea/**/tasks.xml
34+
.idea/**/usage.statistics.xml
35+
.idea/**/dictionaries
36+
.idea/**/shelf
37+
38+
# Generated files
39+
.idea/**/contentModel.xml
40+
41+
# Sensitive or high-churn files
42+
.idea/**/dataSources/
43+
.idea/**/dataSources.ids
44+
.idea/**/dataSources.local.xml
45+
.idea/**/sqlDataSources.xml
46+
.idea/**/dynamic.xml
47+
.idea/**/uiDesigner.xml
48+
.idea/**/dbnavigator.xml
49+
50+
# Gradle
51+
.idea/**/gradle.xml
52+
.idea/**/libraries
53+
54+
# Gradle and Maven with auto-import
55+
# When using Gradle or Maven with auto-import, you should exclude module files,
56+
# since they will be recreated, and may cause churn. Uncomment if using
57+
# auto-import.
58+
# .idea/modules.xml
59+
# .idea/*.iml
60+
# .idea/modules
61+
# *.iml
62+
# *.ipr
63+
64+
# CMake
65+
cmake-build-*/
66+
67+
# Mongo Explorer plugin
68+
.idea/**/mongoSettings.xml
69+
70+
# File-based project format
71+
*.iws
72+
73+
# IntelliJ
74+
out/
75+
76+
# mpeltonen/sbt-idea plugin
77+
.idea_modules/
78+
79+
# JIRA plugin
80+
atlassian-ide-plugin.xml
81+
82+
# Cursive Clojure plugin
83+
.idea/replstate.xml
584

6-
# netbeans
7-
nbproject/
8-
nbactions.xml
9-
.idea
10-
src/main/test
85+
# Crashlytics plugin (for Android Studio and IntelliJ)
86+
com_crashlytics_export_strings.xml
87+
crashlytics.properties
88+
crashlytics-build.properties
89+
fabric.properties
1190

12-
# we use maven!
13-
build.xml
91+
# Editor-based Rest Client
92+
.idea/httpRequests
1493

15-
# maven
94+
# Android studio 3.1+ serialized cache file
95+
.idea/caches/build_file_checksums.ser
96+
97+
### Maven template
1698
target/
99+
pom.xml.tag
100+
pom.xml.releaseBackup
101+
pom.xml.versionsBackup
102+
pom.xml.next
103+
release.properties
17104
dependency-reduced-pom.xml
18-
src/test
19-
20-
# vim
21-
.*.sw[a-p]
105+
buildNumber.properties
106+
.mvn/timing.properties
107+
.mvn/wrapper/maven-wrapper.jar
22108

23-
# various other potential build files
24-
build/
109+
### Eclipse template
110+
.metadata
25111
bin/
26-
dist/
27-
manifest.mf
112+
tmp/
113+
*.tmp
114+
*.bak
115+
*.swp
116+
*~.nib
117+
local.properties
118+
.settings/
119+
.loadpath
120+
.recommenders
28121

29-
# Mac filesystem dust
30-
.DS_Store/
122+
# External tool builders
123+
.externalToolBuilders/
31124

32-
# intellij
33-
*.iml
34-
*.ipr
35-
*.iws
36-
.idea/
37-
CloudNet.zip
125+
# Locally stored "Eclipse launch configurations"
126+
*.launch
127+
128+
# PyDev specific (Python IDE for Eclipse)
129+
*.pydevproject
130+
131+
# CDT-specific (C/C++ Development Tooling)
132+
.cproject
133+
134+
# CDT- autotools
135+
.autotools
136+
137+
# Java annotation processor (APT)
138+
.factorypath
38139

39-
# other files
40-
*.log*
140+
# PDT-specific (PHP Development Tools)
141+
.buildpath
41142

42-
# delombok
43-
*/src/main/lombok
143+
# sbteclipse plugin
144+
.target
145+
146+
# Tern plugin
147+
.tern-project
148+
149+
# TeXlipse plugin
150+
.texlipse
151+
152+
# STS (Spring Tool Suite)
153+
.springBeans
154+
155+
# Code Recommenders
156+
.recommenders/
157+
158+
# Annotation Processing
159+
.apt_generated/
160+
161+
# Scala IDE specific (Scala & Java development for Eclipse)
162+
.cache-main
163+
.scala_dependencies
164+
.worksheet
165+
166+
### NetBeans template
167+
**/nbproject/private/
168+
**/nbproject/Makefile-*.mk
169+
**/nbproject/Package-*.bash
170+
build/
171+
nbbuild/
172+
dist/
173+
nbdist/
174+
.nb-gradle/
44175

45-
#Testing in the IDEA
46-
# *.json
47-
# *.properties

.idea/codeStyles/Project.xml

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Jenkinsfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
}
1616
stage('Version') {
1717
steps {
18-
sh 'mvn versions:set -DnewVersion=2.1.15'
18+
sh 'mvn versions:set -DnewVersion=2.1.16'
1919
}
2020
}
2121
stage('Compile') {
@@ -39,11 +39,6 @@ pipeline {
3939
sh 'mvn package javadoc:aggregate-jar'
4040
}
4141
}
42-
stage('Install') {
43-
steps {
44-
sh 'mvn install'
45-
}
46-
}
4742
stage('Release ZIP') {
4843
steps {
4944
sh '''mkdir -p temp;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![fork this repo](http://githubbadges.com/fork.svg?user=CloudNetService&repo=CloudNet)](https://github.com/CloudNetService/CloudNet/fork)
44
[![GitHub license](https://img.shields.io/github/license/CloudNetService/CloudNet.svg)](https://github.com/CloudNetService/CloudNet/blob/master/LICENSE)
55

6-
[![Known Vulnerabilities](https://snyk.io/test/github/CloudNetService/CloudNet/badge.svg)](https://snyk.io/test/github/CloudNetService/CloudNet)
6+
[![DepShield Badge](https://depshield.sonatype.org/badges/CloudNetService/CloudNet/depshield.svg)](https://depshield.github.io)
77
[![GitHub issues](https://img.shields.io/github/issues/CloudNetService/CloudNet.svg)](https://github.com/CloudNetService/CloudNet/issues)
88
[![GitHub contributors](https://img.shields.io/github/contributors/CloudNetService/CloudNet.svg)](https://github.com/CloudNetService/CloudNet/graphs/contributors)
99
[![Github All Releases](https://img.shields.io/github/downloads/CloudNetService/CloudNet/total.svg)](https://github.com/CloudNetService/CloudNet/releases)

cloudnet-api/cloudnet-api-bridge/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
<dependency>
3131
<groupId>org.apache.logging.log4j</groupId>
3232
<artifactId>log4j-api</artifactId>
33-
<version>2.12.0</version>
33+
<version>2.12.1</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.apache.logging.log4j</groupId>
3838
<artifactId>log4j-core</artifactId>
39-
<version>2.12.0</version>
39+
<version>2.12.1</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>

0 commit comments

Comments
 (0)