[eclipse/xtext#1738] removed no longer needed icu dependency

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2020-05-06 14:11:09 +02:00
parent 34c2846870
commit c2773a68ca
13 changed files with 12 additions and 25 deletions

View file

@ -26,8 +26,7 @@ Require-Bundle: org.eclipse.xtext,
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/simple.jar, Bundle-ClassPath: lib/simple.jar,
. .
Import-Package: com.ibm.icu.text;version="4.0.0", Import-Package: org.apache.log4j;version="1.2.15",
org.apache.log4j;version="1.2.15",
org.hamcrest.core, org.hamcrest.core,
org.junit;version="4.12.0", org.junit;version="4.12.0",
org.junit.rules;version="4.12.0", org.junit.rules;version="4.12.0",

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.eclipse.emf.mwe2.lib,\ org.eclipse.emf.mwe2.lib,\
org.objectweb.asm,\ org.objectweb.asm,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.apache.log4j,\ org.apache.log4j
com.ibm.icu

View file

@ -19,8 +19,7 @@ Require-Bundle: org.eclipse.xtext;x-installation:=greedy,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
org.eclipse.jdt.core;bundle-version="3.13.102";resolution:=optional org.eclipse.jdt.core;bundle-version="3.13.102";resolution:=optional
Import-Package: com.ibm.icu.text;version="4.0.0", Import-Package: org.apache.log4j;version="1.2.15"
org.apache.log4j;version="1.2.15"
Export-Package: org.eclipse.xtext.xtext.generator, Export-Package: org.eclipse.xtext.xtext.generator,
org.eclipse.xtext.xtext.generator.builder;x-friends:="org.eclipse.xtext.xbase", org.eclipse.xtext.xtext.generator.builder;x-friends:="org.eclipse.xtext.xbase",
org.eclipse.xtext.xtext.generator.ecore;x-friends:="org.eclipse.xtext.extras.tests, org.eclipse.xtext.xtext.generator.ecore;x-friends:="org.eclipse.xtext.extras.tests,

View file

@ -7,7 +7,6 @@ dependencies {
compile 'org.eclipse.emf:org.eclipse.emf.codegen.ecore' compile 'org.eclipse.emf:org.eclipse.emf.codegen.ecore'
compile 'org.eclipse.emf:org.eclipse.emf.mwe.utils' compile 'org.eclipse.emf:org.eclipse.emf.mwe.utils'
compile 'org.eclipse.emf:org.eclipse.emf.mwe2.lib' compile 'org.eclipse.emf:org.eclipse.emf.mwe2.lib'
compile 'com.ibm.icu:icu4j'
compile 'org.eclipse.platform:org.eclipse.equinox.common' compile 'org.eclipse.platform:org.eclipse.equinox.common'
optional 'org.eclipse.platform:org.eclipse.core.runtime' optional 'org.eclipse.platform:org.eclipse.core.runtime'
optional 'org.eclipse.jdt:org.eclipse.jdt.core' optional 'org.eclipse.jdt:org.eclipse.jdt.core'

View file

@ -115,8 +115,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
"org.eclipse.emf.mwe2.lib", "org.eclipse.emf.mwe2.lib",
"org.objectweb.asm", "org.objectweb.asm",
"org.apache.commons.logging", "org.apache.commons.logging",
"org.apache.log4j", "org.apache.log4j"
"com.ibm.icu"
) )
if (isFromExistingEcoreModels) { if (isFromExistingEcoreModels) {
if (config.ecore2Xtext.EPackageInfos.exists[genmodelURI.fileExtension == "xcore"]) { if (config.ecore2Xtext.EPackageInfos.exists[genmodelURI.fileExtension == "xcore"]) {

View file

@ -181,8 +181,7 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
"org.eclipse.emf.mwe2.lib", "org.eclipse.emf.mwe2.lib",
"org.objectweb.asm", "org.objectweb.asm",
"org.apache.commons.logging", "org.apache.commons.logging",
"org.apache.log4j", "org.apache.log4j");
"com.ibm.icu");
boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels(); boolean _isFromExistingEcoreModels = this.isFromExistingEcoreModels();
if (_isFromExistingEcoreModels) { if (_isFromExistingEcoreModels) {
final Function1<EPackageInfo, Boolean> _function = (EPackageInfo it) -> { final Function1<EPackageInfo, Boolean> _function = (EPackageInfo it) -> {