Skip to content

Commit

Permalink
GH-506: Unpinned the Xtext version.
Browse files Browse the repository at this point in the history
Revers commit of #492. [f4db832]

Signed-off-by: Akos Kitta <[email protected]>
  • Loading branch information
Akos Kitta authored and tuxji committed Nov 30, 2020
1 parent 597b36e commit 60f38a2
Show file tree
Hide file tree
Showing 19 changed files with 79 additions and 77 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Require-Bundle: com.ge.research.jena,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.ui.workbench,
org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.builder;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext,
org.eclipse.xtext.builder
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.ge.research.sadl.applications.Activator
Import-Package: com.ge.research.sadl.ide.handlers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.lsp4j,
org.eclipse.lsp4j.generator,
org.eclipse.lsp4j.jsonrpc,
org.eclipse.xtext.ide;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.ide;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
org.eclipse.emf.ecore.change,
com.ge.research.sadl,
com.ge.research.jena,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl.importer.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.importer,
org.eclipse.xtext.ide;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.ide;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.importer.ide.contentassist.antlr.internal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Bundle-SymbolicName: com.ge.research.sadl.importer.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.importer,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.importer.tests;x-internal=true
Import-Package: org.hamcrest.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Bundle-SymbolicName: com.ge.research.sadl.importer.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.importer.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.junit4;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.junit;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit,
org.eclipse.core.runtime,
org.eclipse.ui.workbench;resolution:=optional,
org.eclipse.xtext.ui.testing;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext.ui.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.importer.ui.tests;x-internal=true
Import-Package: org.hamcrest.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ Bundle-SymbolicName: com.ge.research.sadl.importer.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.importer,
com.ge.research.sadl.importer.ide,
org.eclipse.xtext.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui.shared;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.ui,
org.eclipse.compare,
org.eclipse.xtext.builder;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)";resolution:=optional,
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.builder,
org.eclipse.xtend.lib;resolution:=optional,
org.eclipse.xtext.xbase.lib,
com.ge.research.jena,
com.ge.research.sadl.jena-wrapper-for-sadl,
com.ge.research.sadl.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ Bundle-Vendor: General Electric Company
Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl.importer; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase;bundle-version="[2.21.0,2.22.0)",
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common;bundle-version="3.5.0",
com.ge.research.sadl;visibility:=reexport,
com.ge.research.jena,
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.util;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.util,
org.eclipse.xtend.lib,
org.eclipse.emf.ecore,
org.eclipse.emf.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ Require-Bundle: com.ge.research.sadl.errorgenerator,
com.ge.research.sadl,
org.eclipse.emf.ecore,
com.ge.research.jena,
org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
javax.activation,
org.eclipse.xtext,
org.eclipse.equinox.common,
org.eclipse.core.runtime,
org.apache.xerces,
org.eclipse.core.resources,
org.eclipse.xtext.builder;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext.builder
Eclipse-RegisterBuddy: com.ge.research.sadl
Automatic-Module-Name: com.ge.research.sadl.jena
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jface,
org.eclipse.ui.workbench,
org.eclipse.osgi,
org.eclipse.xtext.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui,
com.google.inject,
com.ge.research.jena,
com.ge.research.sadl.ui,
com.ge.research.sadl,
org.eclipse.xtext.util;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext.util,
org.eclipse.xtext
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: com.ge.research.sadl.utils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl,
org.eclipse.xtext.xbase.junit;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.junit,
org.eclipse.xtext.xbase.lib,
org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional,
com.ge.research.sadl.jena,
com.ge.research.jena,
org.eclipse.xtext.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.testing,
com.ge.research.sadl.ide,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc,
com.ge.research.sadl.jena-wrapper-for-sadl,
org.eclipse.xtext.xbase.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.testing,
org.junit;bundle-version="4.12.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.jena.translator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl.testsuite.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.testsuite,
org.eclipse.xtext.ide;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.ide;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
com.ge.research.sadl
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Bundle-SymbolicName: com.ge.research.sadl.testsuite.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.testsuite,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.lib,
com.ge.research.sadl
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.testsuite.tests;x-internal=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Bundle-SymbolicName: com.ge.research.sadl.testsuite.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.testsuite.ui,
org.junit;bundle-version="4.12.0",
org.eclipse.xtext.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.junit4;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.junit;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit,
org.eclipse.core.runtime,
org.eclipse.ui.workbench;resolution:=optional,
org.eclipse.xtext.ui.testing;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext.ui.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.testsuite.ui.tests;x-internal=true
Import-Package: org.hamcrest.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ Bundle-SymbolicName: com.ge.research.sadl.testsuite.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.testsuite,
com.ge.research.sadl.testsuite.ide,
org.eclipse.xtext.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui.shared;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.ui.editors;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.ui,
org.eclipse.compare,
org.eclipse.xtext.builder;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)";resolution:=optional,
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.builder,
org.eclipse.xtend.lib;resolution:=optional,
org.eclipse.xtext.xbase.lib,
com.ge.research.jena,
com.ge.research.sadl,
com.ge.research.sadl.ui
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ Bundle-Vendor: General Electric Company
Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl.testsuite; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase;bundle-version="[2.21.0,2.22.0)",
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common,
com.ge.research.jena,
com.ge.research.sadl,
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.util;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.util,
org.eclipse.xtend.lib,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.apache.commons.logging,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl.ui,
org.eclipse.xtext.xbase.junit;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.junit,
org.eclipse.core.runtime,
org.eclipse.ui.workbench;resolution:=optional,
com.ge.research.sadl,
org.eclipse.xtext.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.junit4;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.testing;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.testing,
org.junit;bundle-version="4.12.0",
com.ge.research.sadl.jena,
com.ge.research.jena,
com.ge.research.sadl.tests,
org.eclipse.ui.ide,
org.eclipse.xtext.ui.testing;bundle-version="[2.21.0,2.22.0)"
org.eclipse.xtext.ui.testing
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ge.research.sadl.ui.tests;x-internal=true,
com.ge.research.sadl.ui.tests.contentassist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,21 @@ Bundle-SymbolicName: com.ge.research.sadl.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.ge.research.sadl,
com.ge.research.sadl.ide;visibility:=reexport,
org.eclipse.xtext.ui;bundle-version="[2.21.0,2.22.0)",
javax.activation,
org.eclipse.xtext.ui,
org.eclipse.ui.console,
org.eclipse.ui.editors,
org.eclipse.ui.ide,
org.eclipse.ui,
org.eclipse.compare,
org.eclipse.xtext.builder;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.common.types.ui;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)";resolution:=optional,
org.eclipse.xtext.ui.shared;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.builder,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtext.common.types.ui,
org.eclipse.xtend.lib;resolution:=optional,
org.eclipse.xtext.ui.shared,
com.ge.research.jena,
org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext,
org.eclipse.swt,
org.eclipse.core.filesystem,
com.ge.research.sadl.jena-wrapper-for-sadl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Bundle-Name: Xtextgenerator
Bundle-SymbolicName: com.ge.research.sadl.xtextgenerator
Bundle-Version: 3.4.1.qualifier
Export-Package: com.ge.research.sadl.xtextgenerator
Require-Bundle: org.eclipse.xtext.xtext.generator;bundle-version="[2.21.0,2.22.0)",
Require-Bundle: org.eclipse.xtext.xtext.generator,
org.apache.log4j,
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib,
com.google.inject,
org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext,
org.eclipse.emf.mwe2.launch
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: General Electric Company
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ Bundle-Vendor: GE Global Research
Bundle-Version: 3.4.1.qualifier
Bundle-SymbolicName: com.ge.research.sadl; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase;bundle-version="[2.21.0,2.22.0)",
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common,
org.eclipse.emf.ecore,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.common.types;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.common.types,
org.eclipse.xtext.xbase.lib,
org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional,
org.eclipse.xtext.util;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtend.lib;bundle-version="[2.21.0,2.22.0)",
org.eclipse.xtext.util,
org.eclipse.xtend.lib,
org.eclipse.emf.common,
org.eclipse.core.runtime,
org.eclipse.core.resources,
Expand Down

0 comments on commit 60f38a2

Please sign in to comment.