diff --git a/eclipse-candidate/artifacts.xml b/eclipse-candidate/artifacts.xml
index 1ed1ac7..d8c9f29 100644
--- a/eclipse-candidate/artifacts.xml
+++ b/eclipse-candidate/artifacts.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?artifactRepository version='1.1.0'?>
-<repository name='file:/Users/kengo/Documents/github/spotbugs/eclipsePlugin/build/site/eclipse-candidate/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
+<repository name='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse-candidate/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1486302096884'/>
+    <property name='p2.timestamp' value='1494947401129'/>
     <property name='p2.compressed' value='false'/>
   </properties>
   <mappings size='3'>
@@ -11,19 +11,19 @@
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
   <artifacts size='2'>
-    <artifact classifier='org.eclipse.update.feature' id='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'>
-      <properties size='4'>
-        <property name='artifact.size' value='1876'/>
-        <property name='download.size' value='1876'/>
-        <property name='download.md5' value='4f83fd7fcabf35afe0d26c99cc2ada4b'/>
-        <property name='download.contentType' value='application/zip'/>
+    <artifact classifier='osgi.bundle' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'>
+      <properties size='3'>
+        <property name='artifact.size' value='5644655'/>
+        <property name='download.size' value='5644655'/>
+        <property name='download.md5' value='56cf2fd68e8a77d0c0980324cddb63c6'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'>
-      <properties size='3'>
-        <property name='artifact.size' value='6254204'/>
-        <property name='download.size' value='6254204'/>
-        <property name='download.md5' value='2b023b8eee2b291d5546549377e6223f'/>
+    <artifact classifier='org.eclipse.update.feature' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'>
+      <properties size='4'>
+        <property name='artifact.size' value='1863'/>
+        <property name='download.size' value='1863'/>
+        <property name='download.md5' value='1ff0649c41c419d46752f03ee0cde5af'/>
+        <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
   </artifacts>
diff --git a/eclipse-candidate/content.xml b/eclipse-candidate/content.xml
index 826d03b..bb2ba0a 100644
--- a/eclipse-candidate/content.xml
+++ b/eclipse-candidate/content.xml
@@ -1,116 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?metadataRepository version='1.1.0'?>
-<repository name='file:/Users/kengo/Documents/github/spotbugs/eclipsePlugin/build/site/eclipse-candidate/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
+<repository name='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse-candidate/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1486302096885'/>
+    <property name='p2.timestamp' value='1494947401132'/>
     <property name='p2.compressed' value='false'/>
   </properties>
   <references size='2'>
-    <repository uri='http://findbugs.cs.umd.edu/eclipse-candidate/' url='http://findbugs.cs.umd.edu/eclipse-candidate/' type='1' options='0'/>
-    <repository uri='http://findbugs.cs.umd.edu/eclipse-candidate/' url='http://findbugs.cs.umd.edu/eclipse-candidate/' type='0' options='0'/>
+    <repository uri='https://spotbugs.github.io/eclipse-candidate/' url='https://spotbugs.github.io/eclipse-candidate/' type='0' options='0'/>
+    <repository uri='https://spotbugs.github.io/eclipse-candidate/' url='https://spotbugs.github.io/eclipse-candidate/' type='1' options='0'/>
   </references>
   <units size='4'>
-    <unit id='edu.umd.cs.findbugs.plugin.eclipse.feature.jar' version='3.1.0.20170205-1486302082588'>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='FindBugs Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature is a wrapper for the FindBugs plugin for installation via the Eclipse Update Manager.'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://findbugs.sourceforge.net'/>
-        <property name='org.eclipse.equinox.p2.provider' value='FindBugs Project'/>
-        <property name='org.eclipse.update.feature.plugin' value='edu.umd.cs.findbugs.plugin.eclipse'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='edu.umd.cs.findbugs.plugin.eclipse.feature.jar' version='3.1.0.20170205-1486302082588'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'/>
-      </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license uri='http://findbugs.sourceforge.net/manual/license.html' url='http://findbugs.sourceforge.net/manual/license.html'>
-          FindBugs is free software distributed under the terms of the Lesser GNU Public License.&#xA;http://www.gnu.org/licenses/lgpl.html
-        </license>
-      </licenses>
-      <copyright>
-        (c) 2006-2011, University of Maryland
-      </copyright>
-    </unit>
-    <unit id='file:/Users/kengo/Documents/github/spotbugs/eclipsePlugin/build/site/eclipse-candidate/site.xml.FindBugs' version='1.0.0.61-cJBiB97735G373C15AIE9373I7CII'>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='FindBugs'/>
-        <property name='org.eclipse.equinox.p2.description' value='This is the Eclipse category for FindBugs features.'/>
-        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/Users/kengo/Documents/github/spotbugs/eclipsePlugin/build/site/eclipse-candidate/site.xml.FindBugs' version='1.0.0.61-cJBiB97735G373C15AIE9373I7CII'/>
-      </provides>
-      <requires size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='edu.umd.cs.findbugs.plugin.eclipse.feature.group' range='[3.1.0.20170205-1486302082588,3.1.0.20170205-1486302082588]'/>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-    </unit>
-    <unit id='edu.umd.cs.findbugs.plugin.eclipse.feature.group' version='3.1.0.20170205-1486302082588' singleton='false'>
-      <update id='edu.umd.cs.findbugs.plugin.eclipse.feature.group' range='[0.0.0,3.1.0.20170205-1486302082588)' severity='0'/>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='FindBugs Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature is a wrapper for the FindBugs plugin for installation via the Eclipse Update Manager.'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://findbugs.sourceforge.net'/>
-        <property name='org.eclipse.equinox.p2.provider' value='FindBugs Project'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='edu.umd.cs.findbugs.plugin.eclipse.feature.group' version='3.1.0.20170205-1486302082588'/>
-      </provides>
-      <requires size='13'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='3.6.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.core' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.launching' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.ui' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='edu.umd.cs.findbugs.plugin.eclipse' range='[3.1.0.20170205-1486302082588,3.1.0.20170205-1486302082588]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='edu.umd.cs.findbugs.plugin.eclipse.feature.jar' range='[3.1.0.20170205-1486302082588,3.1.0.20170205-1486302082588]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license uri='http://findbugs.sourceforge.net/manual/license.html' url='http://findbugs.sourceforge.net/manual/license.html'>
-          FindBugs is free software distributed under the terms of the Lesser GNU Public License.&#xA;http://www.gnu.org/licenses/lgpl.html
-        </license>
-      </licenses>
-      <copyright>
-        (c) 2006-2011, University of Maryland
-      </copyright>
-    </unit>
-    <unit id='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'>
-      <update id='edu.umd.cs.findbugs.plugin.eclipse' range='[0.0.0,3.1.0.20170205-1486302082588)' severity='0'/>
+    <unit id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'>
+      <update id='com.github.spotbugs.plugin.eclipse' range='[0.0.0,3.1.2.20170516-1494947383501)' severity='0'/>
       <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='FindBugs Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='FindBugs Project'/>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='SpotBugs Project'/>
         <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
       </properties>
       <provides size='94'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'/>
-        <provided namespace='osgi.bundle' name='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+        <provided namespace='osgi.bundle' name='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
         <provided namespace='java.package' name='de.tobject.findbugs' version='0.0.0'/>
         <provided namespace='java.package' name='de.tobject.findbugs.actions' version='0.0.0'/>
         <provided namespace='java.package' name='de.tobject.findbugs.adapters' version='0.0.0'/>
@@ -222,16 +131,16 @@
         <required namespace='osgi.bundle' name='org.eclipse.team.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.pde.core' range='0.0.0' optional='true' greedy='false'/>
-        <required namespace='osgi.bundle' name='org.eclipse.pde.build' range='0.0.0' optional='true' greedy='false'/>
+        <required namespace='osgi.bundle' name='org.eclipse.pde.core' range='0.0.0' optional='true'/>
+        <required namespace='osgi.bundle' name='org.eclipse.pde.build' range='0.0.0' optional='true'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.views.properties.tabbed' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.console' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='findbugs' range='0.0.0' optional='true' greedy='false'/>
+        <required namespace='osgi.bundle' name='spotbugs' range='0.0.0' optional='true'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='edu.umd.cs.findbugs.plugin.eclipse' version='3.1.0.20170205-1486302082588'/>
+        <artifact classifier='osgi.bundle' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -240,10 +149,101 @@
             true
           </instruction>
           <instruction key='manifest'>
-            Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true&#xA;Bundle-Version: 3.1.0.20170205-1486302082588&#xA;
+            Bundle-ClassPath: findbugs-plugin.jar,lib/jsr305.jar,lib/annotations.jar,lib/bcel-6.1-20161207.023659-9.jar,lib/dom4j-1.6.1.jar,lib/jaxen-1.1.6.jar,lib/jFormatString.jar,lib/commons-lang-2.6.jar,lib/spotbugs-annotations.jar,lib/asm-debug-all-6.0_ALPHA.jar&#xA;Bundle-Name: SpotBugs Plug-in&#xA;Bundle-Version: 3.1.02.20170516-1494947383501&#xA;Bundle-Activator: de.tobject.findbugs.FindbugsPlugin&#xA;Bundle-Vendor: SpotBugs Project&#xA;Require-Bundle: org.eclipse.ui.workbench.texteditor,org.eclipse.ui;bundle-version=&quot;3.6.0&quot;,org.eclipse.ant.core,org.eclipse.core.runtime,org.eclipse.core.resources,org.eclipse.ui.ide,org.eclipse.ui.editors,org.eclipse.jdt.core,org.eclipse.jdt.ui,org.eclipse.jface.text,org.eclipse.jdt.launching,org.eclipse.jdt,org.eclipse.team.core,org.eclipse.compare,org.eclipse.team.ui,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.pde.core;resolution:=optional,org.eclipse.pde.build;resolution:=optional,org.eclipse.core.expressions,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.console,org.eclipse.core.filesystem,spotbugs;resolution:=optional;visibility:=reexport&#xA;Export-Package: de.tobject.findbugs,de.tobject.findbugs.actions,de.tobject.findbugs.adapters,de.tobject.findbugs.builder,de.tobject.findbugs.decorators,de.tobject.findbugs.io,de.tobject.findbugs.marker,de.tobject.findbugs.nature,de.tobject.findbugs.preferences,de.tobject.findbugs.properties,de.tobject.findbugs.reporter,de.tobject.findbugs.util,de.tobject.findbugs.view,de.tobject.findbugs.view.explorer,edu.umd.cs.findbugs,edu.umd.cs.findbugs.annotations,edu.umd.cs.findbugs.anttask,edu.umd.cs.findbugs.architecture,edu.umd.cs.findbugs.asm,edu.umd.cs.findbugs.ba,edu.umd.cs.findbugs.ba.bcp,edu.umd.cs.findbugs.ba.ca,edu.umd.cs.findbugs.ba.ch,edu.umd.cs.findbugs.ba.constant,edu.umd.cs.findbugs.ba.deref,edu.umd.cs.findbugs.ba.generic,edu.umd.cs.findbugs.ba.heap,edu.umd.cs.findbugs.ba.interproc,edu.umd.cs.findbugs.ba.jsr305,edu.umd.cs.findbugs.ba.npe,edu.umd.cs.findbugs.ba.obl,edu.umd.cs.findbugs.ba.type,edu.umd.cs.findbugs.ba.vna,edu.umd.cs.findbugs.bcel,edu.umd.cs.findbugs.bcel.generic,edu.umd.cs.findbugs.bugReporter,edu.umd.cs.findbugs.charsets,edu.umd.cs.findbugs.classfile,edu.umd.cs.findbugs.classfile.analysis,edu.umd.cs.findbugs.classfile.engine,edu.umd.cs.findbugs.classfile.engine.asm,edu.umd.cs.findbugs.classfile.engine.bcel,edu.umd.cs.findbugs.classfile.impl,edu.umd.cs.findbugs.cloud,edu.umd.cs.findbugs.cloud.username,edu.umd.cs.findbugs.config,edu.umd.cs.findbugs.detect,edu.umd.cs.findbugs.filter,edu.umd.cs.findbugs.formatStringChecker,edu.umd.cs.findbugs.graph,edu.umd.cs.findbugs.internalAnnotations,edu.umd.cs.findbugs.io,edu.umd.cs.findbugs.jaif,edu.umd.cs.findbugs.launchGUI,edu.umd.cs.findbugs.log,edu.umd.cs.findbugs.ml,edu.umd.cs.findbugs.model,edu.umd.cs.findbugs.plan,edu.umd.cs.findbugs.plugin.eclipse.quickfix,edu.umd.cs.findbugs.plugin.eclipse.quickfix.exception,edu.umd.cs.findbugs.plugin.eclipse.quickfix.util,edu.umd.cs.findbugs.plugin.eclipse.util,edu.umd.cs.findbugs.plugins,edu.umd.cs.findbugs.props,edu.umd.cs.findbugs.sourceViewer,edu.umd.cs.findbugs.tools,edu.umd.cs.findbugs.tools.html,edu.umd.cs.findbugs.tools.junit,edu.umd.cs.findbugs.tools.xml,edu.umd.cs.findbugs.util,edu.umd.cs.findbugs.visitclass,edu.umd.cs.findbugs.workflow,edu.umd.cs.findbugs.xml,javax.annotation,javax.annotation.concurrent,javax.annotation.meta,org.apache.bcel,org.apache.bcel.classfile,org.apache.bcel.generic,org.apache.bcel.util,org.apache.bcel.verifier,org.apache.bcel.verifier.exc,org.apache.bcel.verifier.statics,org.apache.bcel.verifier.structurals,org.dom4j,org.objectweb.asm,org.objectweb.asm.commons,org.objectweb.asm.signature,org.objectweb.asm.tree,org.objectweb.asm.tree.analysis,org.objectweb.asm.util&#xA;Bundle-SymbolicName: com.github.spotbugs.plugin.eclipse; singleton:=true&#xA;Eclipse-BuddyPolicy: registered&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: JavaSE-1.8&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
+    <unit id='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse-candidate/site.xml.SpotBugs' version='1.0.0.613cKfH9L7735G3C5E15AKAKAG9I9C35'>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs'/>
+        <property name='org.eclipse.equinox.p2.description' value='This is the Eclipse category for SpotBugs features.'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse-candidate/site.xml.SpotBugs' version='1.0.0.613cKfH9L7735G3C5E15AKAKAG9I9C35'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.group' range='[3.1.2.20170516-1494947383501,3.1.2.20170516-1494947383501]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
+    <unit id='com.github.spotbugs.plugin.eclipse.feature.jar' version='3.1.2.20170516-1494947383501'>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature is a wrapper for the FindBugs plugin for installation via the Eclipse Update Manager.'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='https://spotbugs.github.io/'/>
+        <property name='org.eclipse.equinox.p2.provider' value='SpotBugs Project'/>
+        <property name='org.eclipse.update.feature.plugin' value='com.github.spotbugs.plugin.eclipse'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.jar' version='3.1.2.20170516-1494947383501'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license uri='https://opensource.org/licenses/LGPL-2.1' url='https://opensource.org/licenses/LGPL-2.1'>
+          SpotBugs is free software distributed under the terms of the Lesser GNU Public License.&#xA;http://www.gnu.org/licenses/lgpl.html
+        </license>
+      </licenses>
+      <copyright>
+        (c) 2006-2011, University of Maryland
+      </copyright>
+    </unit>
+    <unit id='com.github.spotbugs.plugin.eclipse.feature.group' version='3.1.2.20170516-1494947383501' singleton='false'>
+      <update id='com.github.spotbugs.plugin.eclipse.feature.group' range='[0.0.0,3.1.2.20170516-1494947383501)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature is a wrapper for the FindBugs plugin for installation via the Eclipse Update Manager.'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='https://spotbugs.github.io/'/>
+        <property name='org.eclipse.equinox.p2.provider' value='SpotBugs Project'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.group' version='3.1.2.20170516-1494947383501'/>
+      </provides>
+      <requires size='13'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='3.6.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.core' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.launching' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.ui' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse' range='[3.1.2.20170516-1494947383501,3.1.2.20170516-1494947383501]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.jar' range='[3.1.2.20170516-1494947383501,3.1.2.20170516-1494947383501]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license uri='https://opensource.org/licenses/LGPL-2.1' url='https://opensource.org/licenses/LGPL-2.1'>
+          SpotBugs is free software distributed under the terms of the Lesser GNU Public License.&#xA;http://www.gnu.org/licenses/lgpl.html
+        </license>
+      </licenses>
+      <copyright>
+        (c) 2006-2011, University of Maryland
+      </copyright>
+    </unit>
   </units>
 </repository>
diff --git a/eclipse-candidate/features/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar b/eclipse-candidate/features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar
similarity index 59%
rename from eclipse-candidate/features/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar
rename to eclipse-candidate/features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar
index 24720e1..af9f9fd 100644
Binary files a/eclipse-candidate/features/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar and b/eclipse-candidate/features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar differ
diff --git a/eclipse-candidate/plugins/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar b/eclipse-candidate/plugins/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar
similarity index 53%
rename from eclipse-candidate/plugins/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar
rename to eclipse-candidate/plugins/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar
index e4f595e..3e76a54 100644
Binary files a/eclipse-candidate/plugins/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar and b/eclipse-candidate/plugins/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar differ
diff --git a/eclipse-candidate/site.xml b/eclipse-candidate/site.xml
index a3cf603..d234377 100644
--- a/eclipse-candidate/site.xml
+++ b/eclipse-candidate/site.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
 
-   <description url="http://findbugs.cs.umd.edu/eclipse">
-      This is the Eclipse update site for FindBugs features.
+   <description url="https://spotbugs.github.io/eclipse-candidate">
+      This is the Eclipse update site for SpotBugs features.
    </description>
 
-   <feature url="features/edu.umd.cs.findbugs.plugin.eclipse_3.1.0.20170205-1486302082588.jar"
-            id="edu.umd.cs.findbugs.plugin.eclipse"
-            version="3.1.0.20170205-1486302082588">
-      <category name="FindBugs"/>
+   <feature url="features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar"
+            id="com.github.spotbugs.plugin.eclipse"
+            version="3.1.02.20170516-1494947383501">
+      <category name="SpotBugs"/>
    </feature>
 
-   <category-def name="FindBugs" label="FindBugs">
+   <category-def name="SpotBugs" label="SpotBugs">
       <description>
-         This is the Eclipse category for FindBugs features.
+         This is the Eclipse category for SpotBugs features.
       </description>
    </category-def>
 
diff --git a/eclipse/artifacts.xml b/eclipse/artifacts.xml
new file mode 100644
index 0000000..06b8a18
--- /dev/null
+++ b/eclipse/artifacts.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?artifactRepository version='1.1.0'?>
+<repository name='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
+  <properties size='2'>
+    <property name='p2.timestamp' value='1494947404769'/>
+    <property name='p2.compressed' value='false'/>
+  </properties>
+  <mappings size='3'>
+    <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
+    <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
+    <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
+  </mappings>
+  <artifacts size='2'>
+    <artifact classifier='osgi.bundle' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'>
+      <properties size='3'>
+        <property name='artifact.size' value='5644655'/>
+        <property name='download.size' value='5644655'/>
+        <property name='download.md5' value='56cf2fd68e8a77d0c0980324cddb63c6'/>
+      </properties>
+    </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'>
+      <properties size='4'>
+        <property name='artifact.size' value='1817'/>
+        <property name='download.size' value='1817'/>
+        <property name='download.md5' value='cbf7cb637f6dc8c9a27e0c54994689ca'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
+  </artifacts>
+</repository>
diff --git a/eclipse/content.xml b/eclipse/content.xml
new file mode 100644
index 0000000..677536f
--- /dev/null
+++ b/eclipse/content.xml
@@ -0,0 +1,249 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?metadataRepository version='1.1.0'?>
+<repository name='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
+  <properties size='2'>
+    <property name='p2.timestamp' value='1494947404771'/>
+    <property name='p2.compressed' value='false'/>
+  </properties>
+  <references size='2'>
+    <repository uri='https://spotbugs.github.io/eclipse/' url='https://spotbugs.github.io/eclipse/' type='1' options='0'/>
+    <repository uri='https://spotbugs.github.io/eclipse/' url='https://spotbugs.github.io/eclipse/' type='0' options='0'/>
+  </references>
+  <units size='4'>
+    <unit id='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse/site.xml.SpotBugs' version='1.0.0.613cKfH9L7735G3C5E15AKAKAG9I9C35'>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs'/>
+        <property name='org.eclipse.equinox.p2.description' value='This is the Eclipse category for SpotBugs features.'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/home/ubuntu/spotbugs/eclipsePlugin/build/site/eclipse/site.xml.SpotBugs' version='1.0.0.613cKfH9L7735G3C5E15AKAKAG9I9C35'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.group' range='[3.1.2.20170516-1494947383501,3.1.2.20170516-1494947383501]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
+    <unit id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'>
+      <update id='com.github.spotbugs.plugin.eclipse' range='[0.0.0,3.1.2.20170516-1494947383501)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='SpotBugs Project'/>
+        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
+      </properties>
+      <provides size='94'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+        <provided namespace='osgi.bundle' name='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+        <provided namespace='java.package' name='de.tobject.findbugs' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.actions' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.adapters' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.builder' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.decorators' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.io' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.marker' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.nature' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.preferences' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.properties' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.reporter' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.util' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.view' version='0.0.0'/>
+        <provided namespace='java.package' name='de.tobject.findbugs.view.explorer' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.annotations' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.anttask' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.architecture' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.asm' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.bcp' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.ca' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.ch' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.constant' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.deref' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.generic' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.heap' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.interproc' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.jsr305' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.npe' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.obl' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.type' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ba.vna' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.bcel' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.bcel.generic' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.bugReporter' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.charsets' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.classfile' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.classfile.analysis' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.classfile.engine' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.classfile.engine.asm' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.classfile.engine.bcel' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.classfile.impl' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.cloud' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.cloud.username' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.config' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.detect' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.filter' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.formatStringChecker' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.graph' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.internalAnnotations' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.io' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.jaif' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.launchGUI' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.log' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.ml' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.model' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.plan' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.plugin.eclipse.quickfix' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.plugin.eclipse.quickfix.exception' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.plugin.eclipse.quickfix.util' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.plugin.eclipse.util' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.plugins' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.props' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.sourceViewer' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.tools' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.tools.html' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.tools.junit' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.tools.xml' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.util' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.visitclass' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.workflow' version='0.0.0'/>
+        <provided namespace='java.package' name='edu.umd.cs.findbugs.xml' version='0.0.0'/>
+        <provided namespace='java.package' name='javax.annotation' version='0.0.0'/>
+        <provided namespace='java.package' name='javax.annotation.concurrent' version='0.0.0'/>
+        <provided namespace='java.package' name='javax.annotation.meta' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.classfile' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.generic' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.util' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.verifier' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.verifier.exc' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.verifier.statics' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.bcel.verifier.structurals' version='0.0.0'/>
+        <provided namespace='java.package' name='org.dom4j' version='0.0.0'/>
+        <provided namespace='java.package' name='org.objectweb.asm' version='0.0.0'/>
+        <provided namespace='java.package' name='org.objectweb.asm.commons' version='0.0.0'/>
+        <provided namespace='java.package' name='org.objectweb.asm.signature' version='0.0.0'/>
+        <provided namespace='java.package' name='org.objectweb.asm.tree' version='0.0.0'/>
+        <provided namespace='java.package' name='org.objectweb.asm.tree.analysis' version='0.0.0'/>
+        <provided namespace='java.package' name='org.objectweb.asm.util' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='24'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.6.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ant.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jdt.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jdt.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jdt.launching' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jdt' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.team.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.compare' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.team.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.pde.core' range='0.0.0' optional='true'/>
+        <required namespace='osgi.bundle' name='org.eclipse.pde.build' range='0.0.0' optional='true'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views.properties.tabbed' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.console' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='spotbugs' range='0.0.0' optional='true'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='2'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+          <instruction key='manifest'>
+            Bundle-ClassPath: findbugs-plugin.jar,lib/jsr305.jar,lib/annotations.jar,lib/bcel-6.1-20161207.023659-9.jar,lib/dom4j-1.6.1.jar,lib/jaxen-1.1.6.jar,lib/jFormatString.jar,lib/commons-lang-2.6.jar,lib/spotbugs-annotations.jar,lib/asm-debug-all-6.0_ALPHA.jar&#xA;Bundle-Name: SpotBugs Plug-in&#xA;Bundle-Version: 3.1.02.20170516-1494947383501&#xA;Bundle-Activator: de.tobject.findbugs.FindbugsPlugin&#xA;Bundle-Vendor: SpotBugs Project&#xA;Require-Bundle: org.eclipse.ui.workbench.texteditor,org.eclipse.ui;bundle-version=&quot;3.6.0&quot;,org.eclipse.ant.core,org.eclipse.core.runtime,org.eclipse.core.resources,org.eclipse.ui.ide,org.eclipse.ui.editors,org.eclipse.jdt.core,org.eclipse.jdt.ui,org.eclipse.jface.text,org.eclipse.jdt.launching,org.eclipse.jdt,org.eclipse.team.core,org.eclipse.compare,org.eclipse.team.ui,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.pde.core;resolution:=optional,org.eclipse.pde.build;resolution:=optional,org.eclipse.core.expressions,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.console,org.eclipse.core.filesystem,spotbugs;resolution:=optional;visibility:=reexport&#xA;Export-Package: de.tobject.findbugs,de.tobject.findbugs.actions,de.tobject.findbugs.adapters,de.tobject.findbugs.builder,de.tobject.findbugs.decorators,de.tobject.findbugs.io,de.tobject.findbugs.marker,de.tobject.findbugs.nature,de.tobject.findbugs.preferences,de.tobject.findbugs.properties,de.tobject.findbugs.reporter,de.tobject.findbugs.util,de.tobject.findbugs.view,de.tobject.findbugs.view.explorer,edu.umd.cs.findbugs,edu.umd.cs.findbugs.annotations,edu.umd.cs.findbugs.anttask,edu.umd.cs.findbugs.architecture,edu.umd.cs.findbugs.asm,edu.umd.cs.findbugs.ba,edu.umd.cs.findbugs.ba.bcp,edu.umd.cs.findbugs.ba.ca,edu.umd.cs.findbugs.ba.ch,edu.umd.cs.findbugs.ba.constant,edu.umd.cs.findbugs.ba.deref,edu.umd.cs.findbugs.ba.generic,edu.umd.cs.findbugs.ba.heap,edu.umd.cs.findbugs.ba.interproc,edu.umd.cs.findbugs.ba.jsr305,edu.umd.cs.findbugs.ba.npe,edu.umd.cs.findbugs.ba.obl,edu.umd.cs.findbugs.ba.type,edu.umd.cs.findbugs.ba.vna,edu.umd.cs.findbugs.bcel,edu.umd.cs.findbugs.bcel.generic,edu.umd.cs.findbugs.bugReporter,edu.umd.cs.findbugs.charsets,edu.umd.cs.findbugs.classfile,edu.umd.cs.findbugs.classfile.analysis,edu.umd.cs.findbugs.classfile.engine,edu.umd.cs.findbugs.classfile.engine.asm,edu.umd.cs.findbugs.classfile.engine.bcel,edu.umd.cs.findbugs.classfile.impl,edu.umd.cs.findbugs.cloud,edu.umd.cs.findbugs.cloud.username,edu.umd.cs.findbugs.config,edu.umd.cs.findbugs.detect,edu.umd.cs.findbugs.filter,edu.umd.cs.findbugs.formatStringChecker,edu.umd.cs.findbugs.graph,edu.umd.cs.findbugs.internalAnnotations,edu.umd.cs.findbugs.io,edu.umd.cs.findbugs.jaif,edu.umd.cs.findbugs.launchGUI,edu.umd.cs.findbugs.log,edu.umd.cs.findbugs.ml,edu.umd.cs.findbugs.model,edu.umd.cs.findbugs.plan,edu.umd.cs.findbugs.plugin.eclipse.quickfix,edu.umd.cs.findbugs.plugin.eclipse.quickfix.exception,edu.umd.cs.findbugs.plugin.eclipse.quickfix.util,edu.umd.cs.findbugs.plugin.eclipse.util,edu.umd.cs.findbugs.plugins,edu.umd.cs.findbugs.props,edu.umd.cs.findbugs.sourceViewer,edu.umd.cs.findbugs.tools,edu.umd.cs.findbugs.tools.html,edu.umd.cs.findbugs.tools.junit,edu.umd.cs.findbugs.tools.xml,edu.umd.cs.findbugs.util,edu.umd.cs.findbugs.visitclass,edu.umd.cs.findbugs.workflow,edu.umd.cs.findbugs.xml,javax.annotation,javax.annotation.concurrent,javax.annotation.meta,org.apache.bcel,org.apache.bcel.classfile,org.apache.bcel.generic,org.apache.bcel.util,org.apache.bcel.verifier,org.apache.bcel.verifier.exc,org.apache.bcel.verifier.statics,org.apache.bcel.verifier.structurals,org.dom4j,org.objectweb.asm,org.objectweb.asm.commons,org.objectweb.asm.signature,org.objectweb.asm.tree,org.objectweb.asm.tree.analysis,org.objectweb.asm.util&#xA;Bundle-SymbolicName: com.github.spotbugs.plugin.eclipse; singleton:=true&#xA;Eclipse-BuddyPolicy: registered&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: JavaSE-1.8&#xA;Bundle-Localization: plugin&#xA;
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='com.github.spotbugs.plugin.eclipse.feature.jar' version='3.1.2.20170516-1494947383501'>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature is a wrapper for the SpotBugs plugin for installation via the Eclipse Update Manager.'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='https://spotbugs.github.io/'/>
+        <property name='org.eclipse.equinox.p2.provider' value='SpotBugs Project'/>
+        <property name='org.eclipse.update.feature.plugin' value='com.github.spotbugs.plugin.eclipse'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.jar' version='3.1.2.20170516-1494947383501'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='com.github.spotbugs.plugin.eclipse' version='3.1.2.20170516-1494947383501'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license uri='https://opensource.org/licenses/LGPL-2.1' url='https://opensource.org/licenses/LGPL-2.1'>
+          SpotBugs is free software distributed under the terms of the Lesser GNU Public License.&#xA;http://www.gnu.org/licenses/lgpl.html
+        </license>
+      </licenses>
+      <copyright>
+        (c) 2006-2011, University of Maryland
+      </copyright>
+    </unit>
+    <unit id='com.github.spotbugs.plugin.eclipse.feature.group' version='3.1.2.20170516-1494947383501' singleton='false'>
+      <update id='com.github.spotbugs.plugin.eclipse.feature.group' range='[0.0.0,3.1.2.20170516-1494947383501)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='SpotBugs Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature is a wrapper for the SpotBugs plugin for installation via the Eclipse Update Manager.'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='https://spotbugs.github.io/'/>
+        <property name='org.eclipse.equinox.p2.provider' value='SpotBugs Project'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.group' version='3.1.2.20170516-1494947383501'/>
+      </provides>
+      <requires size='13'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='3.6.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.core' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.launching' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jdt.ui' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse' range='[3.1.2.20170516-1494947383501,3.1.2.20170516-1494947383501]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.github.spotbugs.plugin.eclipse.feature.jar' range='[3.1.2.20170516-1494947383501,3.1.2.20170516-1494947383501]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license uri='https://opensource.org/licenses/LGPL-2.1' url='https://opensource.org/licenses/LGPL-2.1'>
+          SpotBugs is free software distributed under the terms of the Lesser GNU Public License.&#xA;http://www.gnu.org/licenses/lgpl.html
+        </license>
+      </licenses>
+      <copyright>
+        (c) 2006-2011, University of Maryland
+      </copyright>
+    </unit>
+  </units>
+</repository>
diff --git a/eclipse/features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar b/eclipse/features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar
new file mode 100644
index 0000000..5e034d2
Binary files /dev/null and b/eclipse/features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar differ
diff --git a/eclipse/plugins/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar b/eclipse/plugins/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar
new file mode 100644
index 0000000..3e76a54
Binary files /dev/null and b/eclipse/plugins/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar differ
diff --git a/eclipse/site.xml b/eclipse/site.xml
new file mode 100644
index 0000000..1a4cce0
--- /dev/null
+++ b/eclipse/site.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+   <description url="https://spotbugs.github.io/eclipse">
+      This is the Eclipse update site for SpotBugs features.
+   </description>
+
+   <feature url="features/com.github.spotbugs.plugin.eclipse_3.1.02.20170516-1494947383501.jar"
+            id="com.github.spotbugs.plugin.eclipse"
+            version="3.1.02.20170516-1494947383501">
+      <category name="SpotBugs"/>
+   </feature>
+
+   <category-def name="SpotBugs" label="SpotBugs">
+      <description>
+         This is the Eclipse category for SpotBugs features.
+      </description>
+   </category-def>
+
+</site>