Skip to content

Commit

Permalink
update README, removed spotbugs-annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
xzel23 committed Nov 30, 2023
1 parent f736b87 commit 7b84ede
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 23 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@ the parameter.
- increase unit test coverage
- add javadoc
- fix RichText.split() with non-trivial regex and limit 0 not skipping trailing empty segments in result
- fix build issues on windows‚
- fix smaller issues
- fix build issues on windows
- fix issues in FontDef CSS conversion
- fix font size not extracted when getting FontDef directly from TextAttributes
- fix Vector2f returning NaN for zero denominator
- fix IoUtil.glob() and IoUtil.findFiles() returning paths with inconsistent root under certain circumstances
- fix smaller issues
### 11.1.3
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ subprojects {
dependencies {
// source annotations
compileOnly(rootProject.libs.cabe.annotations)
compileOnly(rootProject.libs.spotbugs.annotations)

// LOG4J
implementation(rootProject.libs.log4j.api)
Expand Down
5 changes: 2 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// define project name and version
rootProject.name = "dua3-utility"
val projectVersion = "12.0.0-beta6-SNAPSHOT"
val projectVersion = "12.0.0-beta6"

// define subprojects
include("utility")
Expand Down Expand Up @@ -37,10 +37,9 @@ dependencyResolutionManagement {
version("slf4j", "2.0.9")
version("jimfs", "1.2")
version("miglayout", "11.2")
version("spotbugs", "4.8.1")
version("spotbugs", "4.8.2")

library("cabe-annotations", "com.dua3.cabe", "cabe-annotations").versionRef("cabe")
library("spotbugs-annotations", "com.github.spotbugs", "spotbugs-annotations").versionRef("spotbugs")

library("slf4j-api", "org.slf4j", "slf4j-api").versionRef("slf4j")
library("slf4j-simple", "org.slf4j", "slf4j-simple").versionRef("slf4j")
Expand Down
25 changes: 11 additions & 14 deletions spotbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,27 @@
</Or>
</Match>

<!-- this bug pattern is currently completely broken / https://github.com/spotbugs/spotbugs/issues/1601 -->
<Match>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Bug pattern="EI_EXPOSE_REP2"/>
<Or>
<!-- this inspection is triggered when using AssertThrows in JUnit tests -->
<Bug pattern="EI_EXPOSE_REP"/>
<Bug pattern="EI_EXPOSE_REP2"/>
<Bug pattern="VA_FORMAT_STRING_USES_NEWLINE"/>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
<Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
</Or>
</Match>

<Match>
<Bug pattern="VA_FORMAT_STRING_USES_NEWLINE"/>
<Class name="com.dua3.utility.logging.slf4j.LoggerSlf4j"/>
<Bug pattern="SE_BAD_FIELD"/>
</Match>

<!-- SecurityManager will soon be gone, so will be doPrivileged() -->
<Match>
<Bug pattern="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED"/>
</Match>

<!-- Do not run these inspections -->
<Match>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>
<Match>
<Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
</Match>

<!-- by design -->
<Match>
<Class name="com.dua3.utility.db.NamedParameterStatement"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
public class LoggerSlf4j extends AbstractLogger {
private static Level defaultLevel = Level.INFO;

@edu.umd.cs.findbugs.annotations.SuppressFBWarnings("SE_BAD_FIELD")
private final List<WeakReference<LogEntryHandler>> handlers;
private final Map<Marker, Level> markerLevelMap = new HashMap<>();

Check warning on line 24 in utility-logging/utility-logging-slf4j/src/main/java/com/dua3/utility/logging/slf4j/LoggerSlf4j.java

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Mismatched query and update of collection

Contents of collection `markerLevelMap` are queried, but never updated
private Level level;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
provides ILogEntryDispatcherFactory with LogEntryDispatcherFactorySlf4j;

requires static com.dua3.cabe.annotations;
requires static com.github.spotbugs.annotations;

requires com.dua3.utility.logging;
requires org.apache.logging.log4j;
Expand Down
1 change: 0 additions & 1 deletion utility/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
exports com.dua3.utility.xml;

requires static com.dua3.cabe.annotations;
requires static com.github.spotbugs.annotations;

requires java.xml;
requires org.apache.logging.log4j;
Expand Down

0 comments on commit 7b84ede

Please sign in to comment.