From e7b313af6917f5212add366cf6273df2507b2a72 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Thu, 29 Jun 2023 11:16:27 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .apache-resource-bundles.metadata          |   4 +
 .gitignore                                 |   7 +-
 apache-resource-bundles-36.pom             | 109 ---------------------
 apache-resource-bundles-cleanup-poms.patch |  20 ++++
 sources                                    |   3 +-
 5 files changed, 30 insertions(+), 113 deletions(-)
 create mode 100644 .apache-resource-bundles.metadata
 delete mode 100644 apache-resource-bundles-36.pom
 create mode 100644 apache-resource-bundles-cleanup-poms.patch

diff --git a/.apache-resource-bundles.metadata b/.apache-resource-bundles.metadata
new file mode 100644
index 0000000..cefd62f
--- /dev/null
+++ b/.apache-resource-bundles.metadata
@@ -0,0 +1,4 @@
+75eee91d1539148ba35d269222fb86aece12ed57 apache-resource-bundles-36.pom
+392dfe3fd871d56d1edc48479fdff65013c801d9 apache-jar-resource-bundle-1.4-sources.jar
+2b61357efc85d89ac1e96b6ac6309a6872819116 apache-license-header-resource-bundle-1.1-sources.jar
+1b81c0751b2131074eebce60c86289824c98615c apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
diff --git a/.gitignore b/.gitignore
index 26907ce..8661e56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
-/apache-jar-resource-bundle-1.4-sources.jar
-/apache-license-header-resource-bundle-1.1-sources.jar
+apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
+apache-jar-resource-bundle-1.4-sources.jar
+apache-license-header-resource-bundle-1.1-sources.jar
+/apache-resource-bundles-36.pom
diff --git a/apache-resource-bundles-36.pom b/apache-resource-bundles-36.pom
deleted file mode 100644
index da0dff2..0000000
--- a/apache-resource-bundles-36.pom
+++ /dev/null
@@ -1,109 +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 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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>36</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <groupId>org.apache.apache.resources</groupId>
-  <artifactId>apache-resource-bundles</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Apache Resource Bundles</name>
-  <inceptionYear>2006</inceptionYear>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>https://issues.apache.org/jira/browse/MASFRES</url>
-  </issueManagement>
-
-  <ciManagement>
-    <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-project-resources/</url>
-    <system>Jenkins</system>
-  </ciManagement>
-
-  <!-- There is no distributionManagement for this project. The site is a part of the main Maven site. -->
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-changes-plugin</artifactId>
-          <configuration>
-            <issueManagementSystems>
-              <issueManagementSystem>JIRA</issueManagementSystem>
-            </issueManagementSystems>
-            <maxEntries>1000</maxEntries>
-            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-            <versionPrefix>${project.artifactId}-</versionPrefix>
-            <!-- Used by announcement-generate goal -->
-<!-- TODO Which template should we use for Apache Resource Bundles?            
-            <templateDirectory>org/apache/maven/shared</templateDirectory>
--->
-            <!-- Used by announcement-mail goal -->
-            <subject>[ANN] ${project.name} ${project.version} Released</subject>
-            <toAddresses>
-              <toAddress implementation="java.lang.String">announce@apache.org</toAddress>
-              <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
-              <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
-            </toAddresses>
-            <ccAddresses>
-              <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
-            </ccAddresses>
-            <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
-            <fromDeveloperId>${apache.availid}</fromDeveloperId>
-            <smtpHost>${smtp.host}</smtpHost>
-          </configuration>
-          <dependencies>
-            <!-- Used by announcement-generate goal -->
-<!-- Uncomment this when we have decided which template to use
-            <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-shared-resources</artifactId>
-              <version>1</version>
-            </dependency>
--->
-          </dependencies>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!-- Turn this into a lifecycle -->
-      <plugin>      
-        <artifactId>maven-remote-resources-plugin</artifactId>        
-        <executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/apache-resource-bundles-cleanup-poms.patch b/apache-resource-bundles-cleanup-poms.patch
new file mode 100644
index 0000000..2bffc13
--- /dev/null
+++ b/apache-resource-bundles-cleanup-poms.patch
@@ -0,0 +1,20 @@
+--- apache-resource-bundles-2/pom.xml.orig	2010-01-19 10:29:54.688919029 +0000
++++ apache-resource-bundles-2/pom.xml	2010-01-19 10:30:08.671919266 +0000
+@@ -24,17 +24,6 @@
+     <url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</url>
+   </scm>
+   <build>
+-    <pluginManagement>
+-      <plugins>
+-        <plugin>
+-          <artifactId>maven-release-plugin</artifactId>
+-          <version>2.0-beta-4</version>
+-          <configuration>
+-            <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
+-          </configuration>
+-        </plugin>
+-      </plugins>
+-    </pluginManagement>
+     <plugins>
+       <!-- Turn this into a lifecycle -->
+       <plugin>      
diff --git a/sources b/sources
index 52356b8..fe45aaa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-SHA512 (apache-incubator-disclaimer-resource-bundle-1.1-sources.jar) = 4095b22b344a2e0e44a04cdb26f89db16e6b11e57fb5584caf7ecef0f9d2bb40fb188832d371c375ab917ea2d72445ac7a7387f6353d3b3c1d93266c71c3d4e9
+SHA512 (apache-resource-bundles-36.pom) = ac7b1a8f9105302fee725d6049aae18b006565b8b0013982dba1278d60f9b7cdced1925c31ba11bf8a9e4413032539be9cdcf3c8cf9ac05288febc68c1366745
 SHA512 (apache-jar-resource-bundle-1.4-sources.jar) = 55dae4fb13624f083e049c5e9b1556f325c392f734ba034763091261f19239a13c5e2497fcaba190582d820074be0ee8d1ba91e8509bf5a0c91eb8c509b980b3
 SHA512 (apache-license-header-resource-bundle-1.1-sources.jar) = 055ebd253138231c96388ee51b1b0c4013c20b5a16fb124ceb404ae466535e3303d0d07b8fa6794889d9159755d18e40518d5b07c142cdd6cee74d78aca0befc
+SHA512 (apache-incubator-disclaimer-resource-bundle-1.1-sources.jar) = 4095b22b344a2e0e44a04cdb26f89db16e6b11e57fb5584caf7ecef0f9d2bb40fb188832d371c375ab917ea2d72445ac7a7387f6353d3b3c1d93266c71c3d4e9