diff --git a/weld-parent-26.pom b/weld-parent-26.pom
deleted file mode 100644
index fd7af54..0000000
--- a/weld-parent-26.pom
+++ /dev/null
@@ -1,788 +0,0 @@
-<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>
-   <groupId>org.jboss.weld</groupId>
-   <artifactId>weld-parent</artifactId>
-   <packaging>pom</packaging>
-   <version>26</version>
-
-   <name>Weld Parent</name>
-
-   <!-- Full metadata -->
-
-   <url>http://www.seamframework.org/Weld</url>
-
-   <description>
-      The parent POM for Weld, specifying the build parameters
-   </description>
-
-   <licenses>
-      <license>
-         <name>Apache License, Version 2.0</name>
-         <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      </license>
-   </licenses>
-
-   <developers>
-      <developer>
-         <name>Weld committers</name>
-      </developer>
-   </developers>
-
-   <organization>
-      <name>Seam Framework</name>
-      <url>http://seamframework.org</url>
-   </organization>
-
-   <properties>
-      <!-- Force encoding to UTF-8 (bug on OS X) -->
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <weld.docbook.version>1.1.1-Beta3</weld.docbook.version>
-      <seam.docbook.version>1.1.0.GA</seam.docbook.version>
-      <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version>
-      <pdf.name>${project.artifactId}.pdf</pdf.name>
-      <minimum.maven.version>3.0.3</minimum.maven.version>
-      <build.config.version>1</build.config.version>
-      <!-- plugins -->
-      <surefire.version>2.12.4</surefire.version>
-      <compiler.version>2.5.1</compiler.version>
-      <release.version>2.2.1</release.version>
-      <checkstyle.version>2.10</checkstyle.version>
-
-      <!-- ***************** -->
-      <!-- Repository Deployment URLs -->
-      <!-- ***************** -->
-      <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
-      <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
-      <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-   </properties>
-
-   <prerequisites>
-      <maven>3.0</maven>
-   </prerequisites>
-
-
-   <!-- Configure the build -->
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <inherited>true</inherited>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>buildnumber-maven-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <artifactId>maven-remote-resources-plugin</artifactId>
-            <version>1.1</version>
-            <executions>
-               <execution>
-                  <id>attach-license</id>
-                  <goals>
-                     <goal>process</goal>
-                  </goals>
-                  <inherited>true</inherited>
-                  <configuration>
-                     <resourceBundles>
-                        <resourceBundle>org.jboss.weld:weld-license:1</resourceBundle>
-                     </resourceBundles>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-
-      </plugins>
-      <defaultGoal>package</defaultGoal>
-
-      <!-- Configure all plugins, including versions to use in the build -->
-      <pluginManagement>
-         <plugins>
-            <plugin>
-               <groupId>ch.qos.cal10n.plugins</groupId>
-               <artifactId>maven-cal10n-plugin</artifactId>
-               <version>0.8.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.jboss.maven.plugins</groupId>
-               <artifactId>maven-jdocbook-plugin</artifactId>
-               <version>2.2.3</version>
-               <extensions>true</extensions>
-               <dependencies>
-                  <dependency>
-                     <groupId>org.jboss.weld</groupId>
-                     <artifactId>weld-docbook-xslt</artifactId>
-                     <version>${weld.docbook.version}</version>
-                  </dependency>
-                  <dependency>
-                     <groupId>org.jboss.seam</groupId>
-                     <artifactId>seam-docbook-xslt</artifactId>
-                     <version>${seam.docbook.version}</version>
-                  </dependency>
-                  <dependency>
-                     <groupId>org.jboss.seam</groupId>
-                     <artifactId>seam-jdocbook-style</artifactId>
-                     <version>${seam.docbook.version}</version>
-                     <type>jdocbook-style</type>
-                  </dependency>
-                  <dependency>
-                     <groupId>org.jboss</groupId>
-                     <artifactId>jbossorg-jdocbook-style</artifactId>
-                     <version>${jbossorg.docbook.version}</version>
-                     <type>jdocbook-style</type>
-                  </dependency>
-               </dependencies>
-               <configuration>
-                  <sourceDirectory>${project.basedir}/src/main/docbook</sourceDirectory>
-                  <sourceDocumentName>master.xml</sourceDocumentName>
-                  <masterTranslation>en-US</masterTranslation>
-                  <imageResource>
-                     <directory>${project.basedir}/src/main/docbook/en-US</directory>
-                     <includes>
-                        <include>images/*.png</include>
-                     </includes>
-                  </imageResource>
-                  <formats>
-                     <format>
-                        <formatName>pdf</formatName>
-                        <stylesheetResource>classpath:/xslt/org/jboss/weld/pdf.xsl</stylesheetResource>
-                        <finalName>${pdf.name}</finalName>
-                     </format>
-                     <format>
-                        <formatName>html</formatName>
-                        <stylesheetResource>classpath:/xslt/org/jboss/weld/xhtml.xsl</stylesheetResource>
-                        <finalName>index.html</finalName>
-                     </format>
-                     <format>
-                        <formatName>html_single</formatName>
-                        <stylesheetResource>classpath:/xslt/org/jboss/weld/xhtml-single.xsl</stylesheetResource>
-                        <finalName>index.html</finalName>
-                     </format>
-                  </formats>
-                  <options>
-                     <xincludeSupported>true</xincludeSupported>
-                     <xmlTransformerType>saxon</xmlTransformerType>
-                     <docbookVersion>1.72.0</docbookVersion>
-                     <localeSeparator>-</localeSeparator>
-                  </options>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-antrun-plugin</artifactId>
-               <version>1.3</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-release-plugin</artifactId>
-               <configuration>
-                  <arguments>-Drelease </arguments>
-                  <autoVersionSubmodules>true</autoVersionSubmodules>
-               </configuration>
-               <version>${release.version}</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-surefire-report-plugin</artifactId>
-               <version>${surefire.version}</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-surefire-plugin</artifactId>
-               <version>${surefire.version}</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-clean-plugin</artifactId>
-               <version>2.4.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-deploy-plugin</artifactId>
-               <version>2.5</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-assembly-plugin</artifactId>
-               <version>2.2-beta-5</version>
-               <executions>
-                  <execution>
-                     <id>distribution</id>
-                     <phase>package</phase>
-                     <goals>
-                        <goal>single</goal>
-                     </goals>
-                     <configuration>
-                        <descriptors>
-                           <descriptor>src/main/assembly/assembly.xml</descriptor>
-                        </descriptors>
-                        <finalName>${project.build.finalName}-${project.version}</finalName>
-                     </configuration>
-                  </execution>
-               </executions>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-install-plugin</artifactId>
-               <version>2.3.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-site-plugin</artifactId>
-               <version>2.0.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-source-plugin</artifactId>
-               <version>2.1.2</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-resources-plugin</artifactId>
-               <version>2.4.3</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-dependency-plugin</artifactId>
-               <version>2.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-javadoc-plugin</artifactId>
-               <version>2.7</version>
-               <configuration>
-                  <keywords>true</keywords>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-gpg-plugin</artifactId>
-               <version>1.4</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>maven-bundle-plugin</artifactId>
-               <version>2.1.0</version>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>exec-maven-plugin</artifactId>
-               <version>1.1.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-enforcer-plugin</artifactId>
-               <version>1.0-beta-1</version>
-               <executions>
-                  <execution>
-                     <id>enforce</id>
-                     <goals>
-                        <goal>enforce</goal>
-                     </goals>
-                     <configuration>
-                        <rules>
-                           <requireMavenVersion>
-                              <version>[${minimum.maven.version},)</version>
-                           </requireMavenVersion>
-                           <requirePluginVersions>
-                              <unCheckedPlugins>
-                                 <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
-                                 <unCheckedPlugin>org.codehaus.mojo:versions-maven-plugin</unCheckedPlugin>
-                              </unCheckedPlugins>
-                           </requirePluginVersions>
-                        </rules>
-                     </configuration>
-                  </execution>
-               </executions>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-shade-plugin</artifactId>
-               <version>2.0</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <version>${compiler.version}</version>
-               <configuration>
-                  <source>1.6</source>
-                  <target>1.6</target>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <version>2.3.1</version>
-               <configuration>
-                  <archive>
-                     <manifestEntries>
-                        <Implementation-URL>${project.url}</Implementation-URL>
-                        <Implementation-Title>${project.name}</Implementation-Title>
-                        <Implementation-Version>${maven.build.timestamp}</Implementation-Version>
-                        <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-                        <Specification-Title>${project.name}</Specification-Title>
-                        <Specification-Version>${parsedVersion.osgiVersion}</Specification-Version>
-                        <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-                     </manifestEntries>
-                     <manifestSections>
-                        <manifestSection>
-                           <name>Build-Information</name>
-                           <manifestEntries>
-                              <Maven-Version>${maven.version}</Maven-Version>
-                              <Java-Version>${java.version}</Java-Version>
-                              <Java-Vendor>${java.vendor}</Java-Vendor>
-                              <Os-Name>${os.name}</Os-Name>
-                              <Os-Arch>${os.arch}</Os-Arch>
-                              <Os-Version>${os.version}</Os-Version>
-                              <SCM>${buildNumber}</SCM>
-                              <Build-Time>${maven.build.timestamp}</Build-Time>
-                           </manifestEntries>
-                        </manifestSection>
-                     </manifestSections>
-                  </archive>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>build-helper-maven-plugin</artifactId>
-               <version>1.5</version>
-               <executions>
-                  <execution>
-                     <phase>validate</phase>
-                     <goals>
-                        <goal>maven-version</goal>
-                        <goal>parse-version</goal>
-                     </goals>
-                  </execution>
-               </executions>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-eclipse-plugin</artifactId>
-               <configuration>
-                  <classpathContainers>
-                     <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-                  </classpathContainers>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>buildnumber-maven-plugin</artifactId>
-               <version>1.2</version>
-               <executions>
-                  <execution>
-                     <id>set-build-properties</id>
-                     <goals>
-                        <goal>create</goal>
-                     </goals>
-                     <configuration>
-                        <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
-                        <revisionOnScmFailure>unavailable</revisionOnScmFailure>
-                        <timestampFormat>{0, date, long} {0, time, long}</timestampFormat>
-                     </configuration>
-                  </execution>
-               </executions>
-               <inherited>true</inherited>
-            </plugin>
-            <plugin>
-               <groupId>org.twdata.maven</groupId>
-               <artifactId>maven-cli-plugin</artifactId>
-               <version>1.0.3</version>
-            </plugin>
-            <plugin>
-               <groupId>org.glassfish</groupId>
-               <artifactId>maven-embedded-glassfish-plugin</artifactId>
-               <version>3.0</version>
-               <configuration>
-                  <goalPrefix>glassfish</goalPrefix>
-                  <app>${project.build.directory}/${project.build.finalName}.war</app>
-                  <port>7070</port>
-                  <contextRoot>${project.build.finalName}</contextRoot>
-               </configuration>
-               <executions>
-                  <execution>
-                     <phase>install</phase>
-                     <goals>
-                        <goal>run</goal>
-                     </goals>
-                  </execution>
-               </executions>
-            </plugin>
-            <plugin>
-               <groupId>org.mortbay.jetty</groupId>
-               <artifactId>maven-jetty-plugin</artifactId>
-               <version>6.1.21</version>
-               <configuration>
-                  <!-- Delete this block to have Jetty run default port (8080) -->
-                  <connectors>
-                     <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                        <port>9090</port>
-                     </connector>
-                  </connectors>
-                  <!-- force friendly name instead of artifact name + version -->
-                  <contextPath>${project.build.finalName}</contextPath>
-                  <!--
-                     Where the BeanManager is constructed. This is where
-                     you'll declare datasources.
-                  -->
-                  <jettyEnvXml>${basedir}/src/main/resources/jetty-env.xml</jettyEnvXml>
-                  <!-- This parameter will auto-deploy modified classes. -->
-                  <!--
-                     You can save changes in a file or class and refresh
-                     your browser to view the changes.
-                  -->
-                  <scanIntervalSeconds>3</scanIntervalSeconds>
-               </configuration>
-            </plugin>
-
-            <!-- Embedded Tomcat (package tomcat:run) -->
-            <!-- Standalone Tomcat (package tomcat:deploy) -->
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>tomcat-maven-plugin</artifactId>
-               <version>1.0-beta-1</version>
-               <inherited>true</inherited>
-               <configuration>
-                  <path>/${project.build.finalName}</path>
-                  <!-- Embedded port -->
-                  <port>6060</port>
-                  <!--
-                     The default authentication credentials for remote
-                     deployment are username "admin" with no password To
-                     override credentials, define a server in
-                     settings.xml and activate it using the <server>
-                     element
-                  -->
-                  <url>http://localhost:8080/manager</url>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-war-plugin</artifactId>
-               <version>2.1-beta-1</version>
-               <inherited>true</inherited>
-               <configuration>
-                  <failOnMissingWebXml>false</failOnMissingWebXml>
-                  <warName>${project.build.finalName}</warName>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-ejb-plugin</artifactId>
-               <version>2.2.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-ear-plugin</artifactId>
-               <version>2.4.2</version>
-            </plugin>
-            <plugin>
-               <groupId>com.pyx4j</groupId>
-               <artifactId>maven-junction-plugin</artifactId>
-               <version>1.0.3</version>
-            </plugin>
-            <plugin>
-               <groupId>org.sonatype.plugins</groupId>
-               <artifactId>nexus-maven-plugin</artifactId>
-               <version>1.3.2.1</version>
-               <configuration>
-                  <nexusUrl>https://repository.jboss.org/nexus</nexusUrl>
-                  <serverAuthId>jboss-releases-repository</serverAuthId>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-archetype-plugin</artifactId>
-               <version>2.0-alpha-5</version>
-               <extensions>true</extensions>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>jboss-maven-plugin</artifactId>
-               <version>1.4</version>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>emma-maven-plugin</artifactId>
-               <version>1.0-alpha-2</version>
-            </plugin>
-            <plugin>
-               <groupId>org.sonatype.maven.plugin</groupId>
-               <artifactId>emma4it-maven-plugin</artifactId>
-               <version>1.3</version>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>findbugs-maven-plugin</artifactId>
-               <version>2.3.1</version>
-               <configuration>
-                  <effort>Max</effort>
-                  <threshold>Low</threshold>
-                  <xmlOutput>true</xmlOutput>
-                  <failOnError>false</failOnError>
-               </configuration>
-               <executions>
-                  <execution>
-                     <goals>
-                        <goal>check</goal>
-                     </goals>
-                  </execution>
-               </executions>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.cargo</groupId>
-               <artifactId>cargo-maven2-plugin</artifactId>
-               <version>1.0.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>selenium-maven-plugin</artifactId>
-               <version>1.0.1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>failsafe-maven-plugin</artifactId>
-               <version>2.4.3-alpha-1</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-scm-plugin</artifactId>
-               <version>1.4</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${checkstyle.version}</version>
-                <configuration>
-                    <configLocation>weld-checkstyle/checkstyle.xml</configLocation>
-                    <suppressionsLocation>weld-checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
-                    <useFile />
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jboss.weld</groupId>
-                        <artifactId>weld-common-build-config</artifactId>
-                        <version>${build.config.version}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>check-style</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>checkstyle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-         </plugins>
-      </pluginManagement>
-   </build>
-
-   <profiles>
-      <profile>
-         <id>release</id>
-         <activation>
-            <property>
-               <name>release</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-gpg-plugin</artifactId>
-                  <configuration>
-                     <passphrase>${gpg.passphrase}</passphrase>
-                     <useAgent>${gpg.useAgent}</useAgent>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                           <goal>sign</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.sonatype.plugins</groupId>
-                  <artifactId>nexus-maven-plugin</artifactId>
-                  <configuration>
-                     <auto>true</auto>
-                     <description>[nexus-maven-plugin] closing
-                        repository after release:perform</description>
-                  </configuration>
-               </plugin>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>buildnumber-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>validate-scm</id>
-                        <goals>
-                           <goal>create</goal>
-                        </goals>
-                        <!-- Disabled, doesn't support git -->
-                        <phase>none</phase>
-                        <configuration>
-                           <doUpdate>true</doUpdate>
-                           <doCheck>true</doCheck>
-                        </configuration>
-                     </execution>
-                  </executions>
-                  <inherited>true</inherited>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>distribution</id>
-         <activation>
-            <property>
-               <name>dist</name>
-            </property>
-         </activation>
-         <properties>
-            <!-- Skip failing tests when building dist -->
-            <maven.test.failure.ignore>true</maven.test.failure.ignore>
-         </properties>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-javadoc-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>jar</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-deploy-plugin</artifactId>
-                  <configuration>
-                     <skip>${maven.deploy.skip}</skip>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>code-coverage</id>
-         <activation>
-            <property>
-               <name>code-coverage</name>
-            </property>
-         </activation>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <groupId>org.codehaus.mojo</groupId>
-                     <artifactId>emma-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>instrumentation</id>
-                           <phase>process-classes</phase>
-                           <goals>
-                              <goal>instrument</goal>
-                           </goals>
-                           <configuration>
-                              <verbose>true</verbose>
-                           </configuration>
-                        </execution>
-                        <execution>
-                           <id>instrumentation-clean</id>
-                           <phase>clean</phase>
-                           <goals>
-                              <goal>clean</goal>
-                           </goals>
-                        </execution>
-                     </executions>
-                  </plugin>
-
-                  <plugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-surefire-plugin</artifactId>
-                     <inherited>true</inherited>
-                     <configuration>
-                        <forkMode>once</forkMode>
-                        <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory>
-                     </configuration>
-                  </plugin>
-
-                  <plugin>
-                     <groupId>org.sonatype.maven.plugin</groupId>
-                     <artifactId>emma4it-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>report</id>
-                           <phase>test</phase>
-                           <goals>
-                              <goal>report</goal>
-                           </goals>
-                           <configuration>
-                              <sourceSets>
-                                 <sourceSet>
-                                    <directory>${project.build.sourceDirectory}</directory>
-                                 </sourceSet>
-                              </sourceSets>
-                           </configuration>
-                        </execution>
-                     </executions>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
-   </profiles>
-
-   <!-- SCM and Distribution Management -->
-
-   <scm>
-      <connection>scm:git:git@github.com:weld/parent.git</connection>
-      <developerConnection>scm:git:git@github.com:weld/parent.git</developerConnection>
-      <url>scm:git:git@github.com:weld/parent.git</url>
-     <tag>HEAD</tag>
-  </scm>
-
-   <distributionManagement>
-      <repository>
-         <id>jboss-releases-repository</id>
-         <name>JBoss Releases Repository</name>
-         <url>${jboss.releases.repo.url}</url>
-      </repository>
-      <snapshotRepository>
-         <id>jboss-snapshots-repository</id>
-         <name>JBoss Snapshots Repository</name>
-         <url>${jboss.snapshots.repo.url}</url>
-      </snapshotRepository>
-   </distributionManagement>
-
-
-</project>
diff --git a/weld-parent-31.pom b/weld-parent-31.pom
new file mode 100644
index 0000000..afd0529
--- /dev/null
+++ b/weld-parent-31.pom
@@ -0,0 +1,837 @@
+<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>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-parent</artifactId>
+   <packaging>pom</packaging>
+   <version>31</version>
+
+   <name>Weld Parent</name>
+
+   <!-- Full metadata -->
+
+   <url>http://weld.cdi-spec.org</url>
+
+   <description>
+      The parent POM for Weld, specifying the build parameters
+   </description>
+
+   <licenses>
+      <license>
+         <name>Apache License, Version 2.0</name>
+         <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      </license>
+   </licenses>
+
+   <developers>
+      <developer>
+         <name>Weld committers</name>
+      </developer>
+   </developers>
+
+   <properties>
+      <!-- Force encoding to UTF-8 (bug on OS X) -->
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+      <pdf.name>${project.artifactId}.pdf</pdf.name>
+      <minimum.maven.version>3.0.3</minimum.maven.version>
+      <maven.compiler.source>1.6</maven.compiler.source>
+      <maven.compiler.target>1.6</maven.compiler.target>
+      <javadoc.doclint>-Xdoclint:none</javadoc.doclint>
+
+      <!-- dependency versions -->
+      <weld.docbook.version>1.1.1-Beta3</weld.docbook.version>
+      <seam.docbook.version>1.1.0.GA</seam.docbook.version>
+      <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version>
+      <build.config.version>7</build.config.version>
+      <maven.scm.provider.gitexe>1.9.1</maven.scm.provider.gitexe>
+
+      <!-- plugin versions -->
+      <antrun.plugin.version>1.3</antrun.plugin.version>
+      <archetype.plugin.version>2.0-alpha-5</archetype.plugin.version>
+      <assembly.plugin.version>2.2-beta-5</assembly.plugin.version>
+      <build.helper.plugin.version>1.5</build.helper.plugin.version>
+      <buildnumber.plugin.version>1.2</buildnumber.plugin.version>
+      <bundle.plugin.version>2.1.0</bundle.plugin.version>
+      <cal10n.plugin.version>0.8.1</cal10n.plugin.version>
+      <cargo.plugin.version>1.0.1</cargo.plugin.version>
+      <checkstyle.version>2.12.1</checkstyle.version>
+      <clean.plugin.version>2.4.1</clean.plugin.version>
+      <cli.plugin.version>1.0.3</cli.plugin.version>
+      <compiler.version>2.5.1</compiler.version>
+      <dependency.plugin.version>2.1</dependency.plugin.version>
+      <deploy.plugin.version>2.5</deploy.plugin.version>
+      <embedded.glassfish.plugin.version>3.0</embedded.glassfish.plugin.version>
+      <ear.plugin.version>2.4.2</ear.plugin.version>
+      <enforcer.plugin.version>1.0-beta-1</enforcer.plugin.version>
+      <ejb.plugin.version>2.2.1</ejb.plugin.version>
+      <emma.plugin.version>1.0-alpha-2</emma.plugin.version>
+      <emma4it.plugin.version>1.3</emma4it.plugin.version>
+      <exec.plugin.version>1.1.1</exec.plugin.version>
+      <failsafe.plugin.version>2.4.3-alpha-1</failsafe.plugin.version>
+      <findbugs.plugin.version>2.3.1</findbugs.plugin.version>
+      <gpg.plugin.version>1.4</gpg.plugin.version>
+      <install.plugin.version>2.3.1</install.plugin.version>
+      <jar.plugin.version>2.3.1</jar.plugin.version>
+      <javadoc.plugin.version>2.7</javadoc.plugin.version>
+      <jboss.plugin.version>1.4</jboss.plugin.version>
+      <jdocbook.plugin.version>2.2.3</jdocbook.plugin.version>
+      <jetty.plugin.version>6.1.21</jetty.plugin.version>
+      <junction.plugin.version>1.0.3</junction.plugin.version>
+      <nexus.plugin.version>1.3.2.1</nexus.plugin.version>
+      <release.version>2.5</release.version>
+      <remote.resources.version>1.1</remote.resources.version>
+      <resources.plugin.version>2.4.3</resources.plugin.version>
+      <scm.plugin.version>1.9.1</scm.plugin.version>
+      <selenium.plugin.version>1.0.1</selenium.plugin.version>
+      <site.plugin.version>2.0.1</site.plugin.version>
+      <shade.plugin.version>2.0</shade.plugin.version>
+      <source.plugin.version>2.1.2</source.plugin.version>
+      <surefire.version>2.17</surefire.version>
+      <tomcat.plugin.version>1.0-beta-1</tomcat.plugin.version>
+      <war.plugin.version>2.1-beta-1</war.plugin.version>
+
+      <!-- ***************** -->
+      <!-- Repository Deployment URLs -->
+      <!-- ***************** -->
+      <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
+      <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
+      <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+   </properties>
+
+   <prerequisites>
+      <maven>3.0</maven>
+   </prerequisites>
+
+
+   <!-- Configure the build -->
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>attach-sources</id>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <inherited>true</inherited>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>buildnumber-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <artifactId>maven-remote-resources-plugin</artifactId>
+            <version>${remote.resources.version}</version>
+            <executions>
+               <execution>
+                  <id>attach-license</id>
+                  <goals>
+                     <goal>process</goal>
+                  </goals>
+                  <inherited>true</inherited>
+                  <configuration>
+                     <resourceBundles>
+                        <resourceBundle>org.jboss.weld:weld-license:1</resourceBundle>
+                     </resourceBundles>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+
+      </plugins>
+      <defaultGoal>package</defaultGoal>
+
+      <!-- Configure all plugins, including versions to use in the build -->
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>ch.qos.cal10n.plugins</groupId>
+               <artifactId>maven-cal10n-plugin</artifactId>
+               <version>${cal10n.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.jboss.maven.plugins</groupId>
+               <artifactId>maven-jdocbook-plugin</artifactId>
+               <version>${jdocbook.plugin.version}</version>
+               <extensions>true</extensions>
+               <dependencies>
+                  <dependency>
+                     <groupId>org.jboss.weld</groupId>
+                     <artifactId>weld-docbook-xslt</artifactId>
+                     <version>${weld.docbook.version}</version>
+                  </dependency>
+                  <dependency>
+                     <groupId>org.jboss.seam</groupId>
+                     <artifactId>seam-docbook-xslt</artifactId>
+                     <version>${seam.docbook.version}</version>
+                  </dependency>
+                  <dependency>
+                     <groupId>org.jboss.seam</groupId>
+                     <artifactId>seam-jdocbook-style</artifactId>
+                     <version>${seam.docbook.version}</version>
+                     <type>jdocbook-style</type>
+                  </dependency>
+                  <dependency>
+                     <groupId>org.jboss</groupId>
+                     <artifactId>jbossorg-jdocbook-style</artifactId>
+                     <version>${jbossorg.docbook.version}</version>
+                     <type>jdocbook-style</type>
+                  </dependency>
+               </dependencies>
+               <configuration>
+                  <sourceDirectory>${project.basedir}/src/main/docbook</sourceDirectory>
+                  <sourceDocumentName>master.xml</sourceDocumentName>
+                  <masterTranslation>en-US</masterTranslation>
+                  <imageResource>
+                     <directory>${project.basedir}/src/main/docbook/en-US</directory>
+                     <includes>
+                        <include>images/*.png</include>
+                     </includes>
+                  </imageResource>
+                  <formats>
+                     <format>
+                        <formatName>pdf</formatName>
+                        <stylesheetResource>classpath:/xslt/org/jboss/weld/pdf.xsl</stylesheetResource>
+                        <finalName>${pdf.name}</finalName>
+                     </format>
+                     <format>
+                        <formatName>html</formatName>
+                        <stylesheetResource>classpath:/xslt/org/jboss/weld/xhtml.xsl</stylesheetResource>
+                        <finalName>index.html</finalName>
+                     </format>
+                     <format>
+                        <formatName>html_single</formatName>
+                        <stylesheetResource>classpath:/xslt/org/jboss/weld/xhtml-single.xsl</stylesheetResource>
+                        <finalName>index.html</finalName>
+                     </format>
+                  </formats>
+                  <options>
+                     <xincludeSupported>true</xincludeSupported>
+                     <xmlTransformerType>saxon</xmlTransformerType>
+                     <docbookVersion>1.72.0</docbookVersion>
+                     <localeSeparator>-</localeSeparator>
+                  </options>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-antrun-plugin</artifactId>
+               <version>${antrun.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-release-plugin</artifactId>
+               <configuration>
+                  <arguments>-Drelease -Dscm.plugin.version=${scm.plugin.version} -Dmaven.scm.provider.gitexe=${maven.scm.provider.gitexe}</arguments>
+                  <autoVersionSubmodules>true</autoVersionSubmodules>
+               </configuration>
+               <version>${release.version}</version>
+               <dependencies>
+                  <dependency>
+                  <groupId>org.apache.maven.scm</groupId>
+                  <artifactId>maven-scm-provider-gitexe</artifactId>
+                  <version>${maven.scm.provider.gitexe}</version>
+               </dependency>
+       </dependencies>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-surefire-report-plugin</artifactId>
+               <version>${surefire.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-surefire-plugin</artifactId>
+               <version>${surefire.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-clean-plugin</artifactId>
+               <version>${clean.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-deploy-plugin</artifactId>
+               <version>${deploy.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-assembly-plugin</artifactId>
+               <version>${assembly.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <id>distribution</id>
+                     <phase>package</phase>
+                     <goals>
+                        <goal>single</goal>
+                     </goals>
+                     <configuration>
+                        <descriptors>
+                           <descriptor>src/main/assembly/assembly.xml</descriptor>
+                        </descriptors>
+                        <finalName>${project.build.finalName}-${project.version}</finalName>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-install-plugin</artifactId>
+               <version>${install.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-site-plugin</artifactId>
+               <version>${site.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-source-plugin</artifactId>
+               <version>${source.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-resources-plugin</artifactId>
+               <version>${resources.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-dependency-plugin</artifactId>
+               <version>${dependency.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-javadoc-plugin</artifactId>
+               <version>${javadoc.plugin.version}</version>
+               <configuration>
+                  <keywords>true</keywords>
+                  <additionalparam>${javadoc.doclint}</additionalparam>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-gpg-plugin</artifactId>
+               <version>${gpg.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.felix</groupId>
+               <artifactId>maven-bundle-plugin</artifactId>
+               <version>${bundle.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>exec-maven-plugin</artifactId>
+               <version>${exec.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-enforcer-plugin</artifactId>
+               <version>${enforcer.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <id>enforce</id>
+                     <goals>
+                        <goal>enforce</goal>
+                     </goals>
+                     <configuration>
+                        <rules>
+                           <requireMavenVersion>
+                              <version>[${minimum.maven.version},)</version>
+                           </requireMavenVersion>
+                           <requirePluginVersions>
+                              <unCheckedPlugins>
+                                 <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
+                                 <unCheckedPlugin>org.codehaus.mojo:versions-maven-plugin</unCheckedPlugin>
+                              </unCheckedPlugins>
+                           </requirePluginVersions>
+                        </rules>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-shade-plugin</artifactId>
+               <version>${shade.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-compiler-plugin</artifactId>
+               <version>${compiler.version}</version>
+               <configuration>
+                  <source>${maven.compiler.source}</source>
+                  <target>${maven.compiler.target}</target>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-jar-plugin</artifactId>
+               <version>${jar.plugin.version}</version>
+               <configuration>
+                  <archive>
+                     <manifestEntries>
+                        <Implementation-URL>${project.url}</Implementation-URL>
+                        <Implementation-Title>${project.name}</Implementation-Title>
+                        <Implementation-Version>${maven.build.timestamp}</Implementation-Version>
+                        <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                        <Specification-Title>${project.name}</Specification-Title>
+                        <Specification-Version>${parsedVersion.osgiVersion}</Specification-Version>
+                        <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                     </manifestEntries>
+                     <manifestSections>
+                        <manifestSection>
+                           <name>Build-Information</name>
+                           <manifestEntries>
+                              <Maven-Version>${maven.version}</Maven-Version>
+                              <Java-Version>${java.version}</Java-Version>
+                              <Java-Vendor>${java.vendor}</Java-Vendor>
+                              <Os-Name>${os.name}</Os-Name>
+                              <Os-Arch>${os.arch}</Os-Arch>
+                              <Os-Version>${os.version}</Os-Version>
+                              <SCM>${buildNumber}</SCM>
+                              <Build-Time>${maven.build.timestamp}</Build-Time>
+                           </manifestEntries>
+                        </manifestSection>
+                     </manifestSections>
+                  </archive>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>build-helper-maven-plugin</artifactId>
+               <version>${build.helper.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <phase>validate</phase>
+                     <goals>
+                        <goal>maven-version</goal>
+                        <goal>parse-version</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-eclipse-plugin</artifactId>
+               <configuration>
+                  <classpathContainers>
+                     <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+                  </classpathContainers>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>buildnumber-maven-plugin</artifactId>
+               <version>${buildnumber.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <id>set-build-properties</id>
+                     <goals>
+                        <goal>create</goal>
+                     </goals>
+                     <configuration>
+                        <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+                        <revisionOnScmFailure>unavailable</revisionOnScmFailure>
+                        <timestampFormat>{0, date, long} {0, time, long}</timestampFormat>
+                     </configuration>
+                  </execution>
+               </executions>
+               <inherited>true</inherited>
+            </plugin>
+            <plugin>
+               <groupId>org.twdata.maven</groupId>
+               <artifactId>maven-cli-plugin</artifactId>
+               <version>${cli.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.glassfish</groupId>
+               <artifactId>maven-embedded-glassfish-plugin</artifactId>
+               <version>${embedded.glassfish.plugin.version}</version>
+               <configuration>
+                  <goalPrefix>glassfish</goalPrefix>
+                  <app>${project.build.directory}/${project.build.finalName}.war</app>
+                  <port>7070</port>
+                  <contextRoot>${project.build.finalName}</contextRoot>
+               </configuration>
+               <executions>
+                  <execution>
+                     <phase>install</phase>
+                     <goals>
+                        <goal>run</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.mortbay.jetty</groupId>
+               <artifactId>maven-jetty-plugin</artifactId>
+               <version>${jetty.plugin.version}</version>
+               <configuration>
+                  <!-- Delete this block to have Jetty run default port (8080) -->
+                  <connectors>
+                     <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                        <port>9090</port>
+                     </connector>
+                  </connectors>
+                  <!-- force friendly name instead of artifact name + version -->
+                  <contextPath>${project.build.finalName}</contextPath>
+                  <!--
+                     Where the BeanManager is constructed. This is where
+                     you'll declare datasources.
+                  -->
+                  <jettyEnvXml>${basedir}/src/main/resources/jetty-env.xml</jettyEnvXml>
+                  <!-- This parameter will auto-deploy modified classes. -->
+                  <!--
+                     You can save changes in a file or class and refresh
+                     your browser to view the changes.
+                  -->
+                  <scanIntervalSeconds>3</scanIntervalSeconds>
+               </configuration>
+            </plugin>
+
+            <!-- Embedded Tomcat (package tomcat:run) -->
+            <!-- Standalone Tomcat (package tomcat:deploy) -->
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>tomcat-maven-plugin</artifactId>
+               <version>${tomcat.plugin.version}</version>
+               <inherited>true</inherited>
+               <configuration>
+                  <path>/${project.build.finalName}</path>
+                  <!-- Embedded port -->
+                  <port>6060</port>
+                  <!--
+                     The default authentication credentials for remote
+                     deployment are username "admin" with no password To
+                     override credentials, define a server in
+                     settings.xml and activate it using the <server>
+                     element
+                  -->
+                  <url>http://localhost:8080/manager</url>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-war-plugin</artifactId>
+               <version>${war.plugin.version}</version>
+               <inherited>true</inherited>
+               <configuration>
+                  <failOnMissingWebXml>false</failOnMissingWebXml>
+                  <warName>${project.build.finalName}</warName>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-ejb-plugin</artifactId>
+               <version>${ejb.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-ear-plugin</artifactId>
+               <version>${ear.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>com.pyx4j</groupId>
+               <artifactId>maven-junction-plugin</artifactId>
+               <version>${junction.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.sonatype.plugins</groupId>
+               <artifactId>nexus-maven-plugin</artifactId>
+               <version>${nexus.plugin.version}</version>
+               <configuration>
+                  <nexusUrl>https://repository.jboss.org/nexus</nexusUrl>
+                  <serverAuthId>jboss-releases-repository</serverAuthId>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-archetype-plugin</artifactId>
+               <version>${archetype.plugin.version}</version>
+               <extensions>true</extensions>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>jboss-maven-plugin</artifactId>
+               <version>${jboss.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>emma-maven-plugin</artifactId>
+               <version>${emma.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.sonatype.maven.plugin</groupId>
+               <artifactId>emma4it-maven-plugin</artifactId>
+               <version>${emma4it.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>findbugs-maven-plugin</artifactId>
+               <version>${findbugs.plugin.version}</version>
+               <configuration>
+                  <effort>Max</effort>
+                  <threshold>Low</threshold>
+                  <xmlOutput>true</xmlOutput>
+                  <failOnError>false</failOnError>
+               </configuration>
+               <executions>
+                  <execution>
+                     <goals>
+                        <goal>check</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.cargo</groupId>
+               <artifactId>cargo-maven2-plugin</artifactId>
+               <version>${cargo.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>selenium-maven-plugin</artifactId>
+               <version>${selenium.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>failsafe-maven-plugin</artifactId>
+               <version>${failsafe.plugin.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-scm-plugin</artifactId>
+               <version>${scm.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstyle.version}</version>
+                <configuration>
+                    <configLocation>weld-checkstyle/checkstyle.xml</configLocation>
+                    <suppressionsLocation>weld-checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+                    <consoleOutput>true</consoleOutput>
+                    <failsOnError>true</failsOnError>
+                    <useFile />
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jboss.weld</groupId>
+                        <artifactId>weld-common-build-config</artifactId>
+                        <version>${build.config.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>check-style</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>checkstyle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
+
+   <profiles>
+      <profile>
+         <id>release</id>
+         <activation>
+            <property>
+               <name>release</name>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-gpg-plugin</artifactId>
+                  <configuration>
+                     <passphrase>${gpg.passphrase}</passphrase>
+                     <useAgent>${gpg.useAgent}</useAgent>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                           <goal>sign</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.sonatype.plugins</groupId>
+                  <artifactId>nexus-maven-plugin</artifactId>
+                  <configuration>
+                     <auto>true</auto>
+                     <description>[nexus-maven-plugin] closing
+                        repository after release:perform</description>
+                  </configuration>
+               </plugin>
+               <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>buildnumber-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>validate-scm</id>
+                        <goals>
+                           <goal>create</goal>
+                        </goals>
+                        <!-- Disabled, doesn't support git -->
+                        <phase>none</phase>
+                        <configuration>
+                           <doUpdate>true</doUpdate>
+                           <doCheck>true</doCheck>
+                        </configuration>
+                     </execution>
+                  </executions>
+                  <inherited>true</inherited>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
+         <id>distribution</id>
+         <activation>
+            <property>
+               <name>dist</name>
+            </property>
+         </activation>
+         <properties>
+            <!-- Skip failing tests when building dist -->
+            <maven.test.failure.ignore>true</maven.test.failure.ignore>
+         </properties>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-javadoc-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                           <goal>jar</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-deploy-plugin</artifactId>
+                  <configuration>
+                     <skip>${maven.deploy.skip}</skip>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
+         <id>code-coverage</id>
+         <activation>
+            <property>
+               <name>code-coverage</name>
+            </property>
+         </activation>
+         <build>
+            <pluginManagement>
+               <plugins>
+                  <plugin>
+                     <groupId>org.codehaus.mojo</groupId>
+                     <artifactId>emma-maven-plugin</artifactId>
+                     <executions>
+                        <execution>
+                           <id>instrumentation</id>
+                           <phase>process-classes</phase>
+                           <goals>
+                              <goal>instrument</goal>
+                           </goals>
+                           <configuration>
+                              <verbose>true</verbose>
+                           </configuration>
+                        </execution>
+                        <execution>
+                           <id>instrumentation-clean</id>
+                           <phase>clean</phase>
+                           <goals>
+                              <goal>clean</goal>
+                           </goals>
+                        </execution>
+                     </executions>
+                  </plugin>
+
+                  <plugin>
+                     <groupId>org.apache.maven.plugins</groupId>
+                     <artifactId>maven-surefire-plugin</artifactId>
+                     <inherited>true</inherited>
+                     <configuration>
+                        <forkMode>once</forkMode>
+                        <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory>
+                     </configuration>
+                  </plugin>
+
+                  <plugin>
+                     <groupId>org.sonatype.maven.plugin</groupId>
+                     <artifactId>emma4it-maven-plugin</artifactId>
+                     <executions>
+                        <execution>
+                           <id>report</id>
+                           <phase>test</phase>
+                           <goals>
+                              <goal>report</goal>
+                           </goals>
+                           <configuration>
+                              <sourceSets>
+                                 <sourceSet>
+                                    <directory>${project.build.sourceDirectory}</directory>
+                                 </sourceSet>
+                              </sourceSets>
+                           </configuration>
+                        </execution>
+                     </executions>
+                  </plugin>
+               </plugins>
+            </pluginManagement>
+         </build>
+      </profile>
+   </profiles>
+
+   <!-- SCM and Distribution Management -->
+
+   <scm>
+      <connection>scm:git:git@github.com:weld/parent.git</connection>
+      <developerConnection>scm:git:git@github.com:weld/parent.git</developerConnection>
+      <url>scm:git:git@github.com:weld/parent.git</url>
+     <tag>31</tag>
+  </scm>
+
+   <distributionManagement>
+      <repository>
+         <id>jboss-releases-repository</id>
+         <name>JBoss Releases Repository</name>
+         <url>${jboss.releases.repo.url}</url>
+      </repository>
+      <snapshotRepository>
+         <id>jboss-snapshots-repository</id>
+         <name>JBoss Snapshots Repository</name>
+         <url>${jboss.snapshots.repo.url}</url>
+      </snapshotRepository>
+   </distributionManagement>
+
+
+</project>
diff --git a/weld-parent.spec b/weld-parent.spec
index 4a1526f..dba30b2 100644
--- a/weld-parent.spec
+++ b/weld-parent.spec
@@ -1,6 +1,6 @@
 Name:             weld-parent
-Version:          26
-Release:          3%{?dist}
+Version:          31
+Release:          1%{?dist}
 Summary:          Parent POM for Weld
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -25,6 +25,7 @@ cp %{SOURCE0} pom.xml
 cp %{SOURCE1} LICENSE
 
 %pom_remove_plugin ":maven-remote-resources-plugin"
+%pom_remove_plugin ":maven-eclipse-plugin"
 
 %build
 %mvn_build
@@ -36,6 +37,9 @@ cp %{SOURCE1} LICENSE
 %doc LICENSE
 
 %changelog
+* Mon Mar 23 2015 Marek Goldmann <mgoldman@redhat.com> - 31-1
+- Upstream release 31
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 26-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild