diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
deleted file mode 100644
index 78c6009..0000000
--- a/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.2
-Created-By: 1.6.0_26-b03-384-10M3425 (Apple Inc.)
-Bundle-ManifestVersion: 2
-Bundle-Name: Protege OBO plugin
-Bundle-SymbolicName: org.protege.oboeditor;singleton:=true
-Bundle-Category: protege
-Bundle-Description: Plugin for viewing OBO ontologies in Protege
-Bundle-DocURL: http://github.com/hdietze/protege-obo-plugins
-Bundle-ClassPath: ., resources/
-Update-Url: https://raw.githubusercontent.com/hdietze/protege-obo-plugins/master/org.protege.oboeditor.properties
-Import-Package: org.osgi.framework,org.apache.log4j,javax.swing,javax.
- swing.event,javax.swing.tree,javax.swing.border,javax.swing.table,javax.swing.plaf,javax.swing.plaf.basic
-Bundle-Version: 0.1
-Bundle-Activator: org.protege.editor.core.plugin.DefaultPluginActivator
-Require-Bundle: org.eclipse.equinox.registry,org.eclipse.equinox.common,org.protege.editor.core.application;bundle-version="4.1",org.protege.editor.owl;bundle-version="4.1",org.semanticweb.owl.owlapi;bundle-version="3.1"
diff --git a/build.xml b/build.xml
deleted file mode 100644
index c77bf28..0000000
--- a/build.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.protege.oboeditor.iml b/org.protege.oboeditor.iml
deleted file mode 100644
index 028b74f..0000000
--- a/org.protege.oboeditor.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index cb1d61b..ff22aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,39 +1,146 @@
- 4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
- org.protege.plugins
- obo-plugin
- 0.0.1-SNAPSHOT
- jar
+ org.geneontology
+ obo-plugin
+ 0.1-SNAPSHOT
+ bundle
- Protege OBO plugins
+ Protege OBO plugin
+ A plug-in for Protege that provides entry fields for standard OBO annotation properties.
+
+ Gene Ontology Consortium
+ http://geneontology.org
+
+
+
+ BSD-3-Clause
+ https://opensource.org/licenses/BSD-3-Clause
+ repo
+
+
+
+
+
+ simonjupp
+ Simon Jupp
+
+
+ hdietze
+ Heiko Dietze
+
+
+ balhoff
+ Jim Balhoff
+ jim@balhoff.org
+
+
-
- UTF-8
-
+
+ UTF-8
+ 5.1.0
+ 4.2.6
+
+
+
+
+ net.sourceforge.owlapi
+ owlapi-osgidistribution
+ ${owlapi.version}
+
+
+ edu.stanford.protege
+ protege-common
+ ${protege.version}
+
+
+ edu.stanford.protege
+ protege-editor-core
+ ${protege.version}
+
+
+ edu.stanford.protege
+ protege-editor-owl
+ ${protege.version}
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.12
+
+
-
- ${project.basedir}/src
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.0
-
-
- 1.6
-
-
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.0
+
+
+ 1.8
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 2.2.1
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.9.1
+
+ -Xdoclint:none
+
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ 3.0.0
+ true
+
+
+ org.protege.editor.owl.ProtegeOWL
+ .
+ ${project.artifactId};singleton:=true
+ The Protege Development Team
+
+ org.protege.editor.core.*;version="5.1.0",
+ org.protege.editor.owl.*;version="5.1.0",
+ org.semanticweb.owlapi.*;version="[4.2.6,5.0.0)",
+ *
+
+ {maven-resources}
+ ${project.artifactId}
+
+
+
+
+ maven-eclipse-plugin
+ 2.9
+
+ true
+
+
+
+
-
-
- edu.stanford.protege
- org.protege.editor.owl
- 4.3.0
- provided
-
-
diff --git a/src/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java b/src/main/java/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java
rename to src/main/java/org/protege/oboeditor/frames/AbstractDatabaseCrossReferenceList.java
diff --git a/src/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java b/src/main/java/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java
rename to src/main/java/org/protege/oboeditor/frames/DatabaseCrossReferenceList.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationEditor.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationEditor.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationEditor.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationEditor.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationFrame.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrame.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationFrame.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrame.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationFrameList.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameList.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationFrameList.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameList.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationFrameSection.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionRow.java
diff --git a/src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java b/src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java
rename to src/main/java/org/protege/oboeditor/frames/OBOAnnotationsFrameSectionSummaryRow.java
diff --git a/src/org/protege/oboeditor/frames/OBOXrefButton.java b/src/main/java/org/protege/oboeditor/frames/OBOXrefButton.java
similarity index 100%
rename from src/org/protege/oboeditor/frames/OBOXrefButton.java
rename to src/main/java/org/protege/oboeditor/frames/OBOXrefButton.java
diff --git a/src/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java b/src/main/java/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java
similarity index 100%
rename from src/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java
rename to src/main/java/org/protege/oboeditor/panel/DatabaseCrossReferencePanel.java
diff --git a/src/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java b/src/main/java/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
similarity index 99%
rename from src/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
rename to src/main/java/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
index d58a7ac..0d79c21 100644
--- a/src/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
+++ b/src/main/java/org/protege/oboeditor/renderer/OBOAnnotationCellRenderer.java
@@ -1,6 +1,6 @@
package org.protege.oboeditor.renderer;
-import org.coode.string.EscapeUtils;
+import org.semanticweb.owlapi.util.EscapeUtils;
import org.protege.editor.owl.OWLEditorKit;
import org.protege.editor.owl.model.OWLModelManager;
import org.protege.editor.owl.ui.renderer.layout.*;
diff --git a/src/org/protege/oboeditor/renderer/OBOFrameListRenderer.java b/src/main/java/org/protege/oboeditor/renderer/OBOFrameListRenderer.java
similarity index 100%
rename from src/org/protege/oboeditor/renderer/OBOFrameListRenderer.java
rename to src/main/java/org/protege/oboeditor/renderer/OBOFrameListRenderer.java
diff --git a/src/org/protege/oboeditor/util/OBOVocabulary.java b/src/main/java/org/protege/oboeditor/util/OBOVocabulary.java
similarity index 100%
rename from src/org/protege/oboeditor/util/OBOVocabulary.java
rename to src/main/java/org/protege/oboeditor/util/OBOVocabulary.java
diff --git a/src/org/protege/oboeditor/views/OBOAnnotationViewComponent.java b/src/main/java/org/protege/oboeditor/views/OBOAnnotationViewComponent.java
similarity index 100%
rename from src/org/protege/oboeditor/views/OBOAnnotationViewComponent.java
rename to src/main/java/org/protege/oboeditor/views/OBOAnnotationViewComponent.java
diff --git a/plugin.xml b/src/main/resources/plugin.xml
similarity index 100%
rename from plugin.xml
rename to src/main/resources/plugin.xml
diff --git a/org.protege.oboeditor.properties b/src/main/resources/update.properties
similarity index 77%
rename from org.protege.oboeditor.properties
rename to src/main/resources/update.properties
index 2b32eea..55e7b42 100644
--- a/org.protege.oboeditor.properties
+++ b/src/main/resources/update.properties
@@ -1,6 +1,7 @@
id=org.protege.oboeditor
-version=0.1
+version=${project.version}
download=https://github.com/hdietze/protege-obo-plugins/blob/master/org.protege.oboeditor.jar?raw=true
name=Protege OBO plugin
readme=https://raw.githubusercontent.com/hdietze/protege-obo-plugins/master/README.txt
+license=https://opensource.org/licenses/BSD-3-Clause
author=GeneOntology Consortium