diff --git a/.gitignore b/.gitignore
index a6e1e08..8895a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.jar
 target/
 class/
+classes
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 695484e..61cac16 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -20,4 +20,5 @@
  org.osgi.service.jpa;version="1.0.0"
 Specification-Version: 2.0
 Bundle-SymbolicName: javax.persistence
+Extension-Name: javax.persistence
 
diff --git a/antbuild.xml b/antbuild.xml
deleted file mode 100644
index 9b731c5..0000000
--- a/antbuild.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0"?>
-<!--/*******************************************************************************
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
-* which accompanies this distribution.
-* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
-* and the Eclipse Distribution License is available at
-* http://www.eclipse.org/org/documents/edl-v10.php.
-*
-*   Ant naming conventions:
-*   - regardless of the actual OS platform,'/' is the directory separator
-*     (Ant will convert as appropriate).
-*   - multi-word properties use periods '.'
-*     - properties ending in .jar define jarfile names only (no path)
-*     - properties ending in .lib are fully qualified jars (path and filename)
-*     - properties ending in .dir are directory paths
-*     - properties ending in .path are path refid names (classpath fragments)
-*   - multi-word targets use hyphens '-'
-*     - targets beginning with test- are reserved for high level test targets,
-*       and are used in test results parsing
-*     - targets typically use the form <action>-<object>-<type> (ie. package-bundle-zip)
-*   - multi-word macros use underscores '_'
-*   - multi-word macro attributes are concatinated
-*     e.g. 'runpathref'
-*   - multi-word tasks (taskdef) names are concatinated
-*     e.g. 'validateconnection'
-*   - OS environment variables are in ALLCAPS and have 'env' as a prefix
-*     e.g. ${env.XXX}.
-*   - Ant properties are lower case.
-*
-* Contributors:
-*     egwin - initial API and implementation
-#******************************************************************************/-->
-<project name="javax.persistence" default="build" basedir=".">
-    <available file="../${ant.project.name}" type="dir" property="jpaproto.is.local"/>
-    <!-- Test to make sure that the calling script doesn't inherit the variable -->
-    <!-- (should be set locally, and be destroyed upon return) -->
-    <fail message="Not running from '${ant.project.name}' directory" unless="jpaproto.is.local"/>
-
-    <dirname  property="jpaproto.build.location_temp" file="${ant.file.javax.persistence}"/>
-    <pathconvert targetos="unix" property="jpaproto.build.location">
-        <path>
-            <pathelement location="${jpaproto.build.location_temp}"/>
-        </path>
-    </pathconvert>
-    <condition property="jpaproto.2.base.dir" value="../../.." else="..">
-        <contains string="${jpaproto.build.location}" substring="jpa"/>
-    </condition>
-    <property name="jpaproto.2.common.plugins.dir" value="${jpaproto.2.base.dir}/plugins"/>
-    <property name="jpaproto.2.buildsys.dir" value="${jpaproto.2.base.dir}/buildsystem"/>
-
-    <!-- Properties usually defined in build.properties, set here to avoid easy redefinition. -->
-    <!-- Persistence Version properties -->
-    <tstamp>
-       <format property="jpaproto.build.date" pattern="yyyyMMdd"/>
-       <format property="jpaproto.build.time" pattern="HHmm"/>
-    </tstamp>
-    <property name="jpaproto.qualifier"             value="v${jpaproto.build.date}${jpaproto.build.time}"/>
-    <property name="jpaproto.spec.vendor"           value="Sun Microsystems Inc."/>
-    <property name="implementation.vendor"          value="Eclipse.org - EclipseLink Project"/>
-    <property name="jpaproto.spec.version"          value="2.0"/>
-    <property name="jpaproto.version"               value="2.0.6"/>
-    <property name="jpaproto.osgi.service.version"  value="1.0.0"/>
-    <property name="jpaproto.bundle.name"           value="Java Persistence API 2.0"/>
-    <!-- Project infrastructure properties -->
-    <property name="src.dir"                        value="src"/>
-    <property name="package.dir"                    value=".."/>
-    <property name="classes.dir"                    value="classes"/>
-    <property name="jpaproto.resource.dir"          value="META-INF"/>
-    <property name="jpaproto.jar"                   value="${ant.project.name}_${jpaproto.version}.${jpaproto.qualifier}.jar"/>
-    <property name="jpaproto.src.jar"               value="${ant.project.name}.source_${jpaproto.version}.${jpaproto.qualifier}.jar"/>
-
-    <!-- local property overrides -->
-    <condition property="custom.properties.message" value="Loading ${user.home}/build.properties..."
-                                                     else="Custom properties file '${user.home}/build.properties' not found to load.">
-        <available file="${user.home}/build.properties"/>
-    </condition>
-    <echo message="${custom.properties.message}"/>
-    <property file="${user.home}/build.properties"/>
-
-    <!-- Defaults, set var in ${user.home}/build.properties if different version required -->
-    <property name="bndtool.jar" value="bnd-0.0.366.jar"/>
-
-    <!-- Primary Targets -->
-    <target name="build" depends="clean, compile, jar" description="build ${ant.project.name}_${jpaproto.version} component"/>
-    <target name="jar"   depends="bnd-package, package" description="package ${ant.project.name} component"/>
-
-    <!-- clean -->
-    <target name="clean" description="Clean all generated content">
-        <delete dir="${classes.dir}" includeEmptyDirs="true" failonerror="false" quiet="true"/>
-        <!-- Remove Build artifacts, and potential "confict" files  from check-out -->
-        <delete failonerror="false" quiet="true">
-            <fileset dir="${package.dir}" includes="${jpaproto.jar}*"/>
-        </delete>
-        <delete failonerror="false" quiet="true">
-            <fileset dir="${package.dir}" includes="${jpaproto.src.jar}*"/>
-        </delete>
-    </target>
-
-    <!-- initialize varables and paths needed for compile -->
-    <!-- the number of properties needed now is too great for lazy loading without a target -->
-    <target name="init">
-        <!-- This HAS to be defined after allowing user redefinitions (which will cause the condition not to set anything) -->
-        <!-- This tests to make sure the extensions dir exists, if not sets to a existant dummy location -->
-        <condition property="extensions.depend.dir" value="${jpaproto.2.base.dir}/../extension.lib.external"
-                                                    else="${jpaproto.build.location}">
-            <available file="${jpaproto.2.base.dir}/../extension.lib.external" type="dir"/>
-        </condition>
-        <echo message="extensions.depend.dir        = '${extensions.depend.dir}'"/>
-
-        <!-- Compiler flag properties -->
-        <property name="javac.debug"           value="true"/>
-        <property name="javac.optimize"        value="off"/>
-        <property name="javac.deprecation"     value="off"/>
-        <property name="javac.version"         value="1.5"/>
-
-        <!-- Set Compile Path-->
-        <path id="jpaproto.compile.path">
-            <pathelement path="${jpaproto.2.common.plugins.dir}/osgi.core.zip"/>
-            <pathelement path="${jpaproto.2.common.plugins.dir}/osgi.cmpn_4.1.0.jar"/>
-        </path>
-
-        <!-- Check for BND library -->
-        <property name="nobndtool.manifest.dir"      value="${jpaproto.build.location}/META-INF"/>
-        <condition property="bndtool.lib" value="${extensions.depend.dir}/${bndtool.jar}">
-            <available file="${extensions.depend.dir}/${bndtool.jar}"/>
-        </condition>
-        <condition property="bndtool.lib" value="${jpaproto.2.buildsys.dir}/${bndtool.jar}">
-            <available file="${jpaproto.2.buildsys.dir}/${bndtool.jar}"/>
-        </condition>
-        <echo message="bndtool.lib                     = '${bndtool.lib}'"/>
-        <condition property="bld">
-            <or>
-                <isset property="bndtool.lib"/>
-                <isset property="nobnd"/>
-            </or>
-        </condition>
-        <condition property="bnd.bld">
-            <and>
-                <isset property="bndtool.lib"/>
-                <not>  <isset property="nobnd"/> </not>
-            </and>
-        </condition>
-    </target>
-
-    <target name="fail-on-no-bnd" unless="bld">
-        <echo message="BND tool (${bndtool.jar}) not found in either:"/>
-        <echo message="    the extensions.depend.dir: '${extensions.depend.dir}'"/>
-        <echo message="    or the buildsystem dir:    '${jpaproto.2.buildsys.dir}'"/>
-        <echo message=""/>
-        <echo message="if you have a different version, you can define a different"/>
-        <echo message="jarname by adding 'bndtool.jar=bnd-{version}.jar to your'"/>
-        <echo message="${user.home}/build.properties file."/>
-        <echo message=""/>
-        <echo message="You can download BND from http://www.aqute.biz/Code/Download"/>
-        <echo message=""/>
-        <echo message="or if you really need to build NOW, you can use '-Dnobnd=true'"/>
-        <echo message="on the ant command-line. However, the manifests used will be those"/>
-        <echo message="checked-in for development, and will likely have errors."/>
-        <fail message="Missing BND library!"/>
-    </target>
-
-    <!-- compile -->
-    <target name="compile" depends="init, fail-on-no-bnd" description="Compile bundle code">
-        <mkdir dir="${classes.dir}"/>
-        <javac srcdir="${src.dir}"
-               destdir="${classes.dir}"
-               includes="**"
-               debug="${javac.debug}"
-               debuglevel="${javac.debuglevel}"
-               encoding="UTF-8"
-               optimize="${javac.optimize}"
-               source="${javac.version}"
-               target="${javac.version}"
-               deprecation="${javac.deprecation}"
-               failonerror="true"
-               memoryMaximumSize="512m"
-               fork="true"
-               classpathref="jpaproto.compile.path"
-        />
-    </target>
-
-    <!-- package -->
-    <target name="package-src" depends="init" description="jar OSGI bundle">
-        <jar jarfile="${package.dir}/${jpaproto.src.jar}" duplicate="preserve">
-            <manifest>
-                <attribute name="Specification-Vendor"   value="${jpaproto.spec.vendor}"/>
-                <attribute name="Specification-Version"  value="${jpaproto.spec.version}"/>
-                <attribute name="Implementation-Vendor"  value="${implementation.vendor}"/>
-                <attribute name="Implementation-Version" value="${jpaproto.version}"/>
-                <attribute name="Bundle-ManifestVersion" value="2"/>
-                <attribute name="Bundle-Name"            value="${jpaproto.bundle.name} Source"/>
-                <attribute name="Bundle-SymbolicName"    value="javax.persistence.source"/>
-                <attribute name="Bundle-Vendor"          value="${implementation.vendor}"/>
-                <attribute name="Bundle-Version"         value="${jpaproto.version}.${jpaproto.qualifier}"/>
-                <attribute name="Eclipse-SourceBundle"   value="javax.persistence;version=&quot;${jpaproto.version}.${jpaproto.qualifier}&quot;"/>
-            </manifest>
-            <fileset dir="${jpaproto.2.base.dir}">
-                <include name="about.html"/>
-                <include name="readme.html"/>
-                <include name="license.*"/>
-            </fileset>
-            <fileset dir="."
-                includes="readme.txt"
-            />
-            <fileset dir="${src.dir}"
-                includes="**"
-            />
-        </jar>
-    </target>
-
-    <target name="package" if="nobnd" depends="init, package-src" description="jar OSGI bundle">
-        <jar jarfile="${package.dir}/${jpaproto.jar}" duplicate="preserve" manifest="${nobndtool.manifest.dir}/MANIFEST.MF">
-            <fileset dir="${jpaproto.2.base.dir}">
-                <include name="about.html"/>
-                <include name="readme.html"/>
-                <include name="license.*"/>
-            </fileset>
-            <fileset dir="."
-                includes="readme.txt"
-            />
-            <fileset dir="${src.dir}"
-                includes="**/*.xsd"
-            />
-            <fileset dir="${classes.dir}"
-                includes="**/*.class"
-            />
-        </jar>
-    </target>
-
-    <target name="bnd-package" if="bnd.bld" depends="init, package-src">
-        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bndtool.lib}"/>
-        <bnd
-            classpath="${classes.dir}"
-            eclipse="false"
-            sourcepath="${src.dir}"
-            failok="false"
-            exceptions="true"
-            files="./javax.persistence.bnd"
-            output="${package.dir}/${jpaproto.jar}"/>
-    </target>
-</project>
diff --git a/javax.persistence.bnd b/javax.persistence.bnd
deleted file mode 100644
index 2fd03e7..0000000
--- a/javax.persistence.bnd
+++ /dev/null
@@ -1,23 +0,0 @@
-Export-Package: javax.persistence*;version="${jpaproto.version}";jpa=2.0;-noimport:=true,org.osgi.service.jpa;version="${jpaproto.osgi.service.version}"
-Private-Package: org.eclipse.persistence.javax.persistence.osgi*;-noimport:=true,
-Implementation-Version: ${jpaproto.version}
-Specification-Vendor: ${jpaproto.spec.vendor}
-Bundle-Name: ${jpaproto.bundle.name}
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Implementation-Vendor: ${implementation.vendor}
-Bundle-Vendor: ${implementation.vendor}
-Bundle-Version: ${jpaproto.version}.${jpaproto.qualifier}
-Bundle-Activator: org.eclipse.persistence.javax.persistence.osgi.Activator
-Include-Resource:\
- ${jpaproto.2.base.dir}/about.html,\
- ${jpaproto.2.base.dir}/readme.html,\
- ${jpaproto.2.base.dir}/license.html,\
- ./readme.txt,\
- javax/persistence/orm_1_0.xsd=./${src.dir}/javax/persistence/orm_1_0.xsd,\
- javax/persistence/orm_2_0.xsd=./${src.dir}/javax/persistence/orm_2_0.xsd,\
- javax/persistence/persistence_1_0.xsd=./${src.dir}/javax/persistence/persistence_1_0.xsd,\
- javax/persistence/persistence_2_0.xsd=./${src.dir}/javax/persistence/persistence_2_0.xsd,\
- META-INF/eclipse.inf=./META-INF/eclipse.inf
-Import-Package: *;resolution:=optional,org.osgi.service.jpa;version="1.0.0"
-Specification-Version: ${jpaproto.spec.version}
-Bundle-ClassPath: .
diff --git a/pom.xml b/pom.xml
index 57b1d02..56a3e82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,11 @@
     <properties>
         <!-- TOOL Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho.version>0.16.0</tycho.version>
+        <tycho.version>0.18.0</tycho.version>
         <release.version>2.0.6</release.version>
         <build.qualifier>v${maven.build.timestamp}</build.qualifier>
         <forceContextQualifier>${build.qualifier}</forceContextQualifier>
         <!-- BUILD Properties -->
-        <orbit.drop>R20120526062928</orbit.drop>
         <eclipse.drop>juno</eclipse.drop>
     </properties>
 
@@ -43,23 +42,35 @@
                     <layout>p2</layout>
                     <url>http://download.eclipse.org/releases/${eclipse.drop}</url>
                 </repository>
-                <repository>
-                    <id>Orbit</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit.drop}/repository</url>
-                </repository>
              </repositories>
         </profile>
     </profiles>
 
     <build>
         <defaultGoal>verify</defaultGoal>
+        <!-- section added so tycho won't add the maven poms to the artifacts it builds -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-packaging-plugin</artifactId>
+                    <version>${tycho.version}</version>
+                    <configuration>
+                        <archive>
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-compiler-plugin</artifactId>
                 <version>${tycho.version}</version>
                 <configuration>
+                    <!-- Set to force OSGi Compatability settings (defaults to "false") (Only available as of Tycho 0.16.0) -->
+                    <!-- requireJREPackageImports>true</requireJREPackageImports -->
                     <!-- Not needed. Compiler compatibility setting gotten from "Bundle-RequiredExecutionEnvironment" in manifest -->
                     <!-- source>1.6</source -->
                     <!-- target>1.6</target -->
@@ -122,14 +133,6 @@
                             <arch>x86_64</arch>
                         </environment>
                     </environments>
-                    <!-- target>
-                        <artifact>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <classifier>${project.artifactId}_${release.version}.!!! issue here -> ${build.qualifier}!!! </classifier>
-                        </artifact>
-                    </target -->
                 </configuration>
             </plugin>
             <!-- Mostly working source bundle   generation -->
@@ -189,17 +192,9 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>tycho-0.15.0-staged</id>
-            <url>https://oss.sonatype.org/content/repositories/orgeclipsetycho-255/</url>
-        </pluginRepository>
-        <pluginRepository>
             <id>tycho-public</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </pluginRepository>
-        <pluginRepository>
-            <id>maven-eclipse</id>
-            <url>http://repo1.maven.org</url>
-        </pluginRepository>
     </pluginRepositories>
 
 </project>
diff --git a/readme.txt b/readme.txt
index e323694..5d5d536 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2012 Sun Microsystems, Oracle Corporation. All rights reserved.
+Copyright (c) 2008, 2013 Sun Microsystems, Oracle Corporation. All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -12,4 +12,5 @@
       Specification available from http://jcp.org/en/jsr/detail?id=317
       Oracle Committers - EclipseLink specific implementations and OSGi support
       Oracle Committers - Misc Bugfixes
- 
+
+Java(TM) Persistence API, Version 2.0
diff --git a/resource/readme.html b/resource/readme.html
index 5aebe1b..d551ee3 100644
--- a/resource/readme.html
+++ b/resource/readme.html
@@ -18,7 +18,7 @@
     The binaries are distributed in OSGi enabled javax.persistence_2.0.*.jar series bundles. </p>
 <p>
     JSR Readme.txt follows:</p><pre>
-Copyright (c) 2008, 2012 Sun Microsystems, Oracle Corporation. All rights reserved.
+Copyright (c) 2008, 2013 Sun Microsystems, Oracle Corporation. All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -33,6 +33,7 @@
       Oracle Committers - EclipseLink specific implementations and OSGi support
       Oracle Committers - Misc Bugfixes
 
+Java(TM) Persistence API, Version 2.0
 </pre>
 </body>
 </html>