Skip to content

Commit b89a18c

Browse files
committed
Revert "Added Dependencies for Log4j"
This reverts commit fa9570f. Signed-off-by: Pranav Reddy <pranavrd@amazon.com>
1 parent da2a39b commit b89a18c

File tree

7 files changed

+2
-517
lines changed

7 files changed

+2
-517
lines changed

libs/agent-sm/agent/build.gradle

Lines changed: 2 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ dependencies {
1313
implementation project(":libs:agent-sm:bootstrap")
1414
implementation "net.bytebuddy:byte-buddy:${versions.bytebuddy}"
1515
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
16-
implementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
17-
implementation "org.apache.logging.log4j:log4j-api:${versions.log4j}"
16+
1817
testImplementation "junit:junit:${versions.junit}"
1918
testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
2019
}
@@ -60,105 +59,7 @@ thirdPartyAudit {
6059
'com.sun.jna.Library',
6160
'com.sun.jna.Native',
6261
'com.sun.jna.NativeLibrary',
63-
'com.sun.jna.Platform',
64-
65-
// from log4j
66-
'com.conversantmedia.util.concurrent.SpinPolicy',
67-
'com.fasterxml.jackson.annotation.JsonInclude$Include',
68-
'com.fasterxml.jackson.databind.DeserializationContext',
69-
'com.fasterxml.jackson.databind.DeserializationFeature',
70-
'com.fasterxml.jackson.databind.JsonMappingException',
71-
'com.fasterxml.jackson.databind.JsonNode',
72-
'com.fasterxml.jackson.databind.Module$SetupContext',
73-
'com.fasterxml.jackson.databind.ObjectReader',
74-
'com.fasterxml.jackson.databind.ObjectWriter',
75-
'com.fasterxml.jackson.databind.SerializerProvider',
76-
'com.fasterxml.jackson.databind.deser.std.StdDeserializer',
77-
'com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer',
78-
'com.fasterxml.jackson.databind.module.SimpleModule',
79-
'com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter',
80-
'com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider',
81-
'com.fasterxml.jackson.databind.ser.std.StdScalarSerializer',
82-
'com.fasterxml.jackson.databind.ser.std.StdSerializer',
83-
'com.fasterxml.jackson.dataformat.xml.JacksonXmlModule',
84-
'com.fasterxml.jackson.dataformat.xml.XmlMapper',
85-
'com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter',
86-
'org.fusesource.jansi.Ansi',
87-
'org.fusesource.jansi.AnsiRenderer$Code',
88-
'com.lmax.disruptor.EventFactory',
89-
'com.lmax.disruptor.EventTranslator',
90-
'com.lmax.disruptor.EventTranslatorTwoArg',
91-
'com.lmax.disruptor.EventTranslatorVararg',
92-
'com.lmax.disruptor.ExceptionHandler',
93-
'com.lmax.disruptor.LifecycleAware',
94-
'com.lmax.disruptor.RingBuffer',
95-
'com.lmax.disruptor.Sequence',
96-
'com.lmax.disruptor.SequenceReportingEventHandler',
97-
'com.lmax.disruptor.WaitStrategy',
98-
'com.lmax.disruptor.dsl.Disruptor',
99-
'com.lmax.disruptor.dsl.ProducerType',
100-
'javax.jms.Connection',
101-
'javax.jms.ConnectionFactory',
102-
'javax.jms.Destination',
103-
'javax.jms.JMSException',
104-
'javax.jms.MapMessage',
105-
'javax.jms.Message',
106-
'javax.jms.MessageConsumer',
107-
'javax.jms.MessageProducer',
108-
'javax.jms.Session',
109-
'javax.mail.Authenticator',
110-
'javax.mail.Message$RecipientType',
111-
'javax.mail.PasswordAuthentication',
112-
'javax.mail.Session',
113-
'javax.mail.Transport',
114-
'javax.mail.internet.InternetAddress',
115-
'javax.mail.internet.InternetHeaders',
116-
'javax.mail.internet.MimeMessage',
117-
'javax.mail.internet.MimeMultipart',
118-
'javax.mail.internet.MimeUtility',
119-
'org.apache.commons.compress.compressors.CompressorStreamFactory',
120-
'org.apache.commons.compress.utils.IOUtils',
121-
'org.apache.commons.csv.CSVFormat',
122-
'org.apache.commons.csv.QuoteMode',
123-
'org.apache.kafka.clients.producer.Producer',
124-
'org.apache.kafka.clients.producer.RecordMetadata',
125-
'org.codehaus.stax2.XMLStreamWriter2',
126-
'org.jctools.queues.MpscArrayQueue',
127-
'org.osgi.framework.Bundle',
128-
'org.osgi.framework.BundleActivator',
129-
'org.osgi.framework.BundleContext',
130-
'org.osgi.framework.BundleEvent',
131-
'org.osgi.framework.BundleReference',
132-
'org.osgi.framework.FrameworkUtil',
133-
'org.osgi.framework.ServiceRegistration',
134-
'org.osgi.framework.SynchronousBundleListener',
135-
'org.osgi.framework.wiring.BundleWire',
136-
'org.osgi.framework.wiring.BundleWiring',
137-
'org.zeromq.ZMQ$Context',
138-
'org.zeromq.ZMQ$Socket',
139-
'org.zeromq.ZMQ',
140-
'org.zeromq.SocketType',
141-
'org.zeromq.ZContext',
142-
'org.zeromq.ZMonitor',
143-
'org.zeromq.ZMonitor$Event',
144-
'org.zeromq.ZMonitor$ZEvent',
145-
'com.fasterxml.jackson.core.JsonGenerator',
146-
'com.fasterxml.jackson.core.JsonParser',
147-
'com.fasterxml.jackson.core.JsonParser$Feature',
148-
'com.fasterxml.jackson.core.JsonToken',
149-
'com.fasterxml.jackson.core.PrettyPrinter',
150-
'com.fasterxml.jackson.core.type.TypeReference',
151-
'com.fasterxml.jackson.databind.ObjectMapper',
152-
'com.fasterxml.jackson.dataformat.yaml.YAMLMapper',
153-
'com.lmax.disruptor.SequenceBarrier',
154-
'com.lmax.disruptor.TimeoutException',
155-
'org.apache.kafka.common.serialization.ByteArraySerializer',
156-
'org.osgi.framework.ServiceReference'
157-
)
158-
159-
ignoreViolations(
160-
'org.apache.logging.log4j.core.util.internal.UnsafeUtil',
161-
'org.apache.logging.log4j.core.util.internal.UnsafeUtil$1',
62+
'com.sun.jna.Platform'
16263
)
16364
}
16465

libs/agent-sm/agent/licenses/log4j-api-2.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/agent-sm/agent/licenses/log4j-api-LICENSE.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

libs/agent-sm/agent/licenses/log4j-api-NOTICE.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

libs/agent-sm/agent/licenses/log4j-core-2.21.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)