diff --git a/base/org.codehaus.groovy30/plugin_dsld_support/dsld/script_config.dsld b/base/org.codehaus.groovy30/plugin_dsld_support/dsld/script_config.dsld
index 83286b996d..d9084047d0 100644
--- a/base/org.codehaus.groovy30/plugin_dsld_support/dsld/script_config.dsld
+++ b/base/org.codehaus.groovy30/plugin_dsld_support/dsld/script_config.dsld
@@ -15,8 +15,6 @@
  */
 package dsld
 
-assertVersion(groovyEclipse: '3.2.0')
-
 contribute(enclosingScript(isConfigScript()) & isThisType()) {
     property name: 'configuration', type: org.codehaus.groovy.control.CompilerConfiguration
     delegatesTo type: org.codehaus.groovy.control.customizers.builder.CompilerCustomizationBuilder
diff --git a/base/org.codehaus.groovy30/plugin_dsld_support/dsld/type_checking.dsld b/base/org.codehaus.groovy30/plugin_dsld_support/dsld/type_checking.dsld
index 67ee80c403..1bb155edee 100644
--- a/base/org.codehaus.groovy30/plugin_dsld_support/dsld/type_checking.dsld
+++ b/base/org.codehaus.groovy30/plugin_dsld_support/dsld/type_checking.dsld
@@ -22,8 +22,6 @@ import org.codehaus.groovy.transform.stc.AbstractTypeCheckingExtension
 import org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport
 import org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport.TypeCheckingDSL
 
-assertVersion(groovyEclipse: '4.8.0')
-
 contribute(isScript() & currentType(subType(TypeCheckingDSL))) {
     provider = "{@link ${GroovyTypeCheckingExtensionSupport.name}.TypeCheckingDSL TypeCheckingDSL}"
 
diff --git a/base/org.codehaus.groovy40/plugin_dsld_support/dsld/script_config.dsld b/base/org.codehaus.groovy40/plugin_dsld_support/dsld/script_config.dsld
index 83286b996d..d9084047d0 100644
--- a/base/org.codehaus.groovy40/plugin_dsld_support/dsld/script_config.dsld
+++ b/base/org.codehaus.groovy40/plugin_dsld_support/dsld/script_config.dsld
@@ -15,8 +15,6 @@
  */
 package dsld
 
-assertVersion(groovyEclipse: '3.2.0')
-
 contribute(enclosingScript(isConfigScript()) & isThisType()) {
     property name: 'configuration', type: org.codehaus.groovy.control.CompilerConfiguration
     delegatesTo type: org.codehaus.groovy.control.customizers.builder.CompilerCustomizationBuilder
diff --git a/base/org.codehaus.groovy40/plugin_dsld_support/dsld/type_checking.dsld b/base/org.codehaus.groovy40/plugin_dsld_support/dsld/type_checking.dsld
index 67ee80c403..1bb155edee 100644
--- a/base/org.codehaus.groovy40/plugin_dsld_support/dsld/type_checking.dsld
+++ b/base/org.codehaus.groovy40/plugin_dsld_support/dsld/type_checking.dsld
@@ -22,8 +22,6 @@ import org.codehaus.groovy.transform.stc.AbstractTypeCheckingExtension
 import org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport
 import org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport.TypeCheckingDSL
 
-assertVersion(groovyEclipse: '4.8.0')
-
 contribute(isScript() & currentType(subType(TypeCheckingDSL))) {
     provider = "{@link ${GroovyTypeCheckingExtensionSupport.name}.TypeCheckingDSL TypeCheckingDSL}"
 
diff --git a/base/org.codehaus.groovy50/plugin_dsld_support/dsld/script_config.dsld b/base/org.codehaus.groovy50/plugin_dsld_support/dsld/script_config.dsld
index 83286b996d..d9084047d0 100644
--- a/base/org.codehaus.groovy50/plugin_dsld_support/dsld/script_config.dsld
+++ b/base/org.codehaus.groovy50/plugin_dsld_support/dsld/script_config.dsld
@@ -15,8 +15,6 @@
  */
 package dsld
 
-assertVersion(groovyEclipse: '3.2.0')
-
 contribute(enclosingScript(isConfigScript()) & isThisType()) {
     property name: 'configuration', type: org.codehaus.groovy.control.CompilerConfiguration
     delegatesTo type: org.codehaus.groovy.control.customizers.builder.CompilerCustomizationBuilder
diff --git a/base/org.codehaus.groovy50/plugin_dsld_support/dsld/type_checking.dsld b/base/org.codehaus.groovy50/plugin_dsld_support/dsld/type_checking.dsld
index 67ee80c403..1bb155edee 100644
--- a/base/org.codehaus.groovy50/plugin_dsld_support/dsld/type_checking.dsld
+++ b/base/org.codehaus.groovy50/plugin_dsld_support/dsld/type_checking.dsld
@@ -22,8 +22,6 @@ import org.codehaus.groovy.transform.stc.AbstractTypeCheckingExtension
 import org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport
 import org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport.TypeCheckingDSL
 
-assertVersion(groovyEclipse: '4.8.0')
-
 contribute(isScript() & currentType(subType(TypeCheckingDSL))) {
     provider = "{@link ${GroovyTypeCheckingExtensionSupport.name}.TypeCheckingDSL TypeCheckingDSL}"
 
diff --git a/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml b/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml
index cdc4ca8620..bbc97d7d2d 100644
--- a/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml
+++ b/extras/Feature-org.codehaus.groovy.m2eclipse/feature.xml
@@ -19,7 +19,7 @@
    </license>
 
    <requires>
-      <import plugin="org.codehaus.groovy" version="2.5.22" match="greaterOrEqual"/>
+      <import plugin="org.codehaus.groovy" version="3.0.23" match="greaterOrEqual"/>
       <!--import feature="org.eclipse.m2e.feature" version="1.9.1" match="greaterOrEqual"/-->
       <import feature="org.codehaus.groovy.eclipse.feature" version="5.6.0" match="greaterOrEqual"/>
    </requires>
diff --git a/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF
index b95c8fa767..609c3368ff 100644
--- a/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.alltests/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.alltests;singleton:=true
 Bundle-Name: Groovy Test Suites
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.alltests
 Import-Package: org.codehaus.groovy.eclipse.codeassist.tests,
diff --git a/ide-test/org.codehaus.groovy.eclipse.codeassist.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.codeassist.test/META-INF/MANIFEST.MF
index e7130d43ce..7d3da8d5fa 100644
--- a/ide-test/org.codehaus.groovy.eclipse.codeassist.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.codeassist.test/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.codeassist.test;singleton:=true
 Bundle-Name: Groovy Content Assist Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.codeassist.tests
 Require-Bundle: org.codehaus.groovy.eclipse.codeassist;bundle-version="5.6.0",
diff --git a/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF
index 6fcea80edb..05f86902aa 100644
--- a/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.codebrowsing.test/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.codebrowsing.test;singleton:=true
 Bundle-Name: Groovy Code Browsing Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.codebrowsing.tests
 Require-Bundle: org.codehaus.groovy.eclipse.codebrowsing;bundle-version="5.6.0",
diff --git a/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF
index d9638ff051..56feb23c63 100644
--- a/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.core.test/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.core.test;singleton:=true
 Bundle-Name: Groovy Core Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.core.test
 Require-Bundle: org.codehaus.groovy.eclipse.tests;bundle-version="5.6.0"
diff --git a/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF
index 71c3037e60..b3eb4311f9 100644
--- a/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.dsl.tests/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.dsl.tests;singleton:=true
 Bundle-Name: Groovy DSL Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.dsl.tests
 Require-Bundle: org.codehaus.groovy.eclipse.codeassist;bundle-version="5.6.0",
diff --git a/ide-test/org.codehaus.groovy.eclipse.junit.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.junit.test/META-INF/MANIFEST.MF
index fcbc7c6da6..41e830b920 100644
--- a/ide-test/org.codehaus.groovy.eclipse.junit.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.junit.test/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.junit.test;singleton:=true
 Bundle-Name: Groovy JUnit Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.junit.test
 Require-Bundle: org.codehaus.groovy.eclipse.tests;bundle-version="5.6.0",
diff --git a/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF
index 2d0caf297c..992008da7d 100644
--- a/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.quickfix.test/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.quickfix.test;singleton:=true
 Bundle-Name: Groovy Quick Fix Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.quickfix.test,
  org.codehaus.groovy.eclipse.quickfix.test.resolvers,
diff --git a/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF
index 0a69262c82..a64e4709a9 100644
--- a/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.refactoring.test/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.refactoring.test;singleton:=true
 Bundle-Name: Groovy Refactoring Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.refactoring.test,
  org.codehaus.groovy.eclipse.refactoring.test.extract,
diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF b/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF
index f0f97a207e..ae77b166eb 100644
--- a/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF
+++ b/ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-SymbolicName: org.codehaus.groovy.eclipse.tests;singleton:=true
 Bundle-Name: Groovy UI Tests
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 5.6.0.qualifier
 Export-Package: org.codehaus.groovy.eclipse.test,
  org.codehaus.groovy.eclipse.test.actions,