diff --git a/apache-resource-bundles-2.pom b/apache-resource-bundles-2.pom
deleted file mode 100644
index 470cfc3..0000000
--- a/apache-resource-bundles-2.pom
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>5</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
-  </parent>
-  <packaging>pom</packaging>
-  <groupId>org.apache</groupId>
-  <artifactId>apache-resource-bundles</artifactId>
-  <name>Apache Resource Bundles</name>
-  <version>2</version>
-  <inceptionYear>2006</inceptionYear>
-  <modules>
-    <module>apache-jar-resource-bundle</module>
-    <module>apache-license-header-resource-bundle</module>
-    <module>apache-incubator-disclaimer-resource-bundle</module>         
-  </modules>
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</developerConnection>
-    <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>      
-        <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-30.pom b/apache-resource-bundles-30.pom
new file mode 100644
index 0000000..191305c
--- /dev/null
+++ b/apache-resource-bundles-30.pom
@@ -0,0 +1,121 @@
+<?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>30</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>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/maven-parent-30/apache-resource-bundles</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/maven-parent-30/apache-resource-bundles</developerConnection>
+    <url>https://svn.apache.org/viewcvs.cgi/maven/resources/tags/maven-parent-30/apache-resource-bundles</url>
+  </scm>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/MASFRES</url>
+  </issueManagement>
+
+  <ciManagement>
+    <url>https://builds.apache.org/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>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
+          </configuration>
+        </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.spec b/apache-resource-bundles.spec
index d3e7a5b..ecb0ba1 100644
--- a/apache-resource-bundles.spec
+++ b/apache-resource-bundles.spec
@@ -1,26 +1,32 @@
+%bcond_without bootstrap
+
 %global jar_version 1.4
 %global lh_version 1.1
 %global id_version 1.1
 
 Name:           apache-resource-bundles
-Version:        2
-Release:        27%{?dist}
+Version:        30
+Release:        1%{?dist}
 Summary:        Apache Resource Bundles
 License:        ASL 2.0
-URL:            http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
+URL:            https://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
 BuildArch:      noarch
 
-Source0:        http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
-Source1:        http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
-Source2:        http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
-Source3:        http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
-Source4:        http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
-Source5:        http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
-Source6:        http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
+Source0:        https://repo1.maven.org/maven2/org/apache/apache/resources/%{name}/%{version}/%{name}-%{version}.pom
+Source1:        https://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
+Source2:        https://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
+Source3:        https://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
+Source4:        https://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
+Source5:        https://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
+Source6:        https://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+%endif
 
 %description
 An archive which contains templates for generating the necessary license files
@@ -29,12 +35,22 @@ and notices for all Apache releases.
 %prep
 %setup -cT
 cp -p %{SOURCE0} ./pom.xml
+%pom_xpath_inject 'pom:project' '
+<modules>
+  <module>apache-jar-resource-bundle</module>
+  <module>apache-license-header-resource-bundle</module>
+  <module>apache-incubator-disclaimer-resource-bundle</module>
+</modules>'
+
+%pom_xpath_set 'pom:project/pom:parent/pom:relativePath' '../pom/maven/pom.xml'
+%pom_xpath_set 'pom:project/pom:groupId' 'org.apache'
 
 # jar
 mkdir -p apache-jar-resource-bundle
 pushd apache-jar-resource-bundle
 jar xvf %{SOURCE1}
 cp -p %{SOURCE2} ./pom.xml
+%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
 mkdir -p src/main/resources
 mv META-INF src/main/resources
 popd
@@ -44,6 +60,7 @@ mkdir -p apache-license-header-resource-bundle
 pushd apache-license-header-resource-bundle
 jar xvf %{SOURCE3}
 cp -p %{SOURCE4} ./pom.xml
+%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
 mkdir -p src/main/resources
 mv META-INF src/main/resources
 popd
@@ -53,6 +70,7 @@ mkdir -p apache-incubator-disclaimer-resource-bundle
 pushd apache-incubator-disclaimer-resource-bundle
 jar xvf %{SOURCE5}
 cp -p %{SOURCE6} ./pom.xml
+%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
 mkdir -p src/main/resources
 mv META-INF src/main/resources
 popd
@@ -79,12 +97,21 @@ popd
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2-25
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 30-1
+- Update to upstream version 30
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-22
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-21
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 49e42a6..52356b8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a45167b6e6ef6acc22d02592cd34b1aa  apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
-489c1bbdc4b710bff7380342bccfacb1  apache-jar-resource-bundle-1.4-sources.jar
-fd056a1ca286681e62ef91039f380433  apache-license-header-resource-bundle-1.1-sources.jar
+SHA512 (apache-incubator-disclaimer-resource-bundle-1.1-sources.jar) = 4095b22b344a2e0e44a04cdb26f89db16e6b11e57fb5584caf7ecef0f9d2bb40fb188832d371c375ab917ea2d72445ac7a7387f6353d3b3c1d93266c71c3d4e9
+SHA512 (apache-jar-resource-bundle-1.4-sources.jar) = 55dae4fb13624f083e049c5e9b1556f325c392f734ba034763091261f19239a13c5e2497fcaba190582d820074be0ee8d1ba91e8509bf5a0c91eb8c509b980b3
+SHA512 (apache-license-header-resource-bundle-1.1-sources.jar) = 055ebd253138231c96388ee51b1b0c4013c20b5a16fb124ceb404ae466535e3303d0d07b8fa6794889d9159755d18e40518d5b07c142cdd6cee74d78aca0befc