Compare commits
61 Commits
0ab4a0be27
...
renovate/n
Author | SHA1 | Date | |
---|---|---|---|
fc00467059 | |||
f1969c2043 | |||
acad4bad8b | |||
4ce9acd428 | |||
2ab52bd713 | |||
f38e34c1ce | |||
f87854459f | |||
72c4ae2133 | |||
7f4ca6aa8e | |||
c3793aa159 | |||
63fc1feaea | |||
71d646ff69 | |||
48d537d2db | |||
136447b9df | |||
372949a9e0 | |||
4f4549a81e | |||
b0dd1c21b2 | |||
d46368f0ce | |||
2032dc1d0e | |||
9c099230c9 | |||
f2134cbdb9 | |||
97e846c3dc | |||
7f16a011b3 | |||
b32ece3f88 | |||
681785ef0d | |||
a72b6f690b | |||
645fb5f4a6 | |||
a228067cce | |||
4f0eb7ce74 | |||
a7e36299b6 | |||
1e7c43e360 | |||
2a4a80cc3f | |||
a50e8c050b | |||
f7c1b096bc | |||
884814064c | |||
ce0938bc2c | |||
aabfbd3020 | |||
25bc5a3ef2 | |||
ab52f30eb2 | |||
2e0c2e4e14 | |||
edf896efb0 | |||
bd7355add9 | |||
6d210551af | |||
abd3c02be6 | |||
50749f2108 | |||
fc7b6d54d1 | |||
f5d684c5a4 | |||
5ea12aa693 | |||
5c4f7e4252 | |||
d9dcde7560 | |||
64762a9a4f | |||
4542985431 | |||
88d4b6461b | |||
e8f1c85f08 | |||
1ed389c18b | |||
4320c9698a | |||
3a8044dda1 | |||
96ca58de12 | |||
5ed444ab92 | |||
19a5583594 | |||
a39bcf68cb |
82
.drone.yml
82
.drone.yml
@@ -1,77 +1,13 @@
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: build
|
||||
platform:
|
||||
os: linux
|
||||
kind: template
|
||||
load: java-build-deploy.yaml
|
||||
data:
|
||||
arch: arm64
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
os: linux
|
||||
build_branches:
|
||||
- main
|
||||
event:
|
||||
build_events:
|
||||
- push
|
||||
- pull_request
|
||||
|
||||
steps:
|
||||
# test if it compiles correctly
|
||||
- name: build
|
||||
image: maven:3-eclipse-temurin-21
|
||||
commands:
|
||||
- mvn verify --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -B -V
|
||||
|
||||
# run unit tests
|
||||
- name: test
|
||||
image: maven:3-eclipse-temurin-21
|
||||
commands:
|
||||
- mvn test --no-transfer-progress -B -V
|
||||
|
||||
# check maven dependencies
|
||||
- name: dependency-check
|
||||
image: maven:3-eclipse-temurin-21
|
||||
commands:
|
||||
- mvn dependency-check:check --no-transfer-progress -B -V -DnvdApiKey=$NVD_API_KEY
|
||||
environment:
|
||||
NVD_API_KEY:
|
||||
from_secret: nvd_api_key
|
||||
|
||||
# run code analysis
|
||||
- name: code-analysis
|
||||
image: maven:3-eclipse-temurin-21
|
||||
commands:
|
||||
- mvn sonar:sonar --no-transfer-progress -Dsonar.projectKey=$SONAR_PROJECT_KEY -Dsonar.host.url=$SONAR_INSTANCE_URL -Dsonar.token=$SONAR_LOGIN_KEY -B -V
|
||||
environment:
|
||||
SONAR_PROJECT_KEY:
|
||||
from_secret: sonar_project_key
|
||||
SONAR_INSTANCE_URL:
|
||||
from_secret: sonar_instance_url
|
||||
SONAR_LOGIN_KEY:
|
||||
from_secret: sonar_login_key
|
||||
|
||||
---
|
||||
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: deploy
|
||||
platform:
|
||||
os: linux
|
||||
arch: arm64
|
||||
|
||||
trigger:
|
||||
event:
|
||||
- promote
|
||||
target:
|
||||
- production
|
||||
|
||||
steps:
|
||||
# skip all previous steps because they were already ran in the "build" phase; we don't need to re-analyze the code.
|
||||
|
||||
# upload to maven repository
|
||||
- name: maven-deploy
|
||||
image: maven:3-eclipse-temurin-21
|
||||
commands:
|
||||
- mvn deploy --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -B -V -gs settings.xml -Dmaven.repo.username=$MAVEN_REPO_USERNAME -Dmaven.repo.password=$MAVEN_REPO_PASSWORD
|
||||
environment:
|
||||
MAVEN_REPO_USERNAME:
|
||||
from_secret: maven_repo_username
|
||||
MAVEN_REPO_PASSWORD:
|
||||
from_secret: maven_repo_password
|
||||
sonar_project_key: HidekoBot
|
||||
deploy_targets:
|
||||
- production
|
10
README.MD
10
README.MD
@@ -1,9 +1,9 @@
|
||||
# HidekoBot
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot_AYWyYHsvX-1Ma0D4pJ59)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot_AYWyYHsvX-1Ma0D4pJ59)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot_AYWyYHsvX-1Ma0D4pJ59)
|
||||
[](https://drone.beatrice.wtf/bea/HidekoBot)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot_AYWyYHsvX-1Ma0D4pJ59)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot)
|
||||
[](https://drone.prod.panic.haus/bea/HidekoBot)
|
||||
[](https://sonar.beatrice.wtf/dashboard?id=HidekoBot)
|
||||
|
||||
Hideko is a general-purpose Discord bot.
|
||||
|
||||
|
29
pom.xml
29
pom.xml
@@ -22,18 +22,18 @@
|
||||
<dependency>
|
||||
<groupId>net.dv8tion</groupId>
|
||||
<artifactId>JDA</artifactId>
|
||||
<version>5.3.0</version>
|
||||
<version>5.6.1</version>
|
||||
</dependency>
|
||||
<!-- JDA depends on SLF4J for logging -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>2.0.6</version>
|
||||
<version>2.0.17</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>2.0.6</version>
|
||||
<version>2.0.17</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Dependency used for SQLite database connections-->
|
||||
@@ -47,26 +47,26 @@
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<version>2.0</version>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JSoup is used to parse HTML into JSON objects for better handling in Java -->
|
||||
<dependency>
|
||||
<groupId>org.jsoup</groupId>
|
||||
<artifactId>jsoup</artifactId>
|
||||
<version>1.15.3</version>
|
||||
<version>1.19.1</version>
|
||||
</dependency>
|
||||
<!-- Various String manipulation utils -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-text</artifactId>
|
||||
<version>1.10.0</version>
|
||||
<version>1.13.1</version>
|
||||
</dependency>
|
||||
<!-- JSON dependency used for better parsing of JSON files -->
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
<version>20231013</version>
|
||||
<version>20250517</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Start Random.org dependencies -->
|
||||
@@ -78,12 +78,12 @@
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.10.1</version>
|
||||
<version>2.13.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.15</version>
|
||||
<version>1.18.0</version>
|
||||
</dependency>
|
||||
<!-- End Random.org dependencies -->
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.9.2</version>
|
||||
<version>5.13.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@@ -102,7 +102,7 @@
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>4.30.0</version>
|
||||
<version>4.31.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
@@ -143,23 +143,24 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.4.1</version>
|
||||
<version>3.11.2</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.sonarsource.scanner.maven</groupId>
|
||||
<artifactId>sonar-maven-plugin</artifactId>
|
||||
<version>3.9.1.2184</version>
|
||||
<version>5.1.0.4751</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.owasp</groupId>
|
||||
<artifactId>dependency-check-maven</artifactId>
|
||||
<version>12.1.0</version>
|
||||
<version>12.1.1</version>
|
||||
<configuration>
|
||||
<failBuildOnCVSS>8</failBuildOnCVSS>
|
||||
<!--suppress UnresolvedMavenProperty -->
|
||||
<nvdApiKey>${nvdApiKey}</nvdApiKey>
|
||||
<knownExploitedUrl>https://raw.githubusercontent.com/EugenMayer/cisa-known-exploited-mirror/main/known_exploited_vulnerabilities.json</knownExploitedUrl>
|
||||
<formats>
|
||||
<format>html</format>
|
||||
<format>json</format>
|
||||
|
@@ -1,31 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
|
||||
<!--
|
||||
<suppress>
|
||||
<notes><![CDATA[
|
||||
file name: snakeyaml-1.33.jar
|
||||
]]></notes>
|
||||
file name: snakeyaml-1.33.jar
|
||||
]]></notes>
|
||||
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
|
||||
<cve>CVE-2021-4235</cve>
|
||||
</suppress>
|
||||
<suppress>
|
||||
<notes><![CDATA[
|
||||
file name: snakeyaml-1.33.jar
|
||||
]]></notes>
|
||||
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
|
||||
<cve>CVE-2022-3064</cve>
|
||||
</suppress>
|
||||
<suppress>
|
||||
<notes><![CDATA[
|
||||
file name: snakeyaml-1.33.jar
|
||||
]]></notes>
|
||||
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
|
||||
<vulnerabilityName>CVE-2022-1471</vulnerabilityName>
|
||||
</suppress>
|
||||
<suppress>
|
||||
<notes><![CDATA[
|
||||
file name: json-20220924.jar
|
||||
]]></notes>
|
||||
<packageUrl regex="true">^pkg:maven/org\.json/json@.*$</packageUrl>
|
||||
<vulnerabilityName>CVE-2022-45688</vulnerabilityName>
|
||||
</suppress>
|
||||
-->
|
||||
</suppressions>
|
Reference in New Issue
Block a user