[java-idp-plugin-jetty] 78/186: Remove Logback

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=3d57bb0caeb415cb50995a2648906a01ac9487ee

commit 3d57bb0caeb415cb50995a2648906a01ac9487ee
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Jan 26 13:36:03 2022 -0600

    Remove Logback
---
 pom.xml                                            | 53 +---------------------
 .../resources/jetty-base/modules/idp-logging.mod   |  8 ----
 .../resources/jetty-base/start.d/idp-logging.ini   | 11 -----
 3 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/pom.xml b/pom.xml
index 194d0f6..63f0679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
                                     <excludes>
                                         <exclude>**/.gitkeep</exclude>
                                     </excludes>
-                                    <filtering>true</filtering>
+                                    <filtering>false</filtering>
                                 </resource>
                             </resources>
                         </configuration>
@@ -130,57 +130,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- Copy SLF4J logging dependencies to jetty-base/lib/slf4j directory. -->
-                    <execution>
-                        <id>copy-jetty-logging-slf4j</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${slf4j.groupId}</groupId>
-                                    <artifactId>slf4j-api</artifactId>
-                                    <version>${slf4j.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>${slf4j.groupId}</groupId>
-                                    <artifactId>jcl-over-slf4j</artifactId>
-                                    <version>${slf4j.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${assemblyDirectory}/jetty-base/lib/slf4j/</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <!-- Copy Logback logging dependencies to jetty-base/lib/logback directory. -->
-                    <execution>
-                        <id>copy-jetty-logging-logback</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>ch.qos.logback</groupId>
-                                    <artifactId>logback-classic</artifactId>
-                                    <version>${logback.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>ch.qos.logback</groupId>
-                                    <artifactId>logback-core</artifactId>
-                                    <version>${logback.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>ch.qos.logback</groupId>
-                                    <artifactId>logback-access</artifactId>
-                                    <version>${logback.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${assemblyDirectory}/jetty-base/lib/logback/</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <!-- Assemble the artifacts. -->
diff --git a/src/main/resources/jetty-base/modules/idp-logging.mod b/src/main/resources/jetty-base/modules/idp-logging.mod
deleted file mode 100644
index e7043c1..0000000
--- a/src/main/resources/jetty-base/modules/idp-logging.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[description]
-Shibboleth IdP Logging
-
-[depend]
-console-capture
-
-[files]
-logs/
diff --git a/src/main/resources/jetty-base/start.d/idp-logging.ini b/src/main/resources/jetty-base/start.d/idp-logging.ini
deleted file mode 100644
index c57b0fa..0000000
--- a/src/main/resources/jetty-base/start.d/idp-logging.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# --------------------------------------- 
-# Module: idp-logging
-# Shibboleth IdP Logging
-# --------------------------------------- 
---module=idp-logging
-
-# This seems to be needed in some cases to get early logging output.
--Dlogback.configurationFile=resources/logback.xml
-
-# Override logback version pinned in jetty-home/modules/logback-impl.mod
-logback.version=1.2.10
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.