diff --git a/SPECS-EXTENDED/apache-parent/apache-parent.signatures.json b/SPECS/apache-parent/apache-parent.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/apache-parent/apache-parent.signatures.json
rename to SPECS/apache-parent/apache-parent.signatures.json
diff --git a/SPECS-EXTENDED/apache-parent/apache-parent.spec b/SPECS/apache-parent/apache-parent.spec
similarity index 100%
rename from SPECS-EXTENDED/apache-parent/apache-parent.spec
rename to SPECS/apache-parent/apache-parent.spec
diff --git a/SPECS/maven-javadoc-plugin/SOURCES/maven-javadoc-plugin-3.6.2-source-release.zip b/SPECS/maven-javadoc-plugin/SOURCES/maven-javadoc-plugin-3.6.2-source-release.zip
new file mode 100644
index 00000000000..c049b5ebf8a
Binary files /dev/null and b/SPECS/maven-javadoc-plugin/SOURCES/maven-javadoc-plugin-3.6.2-source-release.zip differ
diff --git a/SPECS/maven-javadoc-plugin/maven-javadoc-plugin.signatures.json b/SPECS/maven-javadoc-plugin/maven-javadoc-plugin.signatures.json
new file mode 100644
index 00000000000..86e452420ee
--- /dev/null
+++ b/SPECS/maven-javadoc-plugin/maven-javadoc-plugin.signatures.json
@@ -0,0 +1,5 @@
+{
+  "Signatures": {
+    "maven-javadoc-plugin-3.6.2-source-release.zip": "bfb50d63163584a547481c723dc268548efaa749e1800bc925994d8cb06dfb02"
+  }
+}
diff --git a/SPECS/maven-javadoc-plugin/maven-javadoc-plugin.spec b/SPECS/maven-javadoc-plugin/maven-javadoc-plugin.spec
new file mode 100644
index 00000000000..59edbf49e93
--- /dev/null
+++ b/SPECS/maven-javadoc-plugin/maven-javadoc-plugin.spec
@@ -0,0 +1,36 @@
+
+Summary:        Maven Resources Plugin
+Name:           maven-javadoc-plugin
+Version:        3.6.2
+Release:        1%{?dist}
+License:        ASL 2.0
+Vendor:         Microsoft Corporation
+Distribution:   Azure Linux
+URL:            https://maven.apache.org/plugins/maven-javadoc-plugin
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+BuildRequires:  javapackages-bootstrap
+BuildRequires:  javapackages-local-bootstrap
+BuildArch:      noarch
+
+%description
+The Javadoc Plugin uses the Javadoc tool to generate javadocs for the specified
+project
+
+%prep
+%setup -q
+ 
+%build
+%{mvn_build}
+
+%install
+%{mvn_install}
+
+%files -f .mfiles
+%license LICENSE NOTICE
+
+%files -f .mfiles
+%license LICENSE NOTICE
+
+%changelog
+* Mon Nov 06 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.3.1-1
+- Auto-upgrade to 3.3.1 - Azure Linux 3.0 - package upgrades
diff --git a/SPECS/maven-parent/maven-parent.signatures.json b/SPECS/maven-parent/maven-parent.signatures.json
new file mode 100644
index 00000000000..d382a41e2bc
--- /dev/null
+++ b/SPECS/maven-parent/maven-parent.signatures.json
@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "maven-parent-27-source-release.zip": "c7f0c570c1acb5c94d2d52e5184493385eab8e9829b4f276dbdc35eda1a4cc54"
+ }
+}
diff --git a/SPECS-EXTENDED/maven-parent/maven-parent.spec b/SPECS/maven-parent/maven-parent.spec
similarity index 100%
rename from SPECS-EXTENDED/maven-parent/maven-parent.spec
rename to SPECS/maven-parent/maven-parent.spec
diff --git a/SPECS/maven-reporting-api/SOURCES/maven-reporting-api-3.1.1-source-release.zip b/SPECS/maven-reporting-api/SOURCES/maven-reporting-api-3.1.1-source-release.zip
new file mode 100644
index 00000000000..fe1c1c3ab59
Binary files /dev/null and b/SPECS/maven-reporting-api/SOURCES/maven-reporting-api-3.1.1-source-release.zip differ
diff --git a/SPECS/maven-reporting-api/maven-reporting-api.signatures.json b/SPECS/maven-reporting-api/maven-reporting-api.signatures.json
new file mode 100644
index 00000000000..960cc31fb87
--- /dev/null
+++ b/SPECS/maven-reporting-api/maven-reporting-api.signatures.json
@@ -0,0 +1,5 @@
+{
+  "Signatures": {
+    "maven-reporting-api-3.1.1-source-release.zip": "3ce3604002dd5f4698ed4068ea74254f95e2988007486f4e05cecd5ae55dd586"
+  }
+}
diff --git a/SPECS/maven-reporting-api/maven-reporting-api.spec b/SPECS/maven-reporting-api/maven-reporting-api.spec
new file mode 100644
index 00000000000..91cd5fffb99
--- /dev/null
+++ b/SPECS/maven-reporting-api/maven-reporting-api.spec
@@ -0,0 +1,43 @@
+Summary:        API to manage report generation
+Name:           maven-reporting-api
+Version:        3.1.1
+Release:        1%{?dist}
+License:        Apache-2.0
+Vendor:         Microsoft Corporation
+Distribution:   Azure Linux
+URL:            https://maven.apache.org/shared/maven-reporting-api
+Source0:        https://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip
+BuildArch:      noarch
+BuildRequires:  gnupg2
+BuildRequires:  maven-local
+# BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
+BuildRequires:  maven-parent
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
+
+%description
+API to manage report generation.  Maven-reporting-api is included in the
+Maven 2.x core distribution, but was moved to shared components to
+achieve report decoupling from the Maven 3 core.
+
+%prep
+# %{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
+%autosetup
+
+# Fix end of line encoding
+sed -i.orig 's/\\r//' README.md
+touch -r README.md.orig README.md
+rm README.md.orig
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc README.md
+%license LICENSE NOTICE
+
+%changelog
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1:3.1.1-6
+- Rebuilt for java-21-openjdk as system jdk