From 3c297bbfefbed9a6853983f13f93bf2244c1484c Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Wed, 30 May 2018 08:11:44 +0200
Subject: [PATCH] vendor update

---
 .../META-INF/MANIFEST.MF                            |  9 +++++----
 .../zclassic/view/additions/ExternalView.xtend      |  2 +-
 .../modulestudio/generator/extensions/Utils.xtend   |  6 +++---
 .../generator/workflow/components/Validator.xtend   |  2 +-
 .../feature.xml                                     |  6 +++---
 .../META-INF/MANIFEST.MF                            | 13 +++++++------
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF b/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF
index ef7d48737..592052fa1 100644
--- a/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF
+++ b/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Require-Bundle: de.guite.modulestudio.mostdsl;bundle-version="1.3.1",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.9.1",
- org.eclipse.xtend.core;bundle-version="2.13.0",
- org.eclipse.xtend.standalone;bundle-version="2.13.0";resolution:=optional,
- org.eclipse.xtext;bundle-version="2.13.0",
- org.objectweb.asm;bundle-version="5.0.1"
+ org.eclipse.xtend.core;bundle-version="2.14.0",
+ org.eclipse.xtend.standalone;bundle-version="2.14.0";resolution:=optional,
+ org.eclipse.xtext;bundle-version="2.14.0",
+ org.objectweb.asm;bundle-version="6.1.1"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Export-Package: org.zikula.modulestudio.generator.application,
@@ -19,3 +19,4 @@ Export-Package: org.zikula.modulestudio.generator.application,
  org.zikula.modulestudio.generator.exceptions
 Eclipse-BuddyPolicy: dependent
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.zikula.modulestudio.generator
diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/additions/ExternalView.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/additions/ExternalView.xtend
index d907cda62..27a9424ef 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/additions/ExternalView.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/additions/ExternalView.xtend
@@ -24,7 +24,7 @@ class ExternalView {
     extension UrlExtensions = new UrlExtensions
     extension Utils = new Utils
 
-    private SimpleFields fieldHelper = new SimpleFields
+    SimpleFields fieldHelper = new SimpleFields
 
     def generate(Application it, IMostFileSystemAccess fsa) {
         var fileName = ''
diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/Utils.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/Utils.xtend
index 79a906b78..e214500e7 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/Utils.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/Utils.xtend
@@ -18,7 +18,7 @@ class Utils {
     /**
      * Returns a "generated by" message.
      */
-    def public generatedBy(Application it, Boolean includeTimestamp, Boolean includeVersion)
+    def generatedBy(Application it, Boolean includeTimestamp, Boolean includeVersion)
         '''Generated by ModuleStudio «IF includeVersion»«msVersion» «ENDIF»(«msUrl»)«IF includeTimestamp» at «timestamp»«ENDIF».'''
 
     /**
@@ -31,9 +31,9 @@ class Utils {
     }
 
     /**
-     * Returns the website url of ModuleStudio.
+     * Returns the website URL of ModuleStudio.
      *
-     * @return String The website url
+     * @return String The website URL
      */
     def msUrl() {
         'https://modulestudio.de'
diff --git a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/workflow/components/Validator.xtend b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/workflow/components/Validator.xtend
index 0ebb66234..cc64294d8 100644
--- a/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/workflow/components/Validator.xtend
+++ b/bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/workflow/components/Validator.xtend
@@ -13,7 +13,7 @@ class Validator extends WorkflowComponentWithSlot {
     /**
      * Whether validation should be executed or not.
      */
-    private Boolean enabled = true
+    Boolean enabled = true
 
     /**
      * Invokes the workflow component.
diff --git a/features/org.zikula.modulestudio.generator.feature/feature.xml b/features/org.zikula.modulestudio.generator.feature/feature.xml
index 97db32040..8c8358940 100644
--- a/features/org.zikula.modulestudio.generator.feature/feature.xml
+++ b/features/org.zikula.modulestudio.generator.feature/feature.xml
@@ -32,9 +32,9 @@
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.mwe2.launch" version="2.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.core" version="2.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.13.0" match="greaterOrEqual"/>
-      <import plugin="org.objectweb.asm" version="5.0.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtend.core" version="2.14.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" version="2.14.0" match="greaterOrEqual"/>
+      <import plugin="org.objectweb.asm" version="6.1.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF b/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF
index 617772c13..a3f439b62 100644
--- a/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF
@@ -11,14 +11,15 @@ Require-Bundle: com.google.guava;bundle-version="21.0.0",
  com.google.inject;bundle-version="3.0.0",
  de.guite.modulestudio.mostdsl;bundle-version="1.3.1",
  de.guite.modulestudio.mostdsl.ui;bundle-version="1.3.1",
- org.eclipse.xtend.lib;bundle-version="2.13.0",
- org.eclipse.xtext.generator;bundle-version="2.13.0",
- org.eclipse.xtext.testing;bundle-version="2.13.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.13.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
+ org.eclipse.xtend.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.generator;bundle-version="2.14.0",
+ org.eclipse.xtext.testing;bundle-version="2.14.0",
+ org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.hamcrest.core;bundle-version="1.3.0",
  org.junit;bundle-version="4.12.0",
- org.objectweb.asm;bundle-version="5.0.1",
+ org.objectweb.asm;bundle-version="6.1.1",
  org.xpect.xtext.lib;bundle-version="0.2.0",
  org.zikula.modulestudio.generator;bundle-version="1.3.1"
 Export-Package: org.zikula.modulestudio.generator.tests;x-internal=true
+Automatic-Module-Name: org.zikula.modulestudio.generator.tests