diff --git a/.plexus-containers.metadata b/.plexus-containers.metadata
new file mode 100644
index 0000000..ada6d6e
--- /dev/null
+++ b/.plexus-containers.metadata
@@ -0,0 +1 @@
+f0e9a95c0ec4df5e0e35e481a8580a9aee469415 SOURCES/plexus-containers-1.5.5.tar.xz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
- 
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
- 
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/0001-Fix-test-oom.patch b/SOURCES/0001-Fix-test-oom.patch
new file mode 100644
index 0000000..a806663
--- /dev/null
+++ b/SOURCES/0001-Fix-test-oom.patch
@@ -0,0 +1,32 @@
+From 8533ee80c48fd43a1ac9bda00a69de10ef65866b Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 28 Jun 2011 12:41:26 +0200
+Subject: [PATCH 1/2] Fix test oom
+
+---
+ ...ponentClassicSingletonComponentManagerTest.java |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java
+index 61812f6..33650eb 100644
+--- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java
++++ b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java
+@@ -34,12 +34,14 @@ public class SlowComponentClassicSingletonComponentManagerTest
+ 
+     /**
+      * Tests that multiple concurrent threads don't acquire different components.
+-     */
++     *
++     * Test disabled - failing in mock due to OOM
+     public void testThreads1000()
+         throws Exception
+     {
+         test( 1000 );
+     }
++     */
+ 
+     private void test( int count )
+         throws Exception
+-- 
+1.7.5.4
+
diff --git a/SOURCES/plexus-component-annotations-build.xml b/SOURCES/plexus-component-annotations-build.xml
new file mode 100644
index 0000000..3793e27
--- /dev/null
+++ b/SOURCES/plexus-component-annotations-build.xml
@@ -0,0 +1,76 @@
+<project name="plexus-component-annotations" default="jar" basedir=".">
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="plexus-component-annotations-1.0-alpha-30"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="javadocdir" value="target/site/annotationsdocs"></property>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+    </javac>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" >
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
+    <property name="title" value="Plexus Component 1.0 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
+    </javadoc>
+  </target>
+</project>
diff --git a/SOURCES/plexus-container-default-build.xml b/SOURCES/plexus-container-default-build.xml
new file mode 100644
index 0000000..4f506fb
--- /dev/null
+++ b/SOURCES/plexus-container-default-build.xml
@@ -0,0 +1,82 @@
+<project name="plexus-container-default" default="jar" basedir=".">
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="plexus-container-default-1.0-alpha-30"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="javadocdir" value="target/site/apidocs"></property>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="false" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="javadoc" description="o Generate javadoc" >
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
+    <property name="title" value="Plexus Container Default 1.0 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.*">
+    </javadoc>
+  </target>
+</project>
diff --git a/SOURCES/plexus-containers-settings.xml b/SOURCES/plexus-containers-settings.xml
new file mode 100644
index 0000000..efe7bd7
--- /dev/null
+++ b/SOURCES/plexus-containers-settings.xml
@@ -0,0 +1,47 @@
+<settings>
+	<profiles>
+		<profile>
+			<id>JPP</id>
+			<repositories>
+				<repository>
+					<id>internal</id>
+					<layout>jpp</layout>
+					<url>__JPP_URL_PLACEHOLDER__</url>
+				</repository>
+				<repository>
+					<id>external</id>
+					<layout>jpp</layout>
+					<url>__JAVADIR_PLACEHOLDER__</url>
+				</repository>
+				<repository>
+					<id>local</id>
+					<layout>jpp</layout>
+					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>plugins-internal</id>
+					<name>plugins-internal</name>
+					<layout>jpp</layout>
+					<url>__JPP_URL_PLACEHOLDER__</url>
+				</pluginRepository>
+				<pluginRepository>
+					<id>plugins-external</id>
+					<name>plugins-external</name>
+					<layout>jpp</layout>
+					<url>__JAVADIR_PLACEHOLDER__</url>
+				</pluginRepository>
+				<pluginRepository>
+					<id>plugins-maven</id>
+					<name>plugins-maven</name>
+					<layout>jpp</layout>
+					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
+	<activeProfiles>
+		<activeProfile>JPP</activeProfile>
+	</activeProfiles>
+</settings>
diff --git a/SPECS/plexus-containers.spec b/SPECS/plexus-containers.spec
new file mode 100644
index 0000000..8244e14
--- /dev/null
+++ b/SPECS/plexus-containers.spec
@@ -0,0 +1,243 @@
+
+%global with_maven 1
+
+%global parent plexus
+%global subname containers
+
+# this needs to be exact version of maven-javadoc-plugin for
+# integration tests
+%global javadoc_plugin_version 2.9
+
+Name:           %{parent}-%{subname}
+Version:        1.5.5
+Release:        12%{?dist}
+Summary:        Containers for Plexus
+License:        ASL 2.0 and MIT
+URL:            http://plexus.codehaus.org/
+# svn export \
+#  http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.5
+# tar caf plexus-containers-1.5.5.tar.xz plexus-containers-1.5.5
+Source0:        %{name}-%{version}.tar.xz
+Source1:        plexus-container-default-build.xml
+Source2:        plexus-component-annotations-build.xml
+Source3:        plexus-containers-settings.xml
+
+Patch0:         0001-Fix-test-oom.patch
+
+BuildArch:      noarch
+
+BuildRequires:  maven-local
+BuildRequires:  maven-invoker-plugin
+BuildRequires:  maven-javadoc-plugin = %{javadoc_plugin_version}
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-shared-invoker
+BuildRequires:  maven-release
+BuildRequires:  maven-plugin-plugin
+BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-utils
+BuildRequires:  plexus-cli
+BuildRequires:  xbean
+BuildRequires:  guava
+
+Requires:       plexus-classworlds >= 2.2.3
+Requires:       plexus-utils
+Requires:       xbean
+Requires:       guava
+
+
+%description
+The Plexus project seeks to create end-to-end developer tools for
+writing applications. At the core is the container, which can be
+embedded or for a full scale application server. There are many
+reusable components for hibernate, form processing, jndi, i18n,
+velocity, etc. Plexus also includes an application server which
+is like a J2EE application server, without all the baggage.
+
+%package component-metadata
+Summary:        Component metadata from %{name}
+
+%description component-metadata
+%{summary}.
+
+%package component-javadoc
+Summary:        Javadoc component from %{name}
+
+%description component-javadoc
+%{summary}.
+
+%package component-annotations
+Summary:        Component API from %{name}
+
+%description component-annotations
+%{summary}.
+
+%package container-default
+Summary:        Default Container from %{name}
+Provides:       plexus-containers-component-api = %{version}-%{release}
+
+%description container-default
+%{summary}.
+
+%package javadoc
+Summary:        API documentation for all plexus-containers packages
+Group:          Documentation
+Provides:       %{name}-component-annotations-javadoc = %{version}-%{release}
+Obsoletes:      %{name}-component-annotations-javadoc < %{version}-%{release}
+Provides:       %{name}-component-javadoc-javadoc = %{version}-%{release}
+Obsoletes:      %{name}-component-javadoc-javadoc < %{version}-%{release}
+Provides:       %{name}-component-metadata-javadoc = %{version}-%{release}
+Obsoletes:      %{name}-component-metadata-javadoc < %{version}-%{release}
+Provides:       %{name}-container-default-javadoc = %{version}-%{release}
+Obsoletes:      %{name}-container-default-javadoc < %{version}-%{release}
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n plexus-containers-%{version}
+
+cp %{SOURCE1} plexus-container-default/build.xml
+cp %{SOURCE2} plexus-component-annotations/build.xml
+
+%patch0 -p1
+
+# For Maven 3 compat
+%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
+
+# OpenJDK7 compatibility
+%pom_xpath_replace "pom:profile[pom:id[text()='default-tools.jar']]/pom:activation" "
+ <activation>
+    <activeByDefault>true</activeByDefault>
+ </activation>
+" plexus-component-javadoc
+
+# to prevent ant from failing
+mkdir -p plexus-component-annotations/src/test/java
+
+# integration tests fix
+sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml
+
+# plexus-component-api has been merged into plexus-container-default
+%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api"
+
+# keep compat symlink for maven's sake
+%mvn_file ":plexus-component-annotations" %{name}/plexus-component-annotations plexus/containers-component-annotations
+
+%build
+%mvn_build -f -s
+
+%install
+%mvn_install
+
+
+# plexus-containers pom goes into main package
+%files -f .mfiles -f .mfiles-plexus-containers
+%files component-annotations -f .mfiles-plexus-component-annotations
+%files container-default -f .mfiles-plexus-container-default
+%files component-metadata -f .mfiles-plexus-component-metadata
+%files component-javadoc -f .mfiles-plexus-component-javadoc
+
+%files javadoc -f .mfiles-javadoc
+
+%changelog
+* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.5-12
+- Rebuild to regenerate API documentation
+- Resolves: CVE-2013-1571
+
+* Fri Mar 22 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.5-11
+- Correctly place plexus-containers POM in the main package
+
+* Thu Mar 21 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-11
+- Add compat symlinks to keep Maven working
+
+* Wed Mar 20 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-10
+- Update to latest packaging guidelines
+- Remove several unneeded buildrequires
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.5.5-8
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Wed Nov 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-7
+- Fix license tag (Plexus license was replaced by MIT some time ago)
+- Update javadoc plugin BR version
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Feb 17 2012 Deepak Bhole <dbhole@redhat.com> - 1.5.5-5
+- Resolves rhbz#791339
+- Applied fix from Omair Majid <omajid at redhat dot com> to build with Java 7
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jun 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-3
+- Fix maven3 build
+- Use new add_maven_depmap macro
+
+* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-2
+- Remove unneeded env var definitions
+
+* Fri Feb 25 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-1
+- Update to latest upstream
+- Remove obsolete patches
+- Use maven 3 to build
+- Packaging fixes
+- Versionless jars & javadocs
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Oct 11 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.4-4
+- Add plexus-cli to component-metadata Requires
+
+* Wed Sep  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.4-3
+- Use javadoc:aggregate
+- Merge javadoc subpackages into one -javadoc
+
+* Thu Jul 15 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.4-2
+- Fix maven depmaps
+
+* Tue Jul 13 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.4-1
+- Version bump
+- Add new sub-packages
+- Cleanups
+
+* Thu Aug 20 2009 Andrew Overholt <overholt@redhat.com> 0:1.0-0.1.a34.7
+- Clean up javadoc post/postun
+- Build with ant
+- Remove gcj support
+- Clean up groups
+
+* Fri May 15 2009 Fernando Nasser <fnasser@redhat.com> 1.0-0.1.a34.6
+- Fix license
+
+* Tue Apr 28 2009 Yong Yang <yyang@redhat.com> 1.0-0.1.a34.5
+- Add BRs maven2-plugin-surfire*, maven-doxia*
+- Merge from RHEL-4-EP-5 1.0-0.1.a34.2, add plexus-containers-sourcetarget.patch
+- Rebuild with new maven2 2.0.8 built in non-bootstrap mode
+
+* Mon Mar 16 2009 Yong Yang <yyang@redhat.com> 1.0-0.1.a34.4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
+
+* Wed Feb 04 2009 Yong Yang <yyang@redhat.com> - 1.0-0.1.a34.3
+- re-build with maven
+
+* Wed Feb 04 2009 Yong Yang <yyang@redhat.com> - 1.0-0.1.a34.2
+- fix bulding with ant
+- temporarily buid with ant
+
+* Wed Jan 14 2009 Yong Yang <yyang@redhat.com> - 1.0-0.1.a34.1jpp.2
+- re-build with maven
+- disabled assert in plexus-container-default/.../UriConverter.java???
+
+* Tue Jan 13 2009 Yong Yang <yyang@redhat.com> - 1.0-0.1.a34.1jpp.1
+- Imported into devel from dbhole's maven 2.0.8 packages
+
+* Tue Apr 08 2008 Deepak Bhole <dbhole@redhat.com> 1.0-0.1.a34.0jpp.1
+- Initial build with original base spec from JPackage