From b4e7cf2699e18e7fe326d944dfb5703258f47e65 Mon Sep 17 00:00:00 2001 From: Stefan Kapferer Date: Wed, 23 Nov 2022 10:39:08 +0100 Subject: [PATCH] Context Mapper on Java 17 (#324) --- .github/workflows/build_master.yml | 16 +- .github/workflows/build_standard.yml | 8 +- .github/workflows/release-trigger.yml | 4 +- .github/workflows/release.yml | 16 +- .gitignore | 3 +- .mvn/wrapper/maven-wrapper.properties | 2 +- .project | 17 ++ build.gradle | 33 +-- gradle/maven-deployment.gradle | 11 +- gradle/source-layout.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- org.contextmapper.dsl.feature/.project | 23 ++ org.contextmapper.dsl.feature/feature.xml | 2 +- org.contextmapper.dsl.feature/pom.xml | 2 +- org.contextmapper.dsl.ide.tests/.classpath | 21 ++ org.contextmapper.dsl.ide.tests/.project | 40 +++ .../META-INF/MANIFEST.MF | 22 +- org.contextmapper.dsl.ide.tests/build.gradle | 24 +- org.contextmapper.dsl.ide.tests/pom.xml | 2 +- org.contextmapper.dsl.ide/.classpath | 9 + org.contextmapper.dsl.ide/.project | 40 +++ .../META-INF/MANIFEST.MF | 8 +- org.contextmapper.dsl.ide/build.gradle | 6 +- org.contextmapper.dsl.ide/pom.xml | 4 +- .../dsl/ide/actions/CMLActionService.xtend | 10 +- .../NewServiceCutGenerationCommand.java | 2 +- org.contextmapper.dsl.repository/.project | 17 ++ .../artifactory.ant | 21 +- .../packaging-p2composite.ant | 24 +- org.contextmapper.dsl.repository/pom.xml | 35 ++- org.contextmapper.dsl.target/.project | 17 ++ .../org.contextmapper.dsl.target.target | 58 ++-- org.contextmapper.dsl.target/pom.xml | 7 +- org.contextmapper.dsl.tests/.classpath | 21 ++ org.contextmapper.dsl.tests/.project | 40 +++ .../META-INF/MANIFEST.MF | 20 +- org.contextmapper.dsl.tests/build.gradle | 26 +- org.contextmapper.dsl.tests/pom.xml | 2 +- .../dsl/cml/CommentSerializationTest.java | 8 +- .../mdsl/MDSLAPIDescriptionCreatorTest.java | 6 +- .../mdsl/MDSLContractsGeneratorTest.java | 2 +- .../ServiceCutterInputGeneratorTest.java | 2 +- ...eriveBoundedContextFromSubdomainsTest.java | 3 +- ...ntendAndBackendSystemsFromFeatureTest.java | 3 +- .../SplitSystemIntoSubsystemsTest.java | 6 +- .../dsl/standalone/StandaloneAPITest.java | 4 +- org.contextmapper.dsl.ui.tests/.classpath | 21 ++ org.contextmapper.dsl.ui.tests/.project | 40 +++ .../META-INF/MANIFEST.MF | 4 +- org.contextmapper.dsl.ui.tests/pom.xml | 2 +- org.contextmapper.dsl.ui/.classpath | 9 + org.contextmapper.dsl.ui/.project | 40 +++ org.contextmapper.dsl.ui/META-INF/MANIFEST.MF | 4 +- org.contextmapper.dsl.ui/pom.xml | 2 +- org.contextmapper.dsl/.classpath | 9 + .../.launch/LaunchRuntimeEclipse.launch | 2 +- org.contextmapper.dsl/.project | 40 +++ org.contextmapper.dsl/META-INF/MANIFEST.MF | 4 +- org.contextmapper.dsl/build.gradle | 34 +-- org.contextmapper.dsl/pom.xml | 4 +- .../ContextMappingDSLFormatter.xtend | 4 +- .../AbstractPlantUMLClassDiagramCreator.java | 3 +- .../ContextMappingDSLScopeProvider.xtend | 6 +- .../tactic/dsl/TacticDslExtensions.xtend | 16 -- .../TacticDDDLanguageFormatter.xtend | 4 - .../TacticDDDLanguageValidator.xtend | 11 +- pom.xml | 254 ++++++++++-------- 67 files changed, 775 insertions(+), 391 deletions(-) create mode 100644 .project create mode 100644 org.contextmapper.dsl.feature/.project create mode 100644 org.contextmapper.dsl.ide.tests/.classpath create mode 100644 org.contextmapper.dsl.ide.tests/.project create mode 100644 org.contextmapper.dsl.ide/.classpath create mode 100644 org.contextmapper.dsl.ide/.project create mode 100644 org.contextmapper.dsl.repository/.project create mode 100644 org.contextmapper.dsl.target/.project create mode 100644 org.contextmapper.dsl.tests/.classpath create mode 100644 org.contextmapper.dsl.tests/.project create mode 100644 org.contextmapper.dsl.ui.tests/.classpath create mode 100644 org.contextmapper.dsl.ui.tests/.project create mode 100644 org.contextmapper.dsl.ui/.classpath create mode 100644 org.contextmapper.dsl.ui/.project create mode 100644 org.contextmapper.dsl/.classpath create mode 100644 org.contextmapper.dsl/.project diff --git a/.github/workflows/build_master.yml b/.github/workflows/build_master.yml index 9d9867d6..50dba11a 100644 --- a/.github/workflows/build_master.yml +++ b/.github/workflows/build_master.yml @@ -14,10 +14,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Gradle caches @@ -42,10 +42,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Cache local Maven repository @@ -70,10 +70,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Gradle caches @@ -112,10 +112,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Cache local Maven repository diff --git a/.github/workflows/build_standard.yml b/.github/workflows/build_standard.yml index f0dd8566..47fbbd88 100644 --- a/.github/workflows/build_standard.yml +++ b/.github/workflows/build_standard.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Gradle caches @@ -39,10 +39,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Cache local Maven repository diff --git a/.github/workflows/release-trigger.yml b/.github/workflows/release-trigger.yml index df798a92..9df800e0 100644 --- a/.github/workflows/release-trigger.yml +++ b/.github/workflows/release-trigger.yml @@ -12,10 +12,10 @@ jobs: with: fetch-depth: 0 persist-credentials: false - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Configure Git user run: | git config user.email "contextmapper-ci@kapferer.ch" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7da5fa2b..304c4710 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Gradle caches @@ -38,10 +38,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Cache local Maven repository @@ -65,10 +65,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Gradle caches @@ -106,10 +106,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Install Graphviz run: sudo apt-get -y install graphviz - name: Cache local Maven repository diff --git a/.gitignore b/.gitignore index cfc50d51..62675a88 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.class **/target **/out +**/bin # Log file *.log @@ -25,8 +26,6 @@ hs_err_pid* # Eclipse files -*.project -*.classpath **/.settings plugin.xml_gen diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 10673ca7..5f743c66 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip diff --git a/.project b/.project new file mode 100644 index 00000000..2177785b --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + org.contextmapper.dsl.parent + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/build.gradle b/build.gradle index 6eb1bf0e..e031d9f2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,25 @@ buildscript { repositories { mavenCentral() - jcenter() + gradlePluginPortal() } dependencies { - classpath 'org.xtext:xtext-gradle-plugin:2.0.8' + classpath 'org.xtext:xtext-gradle-plugin:3.0.2' } } def pomXml = new XmlSlurper().parse('pom.xml') subprojects { - ext.xtextVersion = '2.23.0' + ext.xtextVersion = '2.28.0' repositories { - jcenter() + mavenCentral() } - apply plugin: 'java' + apply plugin: 'java-library' + dependencies { + api platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}") + } apply plugin: 'maven-publish' apply plugin: 'org.xtext.xtend' apply from: "${rootDir}/gradle/source-layout.gradle" @@ -27,28 +30,14 @@ subprojects { group = 'org.contextmapper' version = pomXml.version - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility = '11' + targetCompatibility = '11' configurations.all { exclude group: 'asm' } - + if (!project.hasProperty('signing.secretKeyRingFile')) { project.ext.'signing.secretKeyRingFile' = "${rootDir}/secret-key.gpg" } - - // workaround for XText+Gradle build problems: https://github.com/eclipse/xtext/issues/1976#issuecomment-862141814 - configurations.all { - resolutionStrategy { - eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.eclipse.platform' && details.requested.name == 'org.eclipse.core.runtime') { - details.useVersion "3.19.0" - } - if (details.requested.group == 'org.eclipse.platform' && details.requested.name == 'org.eclipse.equinox.common') { - details.useVersion("3.13.0") - } - } - } - } } diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index cf1274d5..84b7ec42 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -1,11 +1,12 @@ //see https://docs.gradle.org/current/userguide/maven_plugin.html -apply plugin: 'maven' +apply plugin: 'maven-publish' -uploadArchives { +publishing { repositories { - mavenDeployer { - repository(url: "file://${buildDir}/localRepo") - snapshotRepository(url: "file://${buildDir}/localRepo") + maven { + def releasesRepoUrl = "file://${buildDir}/localRepo" + def snapshotsRepoUrl = "file://${buildDir}/localRepo" + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl } } } diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle index 088f0b4b..3322bdde 100644 --- a/gradle/source-layout.gradle +++ b/gradle/source-layout.gradle @@ -5,7 +5,7 @@ if (name.endsWith("-tests")) { resources.srcDirs = [] } test { - java.srcDirs = ['src', 'src-gen'] + java.srcDirs = ['src', 'src-gen', 'xtend-gen'] resources.srcDirs = ['src', 'src-gen'] xtendOutputDir = 'xtend-gen' } @@ -13,7 +13,7 @@ if (name.endsWith("-tests")) { } else { sourceSets { main { - java.srcDirs = ['src', 'src-gen'] + java.srcDirs = ['src', 'src-gen', 'xtend-gen'] resources.srcDirs = ['src', 'src-gen'] xtendOutputDir = 'xtend-gen' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 07716922..d98f8927 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip diff --git a/org.contextmapper.dsl.feature/.project b/org.contextmapper.dsl.feature/.project new file mode 100644 index 00000000..6b5bce2b --- /dev/null +++ b/org.contextmapper.dsl.feature/.project @@ -0,0 +1,23 @@ + + + org.contextmapper.dsl.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.FeatureNature + + diff --git a/org.contextmapper.dsl.feature/feature.xml b/org.contextmapper.dsl.feature/feature.xml index a805aea6..ce6c9ef0 100644 --- a/org.contextmapper.dsl.feature/feature.xml +++ b/org.contextmapper.dsl.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.contextmapper.dsl.feature/pom.xml b/org.contextmapper.dsl.feature/pom.xml index 15a5c9fd..7b13fa40 100644 --- a/org.contextmapper.dsl.feature/pom.xml +++ b/org.contextmapper.dsl.feature/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.feature eclipse-feature diff --git a/org.contextmapper.dsl.ide.tests/.classpath b/org.contextmapper.dsl.ide.tests/.classpath new file mode 100644 index 00000000..ef9742d3 --- /dev/null +++ b/org.contextmapper.dsl.ide.tests/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/org.contextmapper.dsl.ide.tests/.project b/org.contextmapper.dsl.ide.tests/.project new file mode 100644 index 00000000..c70efe56 --- /dev/null +++ b/org.contextmapper.dsl.ide.tests/.project @@ -0,0 +1,40 @@ + + + org.contextmapper.dsl.ide.tests + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.contextmapper.dsl.ide.tests/META-INF/MANIFEST.MF b/org.contextmapper.dsl.ide.tests/META-INF/MANIFEST.MF index eab847b6..74087bc5 100644 --- a/org.contextmapper.dsl.ide.tests/META-INF/MANIFEST.MF +++ b/org.contextmapper.dsl.ide.tests/META-INF/MANIFEST.MF @@ -3,13 +3,11 @@ Automatic-Module-Name: org.contextmapper.dsl.ide.tests Bundle-ManifestVersion: 2 Bundle-Name: org.contextmapper.dsl.ide.tests Bundle-Vendor: Context Mapper -Bundle-Version: 6.6.2.qualifier +Bundle-Version: 6.7.0.qualifier Bundle-SymbolicName: org.contextmapper.dsl.ide.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.contextmapper.dsl, org.contextmapper.dsl.ide, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)", - org.junit.jupiter.params;bundle-version="[5.0.0,6.0.0)", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", @@ -18,11 +16,17 @@ Require-Bundle: org.contextmapper.dsl, org.contextmapper.servicecutter.library;bundle-version="1.2.1", org.graphstream.gs-core;bundle-version="1.3.0", org.graphstream.gs-algo;bundle-version="1.3.0", - org.eclipse.lsp4j;bundle-version="0.9.0", - org.eclipse.lsp4j.jsonrpc;bundle-version="0.9.0", + org.eclipse.lsp4j;bundle-version="0.15.0", + org.eclipse.lsp4j.jsonrpc;bundle-version="0.15.0", io.github.classgraph;bundle-version="4.8.35", - com.google.gson;bundle-version="2.8.2", - org.eclipse.osgi;bundle-version="3.15.200" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + com.google.gson;bundle-version="2.8.9", + org.eclipse.osgi, + junit-jupiter-api, + junit-jupiter-params, + org.aopalliance;bundle-version="1.0.0", + org.eclipse.emf.ecore.change;bundle-version="2.14.0" +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.contextmapper.dsl.ide.tests;x-internal=true -Import-Package: org.eclipse.xtext.generator +Import-Package: org.eclipse.xtext.generator, + org.junit.jupiter.api;version="[5.1.0,6.0.0)", + org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)" diff --git a/org.contextmapper.dsl.ide.tests/build.gradle b/org.contextmapper.dsl.ide.tests/build.gradle index 6a00ed66..472a4ce0 100644 --- a/org.contextmapper.dsl.ide.tests/build.gradle +++ b/org.contextmapper.dsl.ide.tests/build.gradle @@ -1,11 +1,12 @@ dependencies { - compile project(':context-mapper-dsl') - compile project(':context-mapper-lsp') - testCompile "org.junit.jupiter:junit-jupiter-api:5.5.1" - testRuntime "org.junit.jupiter:junit-jupiter-engine:5.5.1" - testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1' - testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" - testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" + implementation project(':context-mapper-dsl') + implementation project(':context-mapper-lsp') + implementation group: 'commons-io', name: 'commons-io', version: '2.6' + testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.1" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.1" + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" + testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" } test { useJUnitPlatform() @@ -15,14 +16,7 @@ eclipseClasspath.enabled=false cleanEclipseClasspath.enabled=false jacocoTestReport { - FileTree sourceTree = files().asFileTree - FileTree classTree = files().asFileTree - - sourceTree += project(':context-mapper-lsp').sourceSets.main.allJava - classTree += project(':context-mapper-lsp').sourceSets.main.output.asFileTree - - additionalSourceDirs = sourceTree - additionalClassDirs = classTree + sourceSets project(':context-mapper-lsp').sourceSets.main reports { html.enabled = true diff --git a/org.contextmapper.dsl.ide.tests/pom.xml b/org.contextmapper.dsl.ide.tests/pom.xml index f20aea48..c0ddf4da 100644 --- a/org.contextmapper.dsl.ide.tests/pom.xml +++ b/org.contextmapper.dsl.ide.tests/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.ide.tests eclipse-test-plugin diff --git a/org.contextmapper.dsl.ide/.classpath b/org.contextmapper.dsl.ide/.classpath new file mode 100644 index 00000000..2d7f28c0 --- /dev/null +++ b/org.contextmapper.dsl.ide/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.contextmapper.dsl.ide/.project b/org.contextmapper.dsl.ide/.project new file mode 100644 index 00000000..9db5448e --- /dev/null +++ b/org.contextmapper.dsl.ide/.project @@ -0,0 +1,40 @@ + + + org.contextmapper.dsl.ide + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.contextmapper.dsl.ide/META-INF/MANIFEST.MF b/org.contextmapper.dsl.ide/META-INF/MANIFEST.MF index 5bf1a7fd..ac086cfa 100644 --- a/org.contextmapper.dsl.ide/META-INF/MANIFEST.MF +++ b/org.contextmapper.dsl.ide/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Automatic-Module-Name: org.contextmapper.dsl.ide Bundle-ManifestVersion: 2 Bundle-Name: org.contextmapper.dsl.ide Bundle-Vendor: Context Mapper -Bundle-Version: 6.6.2.qualifier +Bundle-Version: 6.7.0.qualifier Bundle-SymbolicName: org.contextmapper.dsl.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.contextmapper.dsl, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.lsp4j, - org.eclipse.lsp4j.jsonrpc, + org.eclipse.lsp4j;bundle-version="0.15.0", + org.eclipse.lsp4j.jsonrpc;bundle-version="0.15.0", org.apache.log4j;bundle-version="1.2.15", com.google.gson;bundle-version="2.8.2", org.apache.commons.lang3;bundle-version="3.9.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.contextmapper.dsl.ide.commands, org.contextmapper.dsl.ide.contentassist.antlr, org.contextmapper.dsl.ide.contentassist.antlr.internal, diff --git a/org.contextmapper.dsl.ide/build.gradle b/org.contextmapper.dsl.ide/build.gradle index a7c7772a..f694ff88 100644 --- a/org.contextmapper.dsl.ide/build.gradle +++ b/org.contextmapper.dsl.ide/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'signing' dependencies { - compile project(':context-mapper-dsl') - compile "org.eclipse.xtext:org.eclipse.xtext.ide:${xtextVersion}" - compile "org.eclipse.xtext:org.eclipse.xtext.xbase.ide:${xtextVersion}" + implementation project(':context-mapper-dsl') + implementation "org.eclipse.xtext:org.eclipse.xtext.ide:${xtextVersion}" + implementation "org.eclipse.xtext:org.eclipse.xtext.xbase.ide:${xtextVersion}" } apply plugin: 'application' diff --git a/org.contextmapper.dsl.ide/pom.xml b/org.contextmapper.dsl.ide/pom.xml index 8a9c268a..7e27ea93 100644 --- a/org.contextmapper.dsl.ide/pom.xml +++ b/org.contextmapper.dsl.ide/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.ide eclipse-plugin @@ -138,7 +138,7 @@ --> - mydsl-ls + cml-ls org.eclipse.xtext.ide.server.ServerLauncher - + - + @@ -124,7 +113,7 @@ - + @@ -135,7 +124,7 @@ - + diff --git a/org.contextmapper.dsl.repository/packaging-p2composite.ant b/org.contextmapper.dsl.repository/packaging-p2composite.ant index fe21c524..9a2970fe 100644 --- a/org.contextmapper.dsl.repository/packaging-p2composite.ant +++ b/org.contextmapper.dsl.repository/packaging-p2composite.ant @@ -1,24 +1,6 @@ - - - - - - - - - + - + - -application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="${site.label}" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dchild.repository.path.prefix="${child.repository.path.prefix}" + -application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -DparsedVersion.majorVersion="${parsedVersion.majorVersion}" -DparsedVersion.minorVersion="${parsedVersion.minorVersion}" -Dsite.label="${site.label}" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dchild.repository.path.prefix="${child.repository.path.prefix}" + + --add-opens=java.base/java.net=ALL-UNNAMED + - mars + 2022-12 p2 - http://download.eclipse.org/releases/mars + http://download.eclipse.org/releases/2022-12 diff --git a/org.contextmapper.dsl.target/.project b/org.contextmapper.dsl.target/.project new file mode 100644 index 00000000..875868ad --- /dev/null +++ b/org.contextmapper.dsl.target/.project @@ -0,0 +1,17 @@ + + + org.contextmapper.dsl.target + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/org.contextmapper.dsl.target/org.contextmapper.dsl.target.target b/org.contextmapper.dsl.target/org.contextmapper.dsl.target.target index 9a09aa29..8d236656 100644 --- a/org.contextmapper.dsl.target/org.contextmapper.dsl.target.target +++ b/org.contextmapper.dsl.target/org.contextmapper.dsl.target.target @@ -9,31 +9,37 @@ - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -41,19 +47,21 @@ - + - - - - - - + + + + + + + + - + \ No newline at end of file diff --git a/org.contextmapper.dsl.target/pom.xml b/org.contextmapper.dsl.target/pom.xml index 7c1c9945..7271747c 100644 --- a/org.contextmapper.dsl.target/pom.xml +++ b/org.contextmapper.dsl.target/pom.xml @@ -3,12 +3,9 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.target eclipse-target-definition - - - - + \ No newline at end of file diff --git a/org.contextmapper.dsl.tests/.classpath b/org.contextmapper.dsl.tests/.classpath new file mode 100644 index 00000000..ef9742d3 --- /dev/null +++ b/org.contextmapper.dsl.tests/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/org.contextmapper.dsl.tests/.project b/org.contextmapper.dsl.tests/.project new file mode 100644 index 00000000..66d058b6 --- /dev/null +++ b/org.contextmapper.dsl.tests/.project @@ -0,0 +1,40 @@ + + + org.contextmapper.dsl.tests + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.contextmapper.dsl.tests/META-INF/MANIFEST.MF b/org.contextmapper.dsl.tests/META-INF/MANIFEST.MF index c257e7b9..88ff8170 100644 --- a/org.contextmapper.dsl.tests/META-INF/MANIFEST.MF +++ b/org.contextmapper.dsl.tests/META-INF/MANIFEST.MF @@ -3,13 +3,11 @@ Automatic-Module-Name: org.contextmapper.dsl.tests Bundle-ManifestVersion: 2 Bundle-Name: org.contextmapper.dsl.tests Bundle-Vendor: Context Mapper -Bundle-Version: 6.6.2.qualifier +Bundle-Version: 6.7.0.qualifier Bundle-SymbolicName: org.contextmapper.dsl.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.contextmapper.dsl, org.contextmapper.dsl.ide, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)", - org.junit.jupiter.params;bundle-version="[5.0.0,6.0.0)", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", @@ -18,14 +16,18 @@ Require-Bundle: org.contextmapper.dsl, org.contextmapper.servicecutter.library;bundle-version="1.2.1", org.graphstream.gs-core;bundle-version="1.3.0", org.graphstream.gs-algo;bundle-version="1.3.0", - org.eclipse.lsp4j;bundle-version="0.9.0", - org.eclipse.lsp4j.jsonrpc;bundle-version="0.9.0", + org.eclipse.lsp4j;bundle-version="0.14.0", + org.eclipse.lsp4j.jsonrpc;bundle-version="0.14.0", io.github.classgraph;bundle-version="4.8.35", com.google.gson;bundle-version="2.8.2", - org.eclipse.osgi;bundle-version="3.15.200", - org.freemarker.freemarker;bundle-version="2.3.30" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + org.eclipse.osgi, + org.freemarker.freemarker;bundle-version="2.3.30", + junit-jupiter-api, + junit-jupiter-params +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.contextmapper.dsl.tests;x-internal=true, org.contextmapper.tactic.dsl.tests;x-internal=true, org.contextmapper.servicecutter.dsl.tests;x-internal=true -Import-Package: org.eclipse.xtext.generator +Import-Package: org.eclipse.xtext.generator, + org.junit.jupiter.api;version="[5.1.0,6.0.0)", + org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)" diff --git a/org.contextmapper.dsl.tests/build.gradle b/org.contextmapper.dsl.tests/build.gradle index 2782b8a3..c6a61bc8 100644 --- a/org.contextmapper.dsl.tests/build.gradle +++ b/org.contextmapper.dsl.tests/build.gradle @@ -1,10 +1,15 @@ dependencies { - compile project(':context-mapper-dsl') - testCompile "org.junit.jupiter:junit-jupiter-api:5.5.1" - testRuntime "org.junit.jupiter:junit-jupiter-engine:5.5.1" - testCompile 'org.junit.jupiter:junit-jupiter-params:5.5.1' - testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" - testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" + implementation project(':context-mapper-dsl') + implementation group: 'org.contextmapper', name: 'context-map-generator', version: '1.2.1' + implementation group: 'org.contextmapper', name: 'service-cutter-library', version: '1.2.1' + implementation group: 'commons-io', name: 'commons-io', version: '2.6' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' + + testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.1" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.1" + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" + testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" } test { useJUnitPlatform() @@ -14,14 +19,7 @@ eclipseClasspath.enabled=false cleanEclipseClasspath.enabled=false jacocoTestReport { - FileTree sourceTree = files().asFileTree - FileTree classTree = files().asFileTree - - sourceTree += project(':context-mapper-dsl').sourceSets.main.allJava - classTree += project(':context-mapper-dsl').sourceSets.main.output.asFileTree - - additionalSourceDirs = sourceTree - additionalClassDirs = classTree + sourceSets project(':context-mapper-dsl').sourceSets.main reports { html.enabled = true diff --git a/org.contextmapper.dsl.tests/pom.xml b/org.contextmapper.dsl.tests/pom.xml index 0595e01e..af5ce35f 100644 --- a/org.contextmapper.dsl.tests/pom.xml +++ b/org.contextmapper.dsl.tests/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.tests eclipse-test-plugin diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/cml/CommentSerializationTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/cml/CommentSerializationTest.java index 8991ffba..774a1893 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/cml/CommentSerializationTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/cml/CommentSerializationTest.java @@ -54,7 +54,7 @@ public void canSerializeTopComment_SL() throws IOException { // then String expectedCML = "// test SL comment" + System.lineSeparator() + "ContextMap TestMap {" + System.lineSeparator() + "}" + System.lineSeparator() + System.lineSeparator(); - assertEquals(expectedCML, FileUtils.readFileToString(testFile, Charset.defaultCharset())); + assertEquals(expectedCML, FileUtils.readFileToString(testFile)); } @Test @@ -77,7 +77,7 @@ public void canSerializeTopComment_ML() throws IOException { String expectedCML = "/* test SL comment" + System.lineSeparator() + " * with another line */" + System.lineSeparator() + "ContextMap TestMap {" + System.lineSeparator() + "}" + System.lineSeparator() + System.lineSeparator(); - assertEquals(expectedCML, FileUtils.readFileToString(testFile, Charset.defaultCharset())); + assertEquals(expectedCML, FileUtils.readFileToString(testFile)); } @Test @@ -100,7 +100,7 @@ public void canSerializeBCComment_SL() throws IOException { // then String expectedCML = "// test SL comment" + System.lineSeparator() + System.lineSeparator() + "// test BC comment" + System.lineSeparator() + "BoundedContext TestContext"; - assertEquals(expectedCML, FileUtils.readFileToString(testFile, Charset.defaultCharset())); + assertEquals(expectedCML, FileUtils.readFileToString(testFile)); } @Test @@ -124,7 +124,7 @@ public void canSerializeBCComment_ML() throws IOException { String expectedCML = "// test SL comment" + System.lineSeparator() + System.lineSeparator() + "/* test BC comment ML" + System.lineSeparator() + " * with second line */" + System.lineSeparator() + "BoundedContext TestContext"; - assertEquals(expectedCML, FileUtils.readFileToString(testFile, Charset.defaultCharset())); + assertEquals(expectedCML, FileUtils.readFileToString(testFile)); } @Override diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLAPIDescriptionCreatorTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLAPIDescriptionCreatorTest.java index 4ec7161c..1e96a70c 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLAPIDescriptionCreatorTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLAPIDescriptionCreatorTest.java @@ -119,7 +119,7 @@ void canCreateCommentInCaseThereIsNoOperationInAnAPI() throws IOException { // then File expectedResultFile = new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/mdsl/" + baseFilename + ".mdsl"); - String expectedResult = FileUtils.readFileToString(expectedResultFile, Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(expectedResultFile); assertEquals(expectedResult, dslText); } @@ -295,7 +295,7 @@ private void testCMLInputAndMDSLOutputFiles(String baseFilename, boolean overwri MDSLAPIDescriptionCreator dslTextCreator; if (overwriteExistingFile) { File existingFile = new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/mdsl/" + baseFilename + "-existing.mdsl"); - String existingFileContent = FileUtils.readFileToString(existingFile, Charset.forName("UTF-8")); + String existingFileContent = FileUtils.readFileToString(existingFile); dslTextCreator = new TestMDSLAPIDescriptionCreator(new ProtectedRegionContextFactory().createProtectedRegionContextForExistingMDSLFile(existingFileContent), input.getURI().toFileString()); } else { @@ -305,7 +305,7 @@ private void testCMLInputAndMDSLOutputFiles(String baseFilename, boolean overwri // then File expectedResultFile = new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/mdsl/" + baseFilename + ".mdsl"); - String expectedResult = FileUtils.readFileToString(expectedResultFile, Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(expectedResultFile); assertEquals(expectedResult, dslText); } diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLContractsGeneratorTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLContractsGeneratorTest.java index 71abdbcd..ea2c9710 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLContractsGeneratorTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/mdsl/MDSLContractsGeneratorTest.java @@ -74,7 +74,7 @@ void canOverWriteFileAndPreserveProtectedRegion() throws IOException { CMLResource input = getResourceCopyOfTestCML(inputModelName); ContextMappingModel model = input.getContextMappingModel(); File existingMDSLFile = new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/mdsl/overwrite-with-preserving-protected-region-test.mdsl"); - String existingMDSLContent = FileUtils.readFileToString(existingMDSLFile, Charset.forName("UTF-8")); + String existingMDSLContent = FileUtils.readFileToString(existingMDSLFile); // when IFileSystemAccess2Mock filesystem = new IFileSystemAccess2Mock(); diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/servicecutter/ServiceCutterInputGeneratorTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/servicecutter/ServiceCutterInputGeneratorTest.java index 7d59d10a..0f8bf57e 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/servicecutter/ServiceCutterInputGeneratorTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/servicecutter/ServiceCutterInputGeneratorTest.java @@ -78,7 +78,7 @@ void canSerializeCorrectly() throws IOException { // then String generatedJSON = filesystem.readTextFile("DDD_Sample.json").toString(); File expectedResultFile = new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/servicecutter/DDD_Sample_Expected_JSON_Input.json"); - String expectedResult = FileUtils.readFileToString(expectedResultFile, Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(expectedResultFile); assertEquals(expectedResult, generatedJSON); } diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveBoundedContextFromSubdomainsTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveBoundedContextFromSubdomainsTest.java index de4609d9..b70e67c4 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveBoundedContextFromSubdomainsTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveBoundedContextFromSubdomainsTest.java @@ -320,8 +320,7 @@ public void canHandleClaimsIntegrationTest() throws IOException { // then String dslText = FileUtils.readFileToString(new File(input.getURI().toFileString()), "UTF-8"); - String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/derive-bc-from-subdomain-test-11-output.cml"), - Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/derive-bc-from-subdomain-test-11-output.cml")); assertEquals(expectedResult, dslText); } diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveFrontendAndBackendSystemsFromFeatureTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveFrontendAndBackendSystemsFromFeatureTest.java index 2d3be4d1..3b62a055 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveFrontendAndBackendSystemsFromFeatureTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/DeriveFrontendAndBackendSystemsFromFeatureTest.java @@ -118,8 +118,7 @@ public void canDeriveFrontedAndBackendSystemRepeatable(String testBasefileName) // then String dslText = FileUtils.readFileToString(new File(input.getURI().toFileString()), "UTF-8"); - String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/" + testBasefileName + "-output.cml"), - Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/" + testBasefileName + "-output.cml")); assertEquals(expectedResult, dslText); } diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/SplitSystemIntoSubsystemsTest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/SplitSystemIntoSubsystemsTest.java index de0f2109..ce6a087a 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/SplitSystemIntoSubsystemsTest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/refactoring/SplitSystemIntoSubsystemsTest.java @@ -106,8 +106,7 @@ public void canSplitTierIfNewSystemNamesAlreadyExist(String testBasefileName) th // then String dslText = FileUtils.readFileToString(new File(input.getURI().toFileString()), "UTF-8"); - String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/" + testBasefileName + "-output.cml"), - Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/" + testBasefileName + "-output.cml")); assertEquals(expectedResult, dslText); } @@ -124,8 +123,7 @@ public void canSplitTierIfNewSystemNamesAndContextMapAlreadyExist(String testBas // then String dslText = FileUtils.readFileToString(new File(input.getURI().toFileString()), "UTF-8"); - String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/" + testBasefileName + "-output.cml"), - Charset.forName("UTF-8")); + String expectedResult = FileUtils.readFileToString(new File(Paths.get("").toAbsolutePath().toString(), "/integ-test-files/refactorings/" + testBasefileName + "-output.cml")); assertEquals(expectedResult, dslText); } diff --git a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/standalone/StandaloneAPITest.java b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/standalone/StandaloneAPITest.java index 28d8a8b0..29ce5579 100644 --- a/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/standalone/StandaloneAPITest.java +++ b/org.contextmapper.dsl.tests/src/org/contextmapper/dsl/standalone/StandaloneAPITest.java @@ -82,7 +82,7 @@ public void canCreateNewCMLModel() throws IOException { // then assertTrue(file.exists()); - assertEquals(System.lineSeparator() + System.lineSeparator() + "BoundedContext TestContext", FileUtils.readFileToString(file, Charset.forName("UTF-8"))); + assertEquals(System.lineSeparator() + System.lineSeparator() + "BoundedContext TestContext", FileUtils.readFileToString(file)); } @Test @@ -101,7 +101,7 @@ public void canCreateNewCMLModelViaFile() throws IOException { // then assertTrue(file.exists()); - assertEquals(System.lineSeparator() + System.lineSeparator() + "BoundedContext TestContext", FileUtils.readFileToString(file, Charset.forName("UTF-8"))); + assertEquals(System.lineSeparator() + System.lineSeparator() + "BoundedContext TestContext", FileUtils.readFileToString(file)); } @Test diff --git a/org.contextmapper.dsl.ui.tests/.classpath b/org.contextmapper.dsl.ui.tests/.classpath new file mode 100644 index 00000000..ef9742d3 --- /dev/null +++ b/org.contextmapper.dsl.ui.tests/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/org.contextmapper.dsl.ui.tests/.project b/org.contextmapper.dsl.ui.tests/.project new file mode 100644 index 00000000..fb305310 --- /dev/null +++ b/org.contextmapper.dsl.ui.tests/.project @@ -0,0 +1,40 @@ + + + org.contextmapper.dsl.ui.tests + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.contextmapper.dsl.ui.tests/META-INF/MANIFEST.MF b/org.contextmapper.dsl.ui.tests/META-INF/MANIFEST.MF index 46302830..43cc23aa 100644 --- a/org.contextmapper.dsl.ui.tests/META-INF/MANIFEST.MF +++ b/org.contextmapper.dsl.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.contextmapper.dsl.ui.tests Bundle-ManifestVersion: 2 Bundle-Name: org.contextmapper.dsl.ui.tests Bundle-Vendor: Context Mapper -Bundle-Version: 6.6.2.qualifier +Bundle-Version: 6.7.0.qualifier Bundle-SymbolicName: org.contextmapper.dsl.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.contextmapper.dsl.ui, @@ -15,7 +15,7 @@ Require-Bundle: org.contextmapper.dsl.ui, org.eclipse.core.runtime, org.eclipse.ui.workbench;resolution:=optional, org.eclipse.xtext.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.contextmapper.dsl.ui.tests;x-internal=true, org.contextmapper.tactic.dsl.ui.tests;x-internal=true, org.contextmapper.servicecutter.dsl.ui.tests;x-internal=true diff --git a/org.contextmapper.dsl.ui.tests/pom.xml b/org.contextmapper.dsl.ui.tests/pom.xml index 1f4261d3..344fea43 100644 --- a/org.contextmapper.dsl.ui.tests/pom.xml +++ b/org.contextmapper.dsl.ui.tests/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.ui.tests eclipse-test-plugin diff --git a/org.contextmapper.dsl.ui/.classpath b/org.contextmapper.dsl.ui/.classpath new file mode 100644 index 00000000..2d7f28c0 --- /dev/null +++ b/org.contextmapper.dsl.ui/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.contextmapper.dsl.ui/.project b/org.contextmapper.dsl.ui/.project new file mode 100644 index 00000000..3b20abca --- /dev/null +++ b/org.contextmapper.dsl.ui/.project @@ -0,0 +1,40 @@ + + + org.contextmapper.dsl.ui + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.contextmapper.dsl.ui/META-INF/MANIFEST.MF b/org.contextmapper.dsl.ui/META-INF/MANIFEST.MF index d87dcf22..b45c7a8d 100644 --- a/org.contextmapper.dsl.ui/META-INF/MANIFEST.MF +++ b/org.contextmapper.dsl.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.contextmapper.dsl.ui Bundle-ManifestVersion: 2 Bundle-Name: org.contextmapper.dsl.ui Bundle-Vendor: Context Mapper -Bundle-Version: 6.6.2.qualifier +Bundle-Version: 6.7.0.qualifier Bundle-SymbolicName: org.contextmapper.dsl.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.contextmapper.dsl, @@ -21,7 +21,7 @@ Require-Bundle: org.contextmapper.dsl, org.contextmapper.servicecutter.library Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.ui.hover -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.contextmapper.dsl.ui.contentassist, org.contextmapper.dsl.ui.quickfix, org.contextmapper.dsl.ui.internal, diff --git a/org.contextmapper.dsl.ui/pom.xml b/org.contextmapper.dsl.ui/pom.xml index 2190d9c9..04ee66eb 100644 --- a/org.contextmapper.dsl.ui/pom.xml +++ b/org.contextmapper.dsl.ui/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.ui eclipse-plugin diff --git a/org.contextmapper.dsl/.classpath b/org.contextmapper.dsl/.classpath new file mode 100644 index 00000000..c979c8a7 --- /dev/null +++ b/org.contextmapper.dsl/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.contextmapper.dsl/.launch/LaunchRuntimeEclipse.launch b/org.contextmapper.dsl/.launch/LaunchRuntimeEclipse.launch index de80fe08..cdd9d8a6 100644 --- a/org.contextmapper.dsl/.launch/LaunchRuntimeEclipse.launch +++ b/org.contextmapper.dsl/.launch/LaunchRuntimeEclipse.launch @@ -18,7 +18,7 @@ - + diff --git a/org.contextmapper.dsl/.project b/org.contextmapper.dsl/.project new file mode 100644 index 00000000..6d3de55f --- /dev/null +++ b/org.contextmapper.dsl/.project @@ -0,0 +1,40 @@ + + + org.contextmapper.dsl + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.contextmapper.dsl/META-INF/MANIFEST.MF b/org.contextmapper.dsl/META-INF/MANIFEST.MF index 99b4f0c9..51bf09ae 100644 --- a/org.contextmapper.dsl/META-INF/MANIFEST.MF +++ b/org.contextmapper.dsl/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.contextmapper.dsl Bundle-ManifestVersion: 2 Bundle-Name: org.contextmapper.dsl Bundle-Vendor: Context Mapper -Bundle-Version: 6.6.2.qualifier +Bundle-Version: 6.7.0.qualifier Bundle-SymbolicName: org.contextmapper.dsl; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, @@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.xtext, org.nlpub.watset;bundle-version="2.1.5", org.jgrapht.core;bundle-version="1.4.0", org.apache.commons.math3;bundle-version="3.6.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.contextmapper.dsl, org.contextmapper.dsl.cml, org.contextmapper.dsl.cml.exception, diff --git a/org.contextmapper.dsl/build.gradle b/org.contextmapper.dsl/build.gradle index 683ca5e5..3eb4ab7e 100644 --- a/org.contextmapper.dsl/build.gradle +++ b/org.contextmapper.dsl/build.gradle @@ -1,33 +1,37 @@ apply plugin: 'signing' dependencies { - compile "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" - compile "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" + api "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" + api "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" - compile group: 'commons-io', name: 'commons-io', version: '2.6' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' - compile group: 'org.freemarker', name: 'freemarker', version: '2.3.30' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.9' - compile group: 'org.yaml', name: 'snakeyaml', version: '1.14' - compile group: 'org.contextmapper', name: 'context-map-generator', version: '1.2.1' - compile group: 'org.contextmapper', name: 'service-cutter-library', version: '1.2.1' + testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" + testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" + + implementation group: 'commons-io', name: 'commons-io', version: '2.6' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' + implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.30' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.9' + implementation group: 'org.yaml', name: 'snakeyaml', version: '1.14' + implementation group: 'org.contextmapper', name: 'context-map-generator', version: '1.2.1' + implementation group: 'org.contextmapper', name: 'service-cutter-library', version: '1.2.1' } + configurations { mwe2 { - extendsFrom compile + extendsFrom implementation } } dependencies { - mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.11.3" + mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch' mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" - mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)" + mwe2 "org.eclipse.xtext:xtext-antlr-generator" } task generateXtextLanguage(type: JavaExec) { - main = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher' + mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher' classpath = configurations.mwe2 inputs.file "src/org/contextmapper/dsl/GenerateContextMappingDSL.mwe2" inputs.file "src/org/contextmapper/dsl/ContextMappingDSL.xtext" @@ -37,6 +41,7 @@ task generateXtextLanguage(type: JavaExec) { args += "rootPath=/${projectDir}/.." } +processResources.dependsOn(generateXtextLanguage) generateXtext.dependsOn(generateXtextLanguage) clean.dependsOn(cleanGenerateXtextLanguage) eclipse.classpath.plusConfigurations += [configurations.mwe2] @@ -45,7 +50,6 @@ eclipseClasspath.enabled=false cleanEclipseClasspath.enabled=false clean { - delete 'src-gen' delete 'xtend-gen' delete 'model' } diff --git a/org.contextmapper.dsl/pom.xml b/org.contextmapper.dsl/pom.xml index 6f329d06..34f5bf46 100644 --- a/org.contextmapper.dsl/pom.xml +++ b/org.contextmapper.dsl/pom.xml @@ -3,7 +3,7 @@ org.contextmapper.dsl org.contextmapper.dsl.parent - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl eclipse-plugin @@ -134,7 +134,7 @@ - + diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/formatting2/ContextMappingDSLFormatter.xtend b/org.contextmapper.dsl/src/org/contextmapper/dsl/formatting2/ContextMappingDSLFormatter.xtend index cc11760c..1b4ffbc3 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/dsl/formatting2/ContextMappingDSLFormatter.xtend +++ b/org.contextmapper.dsl/src/org/contextmapper/dsl/formatting2/ContextMappingDSLFormatter.xtend @@ -41,7 +41,7 @@ class ContextMappingDSLFormatter extends TacticDDDLanguageFormatter { @Inject extension ContextMappingDSLGrammarAccess def dispatch void format(ContextMappingModel contextMappingModel, extension IFormattableDocument document) { - var ignoredFirst = contextMappingModel.topComment != null && !"".equals(contextMappingModel.topComment) + var ignoredFirst = contextMappingModel.topComment !== null && !"".equals(contextMappingModel.topComment) for (cmlImport : contextMappingModel.imports) { if (ignoredFirst) { cmlImport.prepend[newLine] @@ -71,7 +71,7 @@ class ContextMappingDSLFormatter extends TacticDDDLanguageFormatter { )[indent] var model = contextMap.eContainer as ContextMappingModel - var hasTopComment = model.topComment != null && !"".equals(model.topComment) + var hasTopComment = model.topComment !== null && !"".equals(model.topComment) if (hasTopComment) contextMap.regionFor.keyword("ContextMap").prepend[newLine] diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/AbstractPlantUMLClassDiagramCreator.java b/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/AbstractPlantUMLClassDiagramCreator.java index 59bef384..60647b10 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/AbstractPlantUMLClassDiagramCreator.java +++ b/org.contextmapper.dsl/src/org/contextmapper/dsl/generator/plantuml/AbstractPlantUMLClassDiagramCreator.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Map; -import java.util.Optional; import org.contextmapper.dsl.contextMappingDSL.Aggregate; import org.contextmapper.dsl.contextMappingDSL.SculptorModule; @@ -412,7 +411,7 @@ protected void printReferences(int indentation) { private void printLink(AssociationInfo info) { boolean multFirstIsMany = info.getMultiplicityFirstParticipant() != null && info.getMultiplicityFirstParticipant().getMax() > 1, multSecondIsMany = info.getMultiplicitySecondParticipant() != null && info.getMultiplicitySecondParticipant().getMax() > 1; - String aggregationSymbol = (info.getAggregateSource().equals(info.getAggregateTarget())) ? "*" : "o"; + String aggregationSymbol = (info.getAggregateSource() != null && info.getAggregateSource().equals(info.getAggregateTarget())) ? "*" : "o"; if (multSecondIsMany && !multFirstIsMany) sb.append(aggregationSymbol); diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/scoping/ContextMappingDSLScopeProvider.xtend b/org.contextmapper.dsl/src/org/contextmapper/dsl/scoping/ContextMappingDSLScopeProvider.xtend index 8a6b8521..04bb9ed5 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/dsl/scoping/ContextMappingDSLScopeProvider.xtend +++ b/org.contextmapper.dsl/src/org/contextmapper/dsl/scoping/ContextMappingDSLScopeProvider.xtend @@ -34,12 +34,10 @@ class ContextMappingDSLScopeProvider extends AbstractDeclarativeScopeProvider { override getScope(EObject context, EReference reference) { if (context instanceof Reference) { - return cmlScopingHelper.reduceReferenceScope(super.getScope(context, reference), context as Reference, - reference); + return cmlScopingHelper.reduceReferenceScope(super.getScope(context, reference), context, reference); } if (context instanceof Association) { - return cmlScopingHelper.reduceReferenceScope(super.getScope(context, reference), context as Association, - reference); + return cmlScopingHelper.reduceReferenceScope(super.getScope(context, reference), context, reference); } super.getScope(context, reference) } diff --git a/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/TacticDslExtensions.xtend b/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/TacticDslExtensions.xtend index 812d0329..2113dcdd 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/TacticDslExtensions.xtend +++ b/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/TacticDslExtensions.xtend @@ -26,26 +26,10 @@ import static extension org.eclipse.xtext.EcoreUtil2.* /** * Extensions for model elements of the domain model. - * Usage in Xtend files: - * 
- *   @Inject extension TacticDslExtensions
- * 
- *   // ...
- * 
- *     element.rootContainer.eAllOfClass(typeof(DslService))
- *
*/ class TacticDslExtensions { /** * Extensions for model elements of the domain model. - * Usage in Xtend files: - * 
-	 *   @Inject extension SculptordslExtensions
-	 * 
-	 *   // ...
-	 * 
-	 *     element.rootContainer.eAllOfClass(typeof(DslService))
-	 *
*/ def static Iterator eAllOfClass(EObject obj, Class clazz) { obj?.eAll.filter(clazz) diff --git a/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/formatting2/TacticDDDLanguageFormatter.xtend b/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/formatting2/TacticDDDLanguageFormatter.xtend index ac292dce..22fe5a05 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/formatting2/TacticDDDLanguageFormatter.xtend +++ b/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/formatting2/TacticDDDLanguageFormatter.xtend @@ -15,8 +15,6 @@ */ package org.contextmapper.tactic.dsl.formatting2 -import com.google.inject.Inject -import org.contextmapper.tactic.dsl.services.TacticDDDLanguageGrammarAccess import org.contextmapper.tactic.dsl.tacticdsl.Attribute import org.contextmapper.tactic.dsl.tacticdsl.CommandEvent import org.contextmapper.tactic.dsl.tacticdsl.ComplexType @@ -34,8 +32,6 @@ import org.contextmapper.tactic.dsl.tacticdsl.ServiceOperation class TacticDDDLanguageFormatter extends AbstractFormatter2 { - @Inject extension TacticDDDLanguageGrammarAccess - def dispatch void format(Entity entity, extension IFormattableDocument document) { interior( entity.regionFor.keyword('{').append[newLine], diff --git a/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/validation/TacticDDDLanguageValidator.xtend b/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/validation/TacticDDDLanguageValidator.xtend index 4d798feb..4d8663da 100644 --- a/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/validation/TacticDDDLanguageValidator.xtend +++ b/org.contextmapper.dsl/src/org/contextmapper/tactic/dsl/validation/TacticDDDLanguageValidator.xtend @@ -47,7 +47,6 @@ import static org.contextmapper.tactic.dsl.tacticdsl.TacticdslPackage.Literals.* import static extension org.contextmapper.tactic.dsl.TacticDslExtensions.* import static extension org.eclipse.emf.ecore.util.EcoreUtil.* -import static extension org.eclipse.xtext.EcoreUtil2.* /** * Custom validation rules. @@ -56,12 +55,12 @@ import static extension org.eclipse.xtext.EcoreUtil2.* */ class TacticDDDLanguageValidator extends AbstractTacticDDDLanguageValidator implements IssueCodes { -private val DIGITS_PATTERN = Pattern.compile("[0-9]+[0-9]*") - private val SUPPORTED_PRIMITIVE_TYPES = new HashSet(asList("int", "long", "float", "double", "boolean")) - private val SUPPORTED_TEMPORAL_TYPES = new HashSet(asList("Date", "DateTime", "Timestamp")) - private val SUPPORTED_NUMERIC_TYPES = new HashSet( +val DIGITS_PATTERN = Pattern.compile("[0-9]+[0-9]*") + val SUPPORTED_PRIMITIVE_TYPES = new HashSet(asList("int", "long", "float", "double", "boolean")) + val SUPPORTED_TEMPORAL_TYPES = new HashSet(asList("Date", "DateTime", "Timestamp")) + val SUPPORTED_NUMERIC_TYPES = new HashSet( asList("int", "long", "float", "double", "Integer", "Long", "Float", "Double", "BigInteger", "BigDecimal")) - private val SUPPORTED_BOOLEAN_TYPES = new HashSet(asList("Boolean", "boolean")) + val SUPPORTED_BOOLEAN_TYPES = new HashSet(asList("Boolean", "boolean")) @Check def checkServiceNameStartsWithUpperCase(Service service) { diff --git a/pom.xml b/pom.xml index b43d0737..7d45c0eb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,24 @@ 4.0.0 org.contextmapper.dsl - 6.6.2-SNAPSHOT + 6.7.0-SNAPSHOT org.contextmapper.dsl.parent pom - 2.23.0 - 2.11.3 + 2.28.0 + 2.13.0 UTF-8 - 1.8 - 1.8 + 11 + 11 - 1.7.0 + 2.7.5 - - - - 1.7 + + + + + 3.1.0 org.contextmapper.dsl @@ -37,8 +38,49 @@ HEAD + + + + org.eclipse.xtext + xtext-dev-bom + ${xtextVersion} + pom + import + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + true + v@{project.version} + org.eclipse.tycho:tycho-versions-plugin:${tycho-version}:update-eclipse-metadata org.apache.maven.plugins:maven-scm-plugin:1.9.5:add org.apache.maven.plugins:maven-scm-plugin:1.9.5:checkin + org.eclipse.tycho:tycho-versions-plugin:${tycho-version}:update-eclipse-metadata org.apache.maven.plugins:maven-scm-plugin:1.9.5:add org.apache.maven.plugins:maven-scm-plugin:1.9.5:checkin + + + + org.apache.maven.plugins + maven-scm-plugin + 1.11.1 + + + default-cli + + add + checkin + + + **/META-INF/MANIFEST.MF,**/feature.xml,**/*.product,**/category.xml + **/target/** + [Tycho] Prepare for release: v${project.version} + + + + org.eclipse.tycho tycho-maven-plugin @@ -56,18 +98,10 @@ plugin-source - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho-version} - - source-feature - package + feature-source - source-feature + feature-source @@ -115,38 +149,38 @@ x86_64 + + + + eclipse-plugin + org.eclipse.xtext.logging + 1.2.19 + + + + eclipse-feature + org.eclipse.rcp + 0.0.0 + + + + eclipse-plugin + org.eclipse.jdt.compiler.apt + 0.0.0 + + + eclipse-plugin + org.eclipse.jdt.compiler.tool + 0.0.0 + + + - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - v@{project.version} - org.eclipse.tycho:tycho-versions-plugin:${tycho-version}:update-eclipse-metadata org.apache.maven.plugins:maven-scm-plugin:1.9.5:add org.apache.maven.plugins:maven-scm-plugin:1.9.5:checkin - org.eclipse.tycho:tycho-versions-plugin:${tycho-version}:update-eclipse-metadata org.apache.maven.plugins:maven-scm-plugin:1.9.5:add org.apache.maven.plugins:maven-scm-plugin:1.9.5:checkin - - - - org.apache.maven.plugins - maven-scm-plugin - 1.11.1 - - - default-cli - - add - checkin - - - **/META-INF/MANIFEST.MF,**/feature.xml,**/*.product,**/category.xml - **/target/** - [Tycho] Prepare for release: v${project.version} - - - - @@ -172,7 +206,7 @@ org.apache.maven.plugins maven-clean-plugin - 2.5 + 3.2.0 @@ -191,26 +225,6 @@ - - - - org.apache.maven.plugins - - - maven-resources-plugin - - - [2.4.3,) - - - resources - testResources - - - - - - @@ -230,48 +244,7 @@ - - - - - - - org.eclipse.tycho - - - tycho-compiler-plugin - - - [0.23.1,) - - - compile - - - - - - - - - - org.eclipse.tycho - - - tycho-packaging-plugin - - - [0.23.1,) - - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - + @@ -279,7 +252,7 @@ - @@ -301,7 +274,7 @@ ${tycho-version} - ${platformSystemProperties} ${systemProperties} ${moduleProperties} + ${platformSystemProperties} ${systemProperties} ${moduleProperties} ${additionalTestArguments} false false @@ -321,6 +294,32 @@ false + + + ossrh-snapshots + ossrh-snapshots + + false + + + false + + http://oss.sonatype.org/content/repositories/snapshots + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + false + + @@ -334,6 +333,28 @@ false + + ossrh-snapshots + ossrh-snapshots + + false + + + false + + http://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + false + + @@ -359,6 +380,5 @@ - - +