adapted code to use PlantUML 8000 library(https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11603)
diff --git a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml
index 60d8273..aa21ce6 100644
--- a/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/build/org.eclipse.app4mc.emfutils.extractor.build/pom.xml
@@ -58,7 +58,9 @@
     <module>../../plugins/org.eclipse.app4mc.emfutils.content.extractor</module>
    <module>../../plugins/org.eclipse.app4mc.emfutils.metamodelviewer</module>
    <module>../../plugins/org.eclipse.app4mc.emfutils.resourceset.mapper</module>
-      
+
+   <module>../../plugins/net.sourceforge.plantuml</module>
+   
     <!-- Tests -->
   
     <!-- Features -->
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
index 7a3ec50..3d5ff98 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.content.extractor.feature/feature.xml
@@ -1,42 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.app4mc.emfutils.content.extractor.feature"
-      label="APP4MC Graphical Tools"
-      version="0.8.0"
-      provider-name="Eclipse APP4MC">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.app4mc.emfutils.metamodelviewer.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.ui.browser"/>
-      <import plugin="org.eclipse.sphinx.emf"/>
-      <import plugin="org.eclipse.sphinx.emf.editors"/>
-      <import plugin="org.eclipse.sphinx.emf.editors.forms"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.app4mc.emfutils.content.extractor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+<feature id="org.eclipse.app4mc.emfutils.content.extractor.feature" label="AMALTHEA Graphical Tools" provider-name="Eclipse APP4MC" version="0.8.0">
+	<copyright url="http://www.example.com/copyright">
+		[Enter Copyright Description here.]
+	</copyright>
+	<description url="http://www.example.com/description">
+		[Enter Feature Description here.]
+	</description>
+	<includes id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" version="0.0.0"/>
+	<license url="http://www.example.com/license">
+		[Enter License Description here.]
+	</license>
+	<plugin download-size="0" id="net.sourceforge.plantuml" install-size="0" version="0.0.0"/>
+	<plugin download-size="0" id="org.eclipse.app4mc.emfutils.content.extractor" install-size="0" unpack="false" version="0.0.0"/>
+	<requires>
+		<import plugin="org.eclipse.core.runtime"/>
+		<import plugin="org.eclipse.emf.ecore"/>
+		<import plugin="org.eclipse.emf.ecore.xmi"/>
+		<import plugin="org.eclipse.sphinx.emf"/>
+		<import plugin="org.eclipse.sphinx.emf.editors"/>
+		<import plugin="org.eclipse.sphinx.emf.editors.forms"/>
+		<import plugin="org.eclipse.ui"/>
+		<import plugin="org.eclipse.ui.browser"/>
+	</requires>
 </feature>
diff --git a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
index 3114bcc..94d8bf4 100644
--- a/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
+++ b/eclipse-tools/emf-graphical-viewer/features/org.eclipse.app4mc.emfutils.metamodelviewer.feature/feature.xml
@@ -1,33 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.app4mc.emfutils.metamodelviewer.feature"
-      label="APP4MC MetaModel Viewer"
-      version="0.8.0"
-      provider-name="Eclipse APP4MC">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.sphinx.emf"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.app4mc.emfutils.metamodelviewer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+<feature id="org.eclipse.app4mc.emfutils.metamodelviewer.feature" label="AMALTHEA MetaModel Viewer" provider-name="Eclipse APP4MC" version="0.8.0">
+	<copyright url="http://www.example.com/copyright">
+		[Enter Copyright Description here.]
+	</copyright>
+	<description url="http://www.example.com/description">
+		[Enter Feature Description here.]
+	</description>
+	<license url="http://www.example.com/license">
+		[Enter License Description here.]
+	</license>
+	<plugin download-size="0" id="org.eclipse.app4mc.emfutils.metamodelviewer" install-size="0" unpack="false" version="0.0.0"/>
+	<requires>
+		<import plugin="org.eclipse.core.runtime"/>
+		<import plugin="org.eclipse.sphinx.emf"/>
+		<import plugin="org.eclipse.ui"/>
+	</requires>
 </feature>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.classpath b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.classpath
new file mode 100644
index 0000000..ab56ccc
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/plantuml-8000.jar" sourcepath="lib-src/plantuml-sources-epl-8000.zip"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.gitignore b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.gitignore
new file mode 100644
index 0000000..09e3bc9
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.project b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.project
new file mode 100644
index 0000000..7614bd0
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.sourceforge.plantuml</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..a698e59
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..385eef2
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/META-INF/MANIFEST.MF
@@ -0,0 +1,98 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Plantuml
+Bundle-SymbolicName: net.sourceforge.plantuml
+Bundle-Version: 8000.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: lib/plantuml-8000.jar
+Export-Package: net.sourceforge.plantuml,
+ net.sourceforge.plantuml.activitydiagram,
+ net.sourceforge.plantuml.activitydiagram.command,
+ net.sourceforge.plantuml.activitydiagram3,
+ net.sourceforge.plantuml.activitydiagram3.command,
+ net.sourceforge.plantuml.activitydiagram3.ftile,
+ net.sourceforge.plantuml.activitydiagram3.ftile.vcompact,
+ net.sourceforge.plantuml.activitydiagram3.ftile.vertical,
+ net.sourceforge.plantuml.ant,
+ net.sourceforge.plantuml.api,
+ net.sourceforge.plantuml.api.mda.option2,
+ net.sourceforge.plantuml.api.mda.option3,
+ net.sourceforge.plantuml.applet,
+ net.sourceforge.plantuml.asciiart,
+ net.sourceforge.plantuml.braille,
+ net.sourceforge.plantuml.classdiagram,
+ net.sourceforge.plantuml.classdiagram.command,
+ net.sourceforge.plantuml.code,
+ net.sourceforge.plantuml.command,
+ net.sourceforge.plantuml.command.note,
+ net.sourceforge.plantuml.command.note.sequence,
+ net.sourceforge.plantuml.command.regex,
+ net.sourceforge.plantuml.compositediagram,
+ net.sourceforge.plantuml.compositediagram.command,
+ net.sourceforge.plantuml.core,
+ net.sourceforge.plantuml.creole,
+ net.sourceforge.plantuml.cucadiagram,
+ net.sourceforge.plantuml.cucadiagram.dot,
+ net.sourceforge.plantuml.cucadiagram.entity,
+ net.sourceforge.plantuml.descdiagram,
+ net.sourceforge.plantuml.descdiagram.command,
+ net.sourceforge.plantuml.directdot,
+ net.sourceforge.plantuml.donors,
+ net.sourceforge.plantuml.eggs,
+ net.sourceforge.plantuml.eps,
+ net.sourceforge.plantuml.flashcode,
+ net.sourceforge.plantuml.flowdiagram,
+ net.sourceforge.plantuml.font,
+ net.sourceforge.plantuml.ftp,
+ net.sourceforge.plantuml.fun,
+ net.sourceforge.plantuml.geom,
+ net.sourceforge.plantuml.geom.kinetic,
+ net.sourceforge.plantuml.golem,
+ net.sourceforge.plantuml.graph,
+ net.sourceforge.plantuml.graph2,
+ net.sourceforge.plantuml.graphic,
+ net.sourceforge.plantuml.hector,
+ net.sourceforge.plantuml.hector2,
+ net.sourceforge.plantuml.hector2.continuity,
+ net.sourceforge.plantuml.hector2.graphic,
+ net.sourceforge.plantuml.hector2.layering,
+ net.sourceforge.plantuml.hector2.mpos,
+ net.sourceforge.plantuml.html,
+ net.sourceforge.plantuml.mda,
+ net.sourceforge.plantuml.mjpeg,
+ net.sourceforge.plantuml.objectdiagram,
+ net.sourceforge.plantuml.objectdiagram.command,
+ net.sourceforge.plantuml.openiconic,
+ net.sourceforge.plantuml.openiconic.data,
+ net.sourceforge.plantuml.oregon,
+ net.sourceforge.plantuml.pdf,
+ net.sourceforge.plantuml.png,
+ net.sourceforge.plantuml.posimo,
+ net.sourceforge.plantuml.postit,
+ net.sourceforge.plantuml.preproc,
+ net.sourceforge.plantuml.printskin,
+ net.sourceforge.plantuml.project,
+ net.sourceforge.plantuml.project.command,
+ net.sourceforge.plantuml.project.graphic,
+ net.sourceforge.plantuml.project2,
+ net.sourceforge.plantuml.project2.command,
+ net.sourceforge.plantuml.real,
+ net.sourceforge.plantuml.salt,
+ net.sourceforge.plantuml.salt.element,
+ net.sourceforge.plantuml.salt.factory,
+ net.sourceforge.plantuml.sequencediagram,
+ net.sourceforge.plantuml.sequencediagram.command,
+ net.sourceforge.plantuml.sequencediagram.graphic,
+ net.sourceforge.plantuml.sequencediagram.puma,
+ net.sourceforge.plantuml.sequencediagram.teoz,
+ net.sourceforge.plantuml.skin,
+ net.sourceforge.plantuml.skin.bluemodern,
+ net.sourceforge.plantuml.skin.rose,
+ net.sourceforge.plantuml.statediagram,
+ net.sourceforge.plantuml.statediagram.command,
+ net.sourceforge.plantuml.suggest,
+ net.sourceforge.plantuml.svek,
+ net.sourceforge.plantuml.svek.extremity,
+ net.sourceforge.plantuml.svek.image,
+ net.sourceforge.plantuml.svg
+Automatic-Module-Name: net.sourceforge.plantuml
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/build.properties b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/build.properties
new file mode 100644
index 0000000..b4b18d8
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/build.properties
@@ -0,0 +1,3 @@
+bin.includes = META-INF/,\
+               lib/plantuml-8000.jar,\
+               lib-src/
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib-src/README.txt b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib-src/README.txt
new file mode 100644
index 0000000..6416959
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib-src/README.txt
@@ -0,0 +1,7 @@
+Goto http://plantuml.sourceforge.net/ for product info
+
+CQ clearance as a part of eclipse IPZilla (CQ 8178): https://dev.eclipse.org/ipzilla/show_bug.cgi?id=8178 
+
+Downloaded jar from : http://sourceforge.net/projects/plantuml/files/plantuml-jar-epl-8000.zip/download
+
+Downloaded sources from :  https://dev.eclipse.org/ipzilla/attachment.cgi?id=11627
\ No newline at end of file
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib-src/plantuml-sources-epl-8000.zip b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib-src/plantuml-sources-epl-8000.zip
new file mode 100644
index 0000000..69db480
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib-src/plantuml-sources-epl-8000.zip
Binary files differ
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib/plantuml-8000.jar b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib/plantuml-8000.jar
new file mode 100644
index 0000000..b40297f
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/lib/plantuml-8000.jar
Binary files differ
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/license/license.txt b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/license/license.txt
new file mode 100644
index 0000000..47adaf9
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/license/license.txt
@@ -0,0 +1,42 @@
+========================================================================
+PlantUML : a free UML diagram generator
+========================================================================
+
+(C) Copyright 2009-2014, Arnaud Roques
+
+Project Info:  http://plantuml.sourceforge.net
+
+PlantUML is free software; you can redistribute it and/or modify it
+under the terms of the Eclipse Public License.
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+
+ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+You may obtain a copy of the License at
+
+http://www.eclipse.org/legal/epl-v10.html
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Note that images (whatever their format : PNG, SVG...) generated by running PlantUML
+are owned by the author of their corresponding sources code (that is, their
+textual description in PlantUML language). Those images are not covered by
+the Eclipse Public License.
+
+The generated images can then be used without any reference to the Eclipse Public License.
+It is not even necessary to stipulate that they have been generated with PlantUML,
+also this will be appreciate by PlantUML team.
+
+There is an exception : if the textual description in PlantUML language is also covered
+by a license (like the EPL), then the generated images are logically covered
+by the very same license.
+
+Icon provided by OpenIconic :  https://useiconic.com/open/
+
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml
new file mode 100644
index 0000000..afa7d28
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/plugins/net.sourceforge.plantuml/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+<parent>
+		<relativePath>../../build/org.eclipse.app4mc.emfutils.extractor.build</relativePath>
+		<groupId>org.eclipse.app4mc.emfutils.content.extractor</groupId>
+		<artifactId>org.eclipse.app4mc.emfutils.extractor.build</artifactId>
+		<version>0.8.0</version>
+	</parent>
+
+	<artifactId>net.sourceforge.plantuml</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>8000.0.0-SNAPSHOT</version>
+
+</project>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/.classpath b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/.classpath
index fcf8b26..325150d 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/.classpath
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry exported="true" kind="lib" path="lib/plantuml.8041.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF
index 5c117a4..ea59b66 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/META-INF/MANIFEST.MF
@@ -15,187 +15,10 @@
  com.google.guava,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro
+ org.eclipse.xtend.lib.macro,
+ net.sourceforge.plantuml;bundle-version="8000.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,lib/plantuml.8041.jar
-Export-Package: com.ctreber.acearth,
- com.ctreber.acearth.gui,
- com.ctreber.acearth.plugins,
- com.ctreber.acearth.plugins.markers,
- com.ctreber.acearth.projection,
- com.ctreber.acearth.renderer,
- com.ctreber.acearth.scanbit,
- com.ctreber.acearth.scandot,
- com.ctreber.acearth.shader,
- com.ctreber.acearth.util,
- com.ctreber.aclib.gui,
- com.ctreber.aclib.sort,
- com.google.zxing,
- com.google.zxing.client.j2se,
- com.google.zxing.common,
- com.google.zxing.common.reedsolomon,
- com.google.zxing.datamatrix.decoder,
- com.google.zxing.qrcode,
- com.google.zxing.qrcode.decoder,
- com.google.zxing.qrcode.encoder,
- gen.lib.cdt,
- gen.lib.cgraph,
- gen.lib.circogen,
- gen.lib.common,
- gen.lib.dotgen,
- gen.lib.fdpgen,
- gen.lib.gvc,
- gen.lib.label,
- gen.lib.ortho,
- gen.lib.pack,
- gen.lib.pathplan,
- gen.lib.xdot,
- gen.plugin.core,
- gen.plugin.dot_layout,
- h,
- jcckit,
- jcckit.data,
- jcckit.graphic,
- jcckit.plot,
- jcckit.renderer,
- jcckit.transformation,
- jcckit.util,
- net.sourceforge.plantuml,
- net.sourceforge.plantuml.acearth,
- net.sourceforge.plantuml.activitydiagram,
- net.sourceforge.plantuml.activitydiagram.command,
- net.sourceforge.plantuml.activitydiagram3,
- net.sourceforge.plantuml.activitydiagram3.command,
- net.sourceforge.plantuml.activitydiagram3.ftile,
- net.sourceforge.plantuml.activitydiagram3.ftile.vcompact,
- net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond,
- net.sourceforge.plantuml.activitydiagram3.ftile.vertical,
- net.sourceforge.plantuml.anim,
- net.sourceforge.plantuml.ant,
- net.sourceforge.plantuml.api,
- net.sourceforge.plantuml.api.mda.option2,
- net.sourceforge.plantuml.api.mda.option3,
- net.sourceforge.plantuml.applet,
- net.sourceforge.plantuml.asciiart,
- net.sourceforge.plantuml.braille,
- net.sourceforge.plantuml.classdiagram,
- net.sourceforge.plantuml.classdiagram.command,
- net.sourceforge.plantuml.code,
- net.sourceforge.plantuml.command,
- net.sourceforge.plantuml.command.note,
- net.sourceforge.plantuml.command.note.sequence,
- net.sourceforge.plantuml.command.regex,
- net.sourceforge.plantuml.compositediagram,
- net.sourceforge.plantuml.compositediagram.command,
- net.sourceforge.plantuml.core,
- net.sourceforge.plantuml.creole,
- net.sourceforge.plantuml.cucadiagram,
- net.sourceforge.plantuml.cucadiagram.dot,
- net.sourceforge.plantuml.cucadiagram.entity,
- net.sourceforge.plantuml.cute,
- net.sourceforge.plantuml.dedication,
- net.sourceforge.plantuml.descdiagram,
- net.sourceforge.plantuml.descdiagram.command,
- net.sourceforge.plantuml.directdot,
- net.sourceforge.plantuml.ditaa,
- net.sourceforge.plantuml.donors,
- net.sourceforge.plantuml.eggs,
- net.sourceforge.plantuml.eps,
- net.sourceforge.plantuml.flashcode,
- net.sourceforge.plantuml.flowdiagram,
- net.sourceforge.plantuml.font,
- net.sourceforge.plantuml.ftp,
- net.sourceforge.plantuml.fun,
- net.sourceforge.plantuml.geom,
- net.sourceforge.plantuml.geom.kinetic,
- net.sourceforge.plantuml.golem,
- net.sourceforge.plantuml.graph,
- net.sourceforge.plantuml.graph2,
- net.sourceforge.plantuml.graphic,
- net.sourceforge.plantuml.graphic.color,
- net.sourceforge.plantuml.hector,
- net.sourceforge.plantuml.hector2,
- net.sourceforge.plantuml.hector2.continuity,
- net.sourceforge.plantuml.hector2.graphic,
- net.sourceforge.plantuml.hector2.layering,
- net.sourceforge.plantuml.hector2.mpos,
- net.sourceforge.plantuml.html,
- net.sourceforge.plantuml.jasic,
- net.sourceforge.plantuml.jcckit,
- net.sourceforge.plantuml.jdot,
- net.sourceforge.plantuml.jungle,
- net.sourceforge.plantuml.logo,
- net.sourceforge.plantuml.mda,
- net.sourceforge.plantuml.mjpeg,
- net.sourceforge.plantuml.objectdiagram,
- net.sourceforge.plantuml.objectdiagram.command,
- net.sourceforge.plantuml.openiconic,
- net.sourceforge.plantuml.openiconic.data,
- net.sourceforge.plantuml.oregon,
- net.sourceforge.plantuml.pdf,
- net.sourceforge.plantuml.png,
- net.sourceforge.plantuml.posimo,
- net.sourceforge.plantuml.postit,
- net.sourceforge.plantuml.preproc,
- net.sourceforge.plantuml.printskin,
- net.sourceforge.plantuml.project,
- net.sourceforge.plantuml.project.command,
- net.sourceforge.plantuml.project.graphic,
- net.sourceforge.plantuml.project2,
- net.sourceforge.plantuml.project2.command,
- net.sourceforge.plantuml.real,
- net.sourceforge.plantuml.salt,
- net.sourceforge.plantuml.salt.element,
- net.sourceforge.plantuml.salt.factory,
- net.sourceforge.plantuml.sequencediagram,
- net.sourceforge.plantuml.sequencediagram.command,
- net.sourceforge.plantuml.sequencediagram.graphic,
- net.sourceforge.plantuml.sequencediagram.puma,
- net.sourceforge.plantuml.sequencediagram.teoz,
- net.sourceforge.plantuml.skin,
- net.sourceforge.plantuml.skin.bluemodern,
- net.sourceforge.plantuml.skin.rose,
- net.sourceforge.plantuml.statediagram,
- net.sourceforge.plantuml.statediagram.command,
- net.sourceforge.plantuml.sudoku,
- net.sourceforge.plantuml.suggest,
- net.sourceforge.plantuml.svek,
- net.sourceforge.plantuml.svek.extremity,
- net.sourceforge.plantuml.svek.image,
- net.sourceforge.plantuml.svg,
- net.sourceforge.plantuml.swing,
- net.sourceforge.plantuml.syntax,
- net.sourceforge.plantuml.telnet,
- net.sourceforge.plantuml.tikz,
- net.sourceforge.plantuml.turing,
- net.sourceforge.plantuml.ugraphic,
- net.sourceforge.plantuml.ugraphic.arc,
- net.sourceforge.plantuml.ugraphic.crossing,
- net.sourceforge.plantuml.ugraphic.eps,
- net.sourceforge.plantuml.ugraphic.g2d,
- net.sourceforge.plantuml.ugraphic.hand,
- net.sourceforge.plantuml.ugraphic.html5,
- net.sourceforge.plantuml.ugraphic.sprite,
- net.sourceforge.plantuml.ugraphic.svg,
- net.sourceforge.plantuml.ugraphic.tikz,
- net.sourceforge.plantuml.ugraphic.txt,
- net.sourceforge.plantuml.ugraphic.visio,
- net.sourceforge.plantuml.utils,
- net.sourceforge.plantuml.version,
- net.sourceforge.plantuml.webp,
- net.sourceforge.plantuml.xmi,
- net.sourceforge.plantuml.xmlsc,
- org.eclipse.app4mc.emfutils.content.extractor,
- org.eclipse.app4mc.emfutils.content.extractor.builders,
- org.eclipse.app4mc.emfutils.content.extractor.handlers,
- org.eclipse.app4mc.emfutils.content.extractor.preferences,
- org.eclipse.app4mc.emfutils.content.extractor.views,
- org.stathissideris.ascii2image.core,
- org.stathissideris.ascii2image.graphics,
- org.stathissideris.ascii2image.text,
- smetana.core,
- smetana.core.amiga,
- smetana.core.debug
-Bundle-Vendor: Eclipse APP4MC
+Bundle-ClassPath: .
+Bundle-Vendor: Eclipse.org
 
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/build.properties b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/build.properties
index ad1497a..6c480f3 100644
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/build.properties
+++ b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/build.properties
@@ -3,5 +3,4 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/,\
-               lib/
+               icons/
diff --git a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/lib/plantuml.8041.jar b/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/lib/plantuml.8041.jar
deleted file mode 100644
index 8350177..0000000
--- a/eclipse-tools/emf-graphical-viewer/plugins/org.eclipse.app4mc.emfutils.content.extractor/lib/plantuml.8041.jar
+++ /dev/null
Binary files differ