sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1480 from eclipse/cd_xtext_issue1738c

Browse source 
[eclipse/xtext#1738] removed no longer needed icu dependency
This commit is contained in:
Christian Dietrich 2020-05-07 11:11:31 +02:00 committed by GitHub
commit cc2b17247d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
org.eclipse.xtext.tests/META-INF/MANIFEST.MF
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePluginP2/org.xtext.example.eclipsePluginP2/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9/build.properties vendored
View file

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

3
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2/build.properties vendored
View file

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

3
org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
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)",
de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
org.eclipse.jdt.core;bundle-version="3.13.102";resolution:=optional
Import-Package: com.ibm.icu.text;version="4.0.0",
org.apache.log4j;version="1.2.15"
Import-Package: org.apache.log4j;version="1.2.15"
Export-Package: org.eclipse.xtext.xtext.generator,
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,

1
org.eclipse.xtext.xtext.generator/build.gradle
View file

@ -7,7 +7,6 @@ dependencies {
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.mwe2.lib'
compile 'com.ibm.icu:icu4j'
compile 'org.eclipse.platform:org.eclipse.equinox.common'
optional 'org.eclipse.platform:org.eclipse.core.runtime'
optional 'org.eclipse.jdt:org.eclipse.jdt.core'

3
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
View file

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

3
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
View file

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