Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4e4e6ea
Issue 52684: Update Log4j plugin registration
labkey-jeckels May 23, 2025
28ba868
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels May 24, 2025
10aa864
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels May 26, 2025
5381571
Try being less picky about the JAR name
labkey-jeckels May 26, 2025
c2a2150
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels May 27, 2025
9cd27dd
Another try at finding the right JAR
labkey-jeckels May 27, 2025
32981ce
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels May 28, 2025
09facb3
Delete now redundant code
labkey-jeckels May 28, 2025
16b7967
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels May 28, 2025
7a5f7fa
Merge branch 'refs/heads/develop' into fb_52684_log4jPlugins
labkey-jeckels May 29, 2025
1036b1c
Consolidate plugin implementations; hacks to cross classloader bounda…
labkey-jeckels May 29, 2025
7b18d54
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels May 30, 2025
8858084
Fix Log4J initialization without Spring Boot dev tools
labkey-jeckels Jun 2, 2025
9854d58
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels Jun 2, 2025
91c08ba
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels Jun 3, 2025
4f37b32
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-danield Jun 4, 2025
1bdbdf0
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels Jun 6, 2025
d5d4cf7
Merge branch 'develop' into fb_52684_log4jPlugins
labkey-jeckels Jun 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/script/ScriptService.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static void setInstance(ScriptService impl)
ServiceRegistry.get().registerService(ScriptService.class, impl);
}

// marker class for server script logging (see log4j.xml)
// marker class for server script logging (see log4j2.xml)
class Console {}

/**
Expand Down
297 changes: 0 additions & 297 deletions api/src/org/labkey/api/util/LabKeyDeleteAction.java

This file was deleted.

Loading