From df15fa4ff62f19b2d32bcd66e908cadbd7223008 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Feb 22 2021 12:26:29 +0000
Subject: Synchronize with upstream state


Do not bump version to 4-SNAPSHOT yet. The upstream document is in
4-SNAPSHOT state for last 9 years, there is no need to deviate from
version '3'.

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>

---

diff --git a/pom.xml b/pom.xml
index a5865cd..fb78725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,12 +15,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>10</version>
+    <version>23</version>
   </parent>
 
   <groupId>org.apache.taglibs</groupId>
@@ -35,26 +36,21 @@
 
   <properties>
     <!-- Default configuration for compiler source and target JVM -->
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
 
-  <ciManagement>
-    <system>jenkins</system>
-    <url>https://builds.apache.org/view/S-Z/view/Tomcat/job/Taglibs-All/</url>
-  </ciManagement>
-
   <issueManagement>
     <system>bugzilla</system>
     <url>http://issues.apache.org/bugzilla/</url>
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3</developerConnection>
-    <url>http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3</url>
+    <connection>scm:git:https://github.com/apache/tomcat-taglibs-parent</connection>
+    <developerConnection>scm:git:https://github.com/apache/tomcat-taglibs-parent</developerConnection>
+    <url>https://github.com/apache/tomcat-taglibs-parent</url>
   </scm>
 
   <mailingLists>
@@ -68,19 +64,19 @@
         <otherArchive>http://www.mail-archive.com/taglibs-user@tomcat.apache.org/</otherArchive>
       </otherArchives>
     </mailingList>
-      <mailingList>
-          <name>Tomcat Dev List</name>
-          <subscribe>dev-subscribe@tomcat.apache.org</subscribe>
-          <unsubscribe>dev-unsubscribe@tomcat.apache.org</unsubscribe>
-          <post>dev@tomcat.apache.org</post>
-          <archive>http://mail-archives.apache.org/mod_mbox/tomcat-dev/</archive>
-          <otherArchives>
-              <otherArchive>http://markmail.org/list/org.apache.tomcat.dev/</otherArchive>
-              <otherArchive>http://www.nabble.com/Tomcat---Dev-f341.html</otherArchive>
-              <otherArchive>http://www.mail-archive.com/dev@tomcat.apache.org/</otherArchive>
-              <otherArchive>http://news.gmane.org/gmane.comp.tomcat.devel</otherArchive>
-          </otherArchives>
-      </mailingList>
+    <mailingList>
+      <name>Tomcat Dev List</name>
+      <subscribe>dev-subscribe@tomcat.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@tomcat.apache.org</unsubscribe>
+      <post>dev@tomcat.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/tomcat-dev/</archive>
+      <otherArchives>
+        <otherArchive>http://markmail.org/list/org.apache.tomcat.dev/</otherArchive>
+        <otherArchive>http://www.nabble.com/Tomcat---Dev-f341.html</otherArchive>
+        <otherArchive>http://www.mail-archive.com/dev@tomcat.apache.org/</otherArchive>
+        <otherArchive>http://news.gmane.org/gmane.comp.tomcat.devel</otherArchive>
+      </otherArchives>
+    </mailingList>
     <mailingList>
       <name>Old Taglibs User Archive</name>
       <archive>http://mail-archives.apache.org/mod_mbox/jakarta-taglibs-user/</archive>
@@ -109,7 +105,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>3.8.1</version>
           <configuration>
             <source>${maven.compiler.source}</source>
             <target>${maven.compiler.target}</target>
@@ -119,12 +115,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12</version>
+          <version>3.0.0-M4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.0</version>
+          <version>3.8.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -133,7 +129,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>4.2.1</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -151,18 +147,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8.1</version>
+        <version>3.2.0</version>
         <configuration>
           <quiet>true</quiet>
           <links>
             <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
-          </links>          
+          </links>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.9</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -174,18 +170,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>      
+        <version>3.0.0</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
+        <version>3.0.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.12</version>
-      </plugin>          
+        <version>3.0.0-M4</version>
+      </plugin>
     </plugins>
   </reporting>
 </project>
diff --git a/tomcat-taglibs-parent.spec b/tomcat-taglibs-parent.spec
index 1836243..e611ac8 100644
--- a/tomcat-taglibs-parent.spec
+++ b/tomcat-taglibs-parent.spec
@@ -1,11 +1,11 @@
 Name:           tomcat-taglibs-parent
 Version:        3
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Apache Taglibs Parent
 
 License:        ASL 2.0
 URL:            http://tomcat.apache.org/taglibs/
-Source0:        http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3/pom.xml
+Source0:        https://github.com/apache/tomcat-taglibs-parent/raw/master/pom.xml
 BuildArch: noarch
 
 BuildRequires:  maven-local
@@ -29,6 +29,9 @@ cp -p %{SOURCE0} .
 %dir %{_mavenpomdir}/%{name}
 
 %changelog
+* Mon Feb 22 2021 Alexander Bokovoy <abokovoy@redhat.com> - 3-15
+- Synchronize with the recent upstream state
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild