From df0ee1f9e499aa3c021a6abfea49f1fd8f05c35b Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Thu, 9 Jun 2016 09:40:01 +0000
Subject: [PATCH] Remove JULI+log4j from extras/embed Maven release artifacts

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1747520 13f79535-47bb-0310-9956-ffa450edef68
---
 res/maven/mvn-pub.xml                     | 18 ---------
 res/maven/tomcat-embed-logging-juli.pom   | 32 ---------------
 res/maven/tomcat-embed-logging-log4j.pom  | 32 ---------------
 res/maven/tomcat-extras-juli-adapters.pom | 47 -----------------------
 res/maven/tomcat-extras-juli.pom          | 32 ---------------
 5 files changed, 161 deletions(-)
 delete mode 100644 res/maven/tomcat-embed-logging-juli.pom
 delete mode 100644 res/maven/tomcat-embed-logging-log4j.pom
 delete mode 100644 res/maven/tomcat-extras-juli-adapters.pom
 delete mode 100644 res/maven/tomcat-extras-juli.pom

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 0484a6097e91..76c3135f9315 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -333,14 +333,6 @@
     <doMavenDeployNoSrc artifactId="tomcat-i18n-ja"/>
 
     <!-- Extras jars -->
-    <doMavenDeploy artifactId="tomcat-extras-juli"
-        groupId="org.apache.tomcat.extras"
-        file="${tomcat.extras.path}/tomcat-juli.jar"
-        src="${tomcat.extras.src.path}/tomcat-juli-src.jar" />
-    <doMavenDeploy artifactId="tomcat-extras-juli-adapters"
-        groupId="org.apache.tomcat.extras"
-        file="${tomcat.extras.path}/tomcat-juli-adapters.jar"
-        src="${tomcat.extras.src.path}/tomcat-juli-adapters-src.jar" />
     <doMavenDeploy artifactId="tomcat-catalina-jmx-remote"
         groupId="org.apache.tomcat.extras"
         file="${tomcat.extras.path}/catalina-jmx-remote.jar"
@@ -372,16 +364,6 @@
         file="${tomcat.embed.path}/tomcat-embed-websocket.jar"
         pom="tomcat-embed-websocket.pom"
         src="${tomcat.embed.src.path}/tomcat-embed-websocket-src.jar"/>
-    <doMavenDeploy artifactId="tomcat-embed-logging-juli"
-        groupId="org.apache.tomcat.embed"
-        file="${tomcat.embed.path}/tomcat-embed-logging-juli.jar"
-        pom="tomcat-embed-logging-juli.pom"
-        src="${tomcat.embed.src.path}/tomcat-embed-logging-juli-src.jar"/>
-    <doMavenDeploy artifactId="tomcat-embed-logging-log4j"
-        groupId="org.apache.tomcat.embed"
-        file="${tomcat.embed.path}/tomcat-embed-logging-log4j.jar"
-        pom="tomcat-embed-logging-log4j.pom"
-        src="${tomcat.embed.src.path}/tomcat-embed-logging-log4j-src.jar"/>
 
     <!-- Binaries -->
     <doMavenDeployBinaries
diff --git a/res/maven/tomcat-embed-logging-juli.pom b/res/maven/tomcat-embed-logging-juli.pom
deleted file mode 100644
index 18af0cea2020..000000000000
--- a/res/maven/tomcat-embed-logging-juli.pom
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat.embed</groupId>
-  <artifactId>tomcat-embed-logging-juli</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>JULI logging implementation for embedded Tomcat</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-</project>
diff --git a/res/maven/tomcat-embed-logging-log4j.pom b/res/maven/tomcat-embed-logging-log4j.pom
deleted file mode 100644
index dd9d6bae03cd..000000000000
--- a/res/maven/tomcat-embed-logging-log4j.pom
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat.embed</groupId>
-  <artifactId>tomcat-embed-logging-log4j</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>log4j logging implementation for embedded Tomcat</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-</project>
diff --git a/res/maven/tomcat-extras-juli-adapters.pom b/res/maven/tomcat-extras-juli-adapters.pom
deleted file mode 100644
index 398ffdcc7209..000000000000
--- a/res/maven/tomcat-extras-juli-adapters.pom
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat.extras</groupId>
-  <artifactId>tomcat-extras-juli-adapters</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Adapters to plug in other logging frameworks in Tomcat</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat.extras</groupId>
-      <artifactId>tomcat-extras-juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/res/maven/tomcat-extras-juli.pom b/res/maven/tomcat-extras-juli.pom
deleted file mode 100644
index 243330fbfe3f..000000000000
--- a/res/maven/tomcat-extras-juli.pom
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat.extras</groupId>
-  <artifactId>tomcat-extras-juli</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Replacement for Tomcat Core Logging Package</description>
-  <url>http://tomcat.apache.org/</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-</project>