This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git.
from d172234 Updated TM HTTP Poller to poll securely (#6428)
add 070df30 Updated log4j from version 1.2.17 to version 2.16.0 (#6390)
No new revisions were added by this update.
Summary of changes:
CHANGELOG.md | 1 +
docs/source/admin/traffic_router.rst | 10 +--
docs/source/development/traffic_router.rst | 2 +-
.../ansible/roles/traffic-router/README.md | 2 +-
.../ansible/roles/traffic-router/defaults/main.yml | 71 ++++++++++++----------
.../roles/traffic-router/tasks/traffic_router.yml | 2 +-
.../conf/{log4j.properties.j2 => log4j2.xml.j2} | 4 +-
infrastructure/cdn-in-a-box/traffic_router/run.sh | 2 +-
infrastructure/docker/traffic_router/starttr.sh | 2 +-
.../traffic_router/protocol/LanguidPoller.java | 7 ++-
.../traffic_router/protocol/LanguidProtocol.java | 5 +-
.../traffic_router/protocol/RouterNioEndpoint.java | 5 +-
.../secure/CertificateDataConverter.java | 5 +-
.../secure/CertificateDataListener.java | 5 +-
.../traffic_router/secure/CertificateDecoder.java | 5 +-
.../traffic_router/secure/CertificateRegistry.java | 5 +-
.../traffic_router/secure/KeyManager.java | 5 +-
.../tomcat/TomcatLifecycleListener.java | 5 +-
.../traffic_router/utils/HttpsProperties.java | 5 +-
.../java/protocol/RouterSslImplementationTest.java | 2 +
.../java/secure/CertificateDataListenerTest.java | 2 +
.../src/test/java/secure/KeyManagerTest.java | 2 +
.../java/secure/TomcatLifecycleListenerTest.java | 2 +
traffic_router/core/pom.xml | 4 +-
traffic_router/core/src/main/conf/log4j.properties | 44 --------------
traffic_router/core/src/main/conf/log4j2.xml | 52 ++++++++++++++++
.../core/src/main/conf/startup.properties | 2 +-
.../core/config/CertificateChecker.java | 5 +-
.../traffic_router/core/config/ConfigHandler.java | 5 +-
.../traffic_router/core/dns/DnsSecKeyPairImpl.java | 5 +-
.../traffic_router/core/dns/NameServer.java | 5 +-
.../traffic_router/core/dns/NameServerMain.java | 5 +-
.../traffic_router/core/dns/SignatureManager.java | 5 +-
.../traffic_router/core/dns/SignedZoneKey.java | 5 +-
.../traffic_router/core/dns/ZoneManager.java | 5 +-
.../traffic_router/core/dns/ZoneSignerImpl.java | 5 +-
.../traffic_router/core/dns/ZoneUtils.java | 5 +-
.../core/dns/protocol/AbstractProtocol.java | 7 ++-
.../traffic_router/core/dns/protocol/TCP.java | 5 +-
.../traffic_router/core/dns/protocol/UDP.java | 5 +-
.../traffic_router/core/ds/DeliveryService.java | 5 +-
.../core/ds/LetsEncryptDnsChallengeWatcher.java | 5 +-
.../traffic_router/core/ds/SteeringRegistry.java | 5 +-
.../traffic_router/core/ds/SteeringWatcher.java | 5 +-
.../traffic_router/core/edge/CacheLocation.java | 6 +-
.../traffic_router/core/edge/Node.java | 5 +-
.../traffic_router/core/edge/Resolver.java | 7 ++-
.../traffic_router/core/http/RouterFilter.java | 5 +-
.../core/loc/AbstractServiceUpdater.java | 5 +-
.../traffic_router/core/loc/AnonymousIp.java | 8 +--
.../core/loc/AnonymousIpConfigUpdater.java | 7 ++-
.../core/loc/AnonymousIpDatabaseService.java | 5 +-
.../core/loc/AnonymousIpDatabaseUpdater.java | 7 ++-
.../core/loc/AnonymousIpWhitelist.java | 5 +-
.../core/loc/FederationMappingBuilder.java | 5 +-
.../core/loc/FederationsWatcher.java | 5 +-
.../core/loc/MaxmindGeolocationService.java | 5 +-
.../traffic_router/core/loc/NetworkNode.java | 5 +-
.../traffic_router/core/loc/RegionalGeo.java | 5 +-
.../traffic_router/core/loc/RegionalGeoRule.java | 5 +-
.../core/loc/RegionalGeoUpdater.java | 5 +-
.../core/monitor/TrafficMonitorWatcher.java | 7 ++-
.../traffic_router/core/router/TrafficRouter.java | 5 +-
.../core/router/TrafficRouterManager.java | 5 +-
.../core/secure/CertificatesClient.java | 5 +-
.../core/secure/CertificatesPoller.java | 5 +-
.../core/secure/CertificatesPublisher.java | 5 +-
.../core/util/AbstractResourceWatcher.java | 5 +-
.../traffic_router/core/util/DataExporter.java | 12 ++--
.../traffic_router/core/util/Fetcher.java | 6 +-
.../traffic_router/core/util/LanguidState.java | 5 +-
.../core/util/PeriodicResourceUpdater.java | 5 +-
traffic_router/core/src/test/conf/log4j.properties | 47 --------------
traffic_router/core/src/test/conf/log4j2.xml | 52 ++++++++++++++++
.../traffic_router/core/TestBase.java | 24 ++++----
.../traffic_router/core/TrafficRouterStart.java | 18 +++---
.../core/dns/DNSAccessEventBuilderTest.java | 2 +
.../traffic_router/core/dns/NameServerTest.java | 2 +
.../core/dns/ZoneManagerUnitTest.java | 2 +
.../core/dns/ZoneSignerImplTest.java | 2 +
.../core/dns/protocol/AbstractProtocolTest.java | 11 ++--
.../traffic_router/core/dns/protocol/TCPTest.java | 2 +
.../traffic_router/core/dns/protocol/UDPTest.java | 2 +
.../core/ds/DeliveryServiceMatcherTest.java | 2 +
.../core/external/CoverageZoneTest.java | 2 +
.../core/external/ExternalTestSuite.java | 19 +++---
.../core/external/HttpDataServer.java | 2 +-
.../core/http/HTTPAccessEventBuilderTest.java | 2 +
.../core/loc/AbstractServiceUpdaterTest.java | 2 +
.../traffic_router/core/loc/CoverageZoneTest.java | 2 +
.../traffic_router/core/loc/GeoTest.java | 5 +-
.../core/loc/MaxmindGeolocationServiceTest.java | 2 +
.../traffic_router/core/loc/NetworkNodeTest.java | 5 +-
.../core/loc/NetworkNodeUnitTest.java | 1 -
.../core/router/DNSRoutingMissesTest.java | 2 +
.../core/router/GeoSortSteeringResultsTest.java | 3 +
.../core/router/StatelessTrafficRouterTest.java | 5 +-
.../core/util/AbstractResourceWatcherTest.java | 5 +-
.../traffic_router/core/util/FetcherTest.java | 2 +-
traffic_router/neustar/pom.xml | 4 +-
.../neustar/NeustarGeolocationService.java | 5 +-
.../configuration/NeustarConfiguration.java | 5 +-
.../neustar/configuration/ServiceRefresher.java | 5 +-
.../TrafficRouterConfigurationListener.java | 5 +-
.../traffic_router/neustar/data/HttpClient.java | 5 +-
.../neustar/data/NeustarDatabaseUpdater.java | 5 +-
.../traffic_router/neustar/data/TarExtractor.java | 5 +-
.../traffic_router/neustar/files/FilesMover.java | 5 +-
.../test/java/data/NeustarDatabaseUpdaterTest.java | 8 +--
.../src/test/java/data/TarExtractorTest.java | 7 ++-
.../geolocation/NeustarGeolocationServiceTest.java | 5 +-
.../java/neustar/GPDatabaseReaderBuilderTest.java | 1 +
traffic_router/pom.xml | 2 +-
traffic_router/shared/pom.xml | 8 +--
.../traffic_router/secure/BindPrivateKey.java | 5 +-
.../traffic_router/secure/Pkcs1KeySpecDecoder.java | 7 ++-
.../traffic_router/secure/Pkcs8.java | 5 +-
.../traffic_router/shared/SigningData.java | 5 +-
.../src/test/java/secure/BindPrivateKeyTest.java | 2 +
119 files changed, 483 insertions(+), 346 deletions(-)
rename
infrastructure/ansible/roles/traffic-router/templates/conf/{log4j.properties.j2
=> log4j2.xml.j2} (91%)
delete mode 100644 traffic_router/core/src/main/conf/log4j.properties
create mode 100644 traffic_router/core/src/main/conf/log4j2.xml
delete mode 100644 traffic_router/core/src/test/conf/log4j.properties
create mode 100644 traffic_router/core/src/test/conf/log4j2.xml
