From ddf1040e4085107cf401ed617ee224da289271c3 Mon Sep 17 00:00:00 2001 From: Nicky van Oorschot Date: Wed, 17 Jul 2019 16:05:10 +0200 Subject: [PATCH 1/3] #13 changed maven for coverage Added jacoco based on the blog but instead of using the test phase, used the package phase. --- app.hypermedia.testing.dsl/pom.xml | 567 ++++++++++++++++------------- 1 file changed, 307 insertions(+), 260 deletions(-) diff --git a/app.hypermedia.testing.dsl/pom.xml b/app.hypermedia.testing.dsl/pom.xml index 3f2a700..475bce0 100644 --- a/app.hypermedia.testing.dsl/pom.xml +++ b/app.hypermedia.testing.dsl/pom.xml @@ -1,264 +1,311 @@ - - 4.0.0 - - app.hypermedia.testing.dsl - app.hypermedia.testing.dsl.parent - 1.0.0-SNAPSHOT - - app.hypermedia.testing.dsl - jar + + 4.0.0 + + app.hypermedia.testing.dsl + app.hypermedia.testing.dsl.parent + 1.0.0-SNAPSHOT + + app.hypermedia.testing.dsl + jar - - - - org.codehaus.mojo - exec-maven-plugin - 1.4.0 - - - mwe2Launcher - generate-sources - - java - - - - - org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher - - /${project.basedir}/src/main/java/app/hypermedia/testing/dsl/GenerateCore.mwe2 - -p - rootPath=/${project.basedir}/.. - - compile - true - false - - - - org.eclipse.xtend - xtend-maven-plugin - + + + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + + + mwe2Launcher + generate-sources + + java + + + + + org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher + + /${project.basedir}/src/main/java/app/hypermedia/testing/dsl/GenerateCore.mwe2 + -p + rootPath=/${project.basedir}/.. + + compile + true + false + + - - org.apache.maven.plugins - maven-clean-plugin - - - - ${basedir}/../app.hypermedia.testing.dsl/src/main/xtext-gen/ - - **/* - - - - ${basedir}/../app.hypermedia.testing.dsl/src/test/xtext-gen/ - - **/* - - - - ${basedir}/../app.hypermedia.testing.dsl.ide/src/main/xtext-gen/ - - **/* - - - - ${basedir}/../app.hypermedia.testing.dsl.web/src/main/xtext-gen/ - - **/* - - - - ${basedir}/model/generated/ - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - initialize - - add-source - add-resource - - - - src/main/xtext-gen - - - - src/main/xtext-gen - - **/*.java - **/*.g - - - - - - - add-test-source - initialize - - add-test-source - add-test-resource - - - - src/test/xtext-gen - - - - src/test/xtext-gen - - **/*.java - - - - - - - - - maven-assembly-plugin - 3.1.0 - - - jar-with-ecore-model.xml - - false - - - - make-assembly - package - - single - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.2.1,) - - - java - - - - - - - - - - - - - + + org.jacoco + jacoco-maven-plugin + 0.8.2 - - - org.junit.jupiter - junit-jupiter-api - test - 5.3.2 - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.eclipse.xtext - org.eclipse.xtext.testing - ${xtextVersion} - test - - - org.eclipse.xtext - org.eclipse.xtext.xbase.testing - ${xtextVersion} - test - - - org.eclipse.xtext - org.eclipse.xtext - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - true - - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - true - - - org.eclipse.xtext - xtext-antlr-generator - true - - - commons-io - commons-io - 2.5 - - - io.github.json-snapshot - json-snapshot - 1.0.17 - - - org.json - json - 20180813 - - - org.assertj - assertj-core - - 3.11.1 - test - - - org.junit.jupiter - junit-jupiter-params - 5.5.0 - test - - + + + + pre-unit-test + + prepare-agent + + + + + post-unit-test + package + + report + + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + + + + + compile + testCompile + xtend-install-debug-info + xtend-test-install-debug-info + + + true + ${project.build.directory}/xtend-gen/main + ${project.build.directory}/xtend-gen/test + true + + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + ${basedir}/../app.hypermedia.testing.dsl/src/main/xtext-gen/ + + **/* + + + + ${basedir}/../app.hypermedia.testing.dsl/src/test/xtext-gen/ + + **/* + + + + ${basedir}/../app.hypermedia.testing.dsl.ide/src/main/xtext-gen/ + + **/* + + + + ${basedir}/../app.hypermedia.testing.dsl.web/src/main/xtext-gen/ + + **/* + + + + ${basedir}/model/generated/ + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + initialize + + add-source + add-resource + + + + src/main/xtext-gen + + + + src/main/xtext-gen + + **/*.java + **/*.g + + + + + + + add-test-source + initialize + + add-test-source + add-test-resource + + + + src/test/xtext-gen + + + + src/test/xtext-gen + + **/*.java + + + + + + + + + maven-assembly-plugin + 3.1.0 + + + jar-with-ecore-model.xml + + false + + + + make-assembly + package + + single + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + exec-maven-plugin + + + [1.2.1,) + + + java + + + + + + + + + + + + + + + + + org.junit.jupiter + junit-jupiter-api + test + 5.3.2 + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.eclipse.xtext + org.eclipse.xtext.testing + ${xtextVersion} + test + + + org.eclipse.xtext + org.eclipse.xtext.xbase.testing + ${xtextVersion} + test + + + org.eclipse.xtext + org.eclipse.xtext + ${xtextVersion} + + + org.eclipse.xtext + org.eclipse.xtext.xbase + ${xtextVersion} + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + ${xtextVersion} + true + + + org.eclipse.emf + org.eclipse.emf.mwe2.launch + true + + + org.eclipse.xtext + xtext-antlr-generator + true + + + commons-io + commons-io + 2.5 + + + io.github.json-snapshot + json-snapshot + 1.0.17 + + + org.json + json + 20180813 + + + org.assertj + assertj-core + + 3.11.1 + test + + + org.junit.jupiter + junit-jupiter-params + 5.5.0 + test + + From 00ea7269e68d106864876d8d4726f10e4ea50e34 Mon Sep 17 00:00:00 2001 From: tpluscode Date: Wed, 24 Jul 2019 17:35:24 +0200 Subject: [PATCH 2/3] ci: add codecove to travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..6490334 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,3 @@ language: java +after_success: + - bash <(curl -s https://codecov.io/bash) From 2373ab37f717c8aa2d215eec2750fb1107e6512d Mon Sep 17 00:00:00 2001 From: tpluscode Date: Wed, 24 Jul 2019 17:36:17 +0200 Subject: [PATCH 3/3] style: fix pom indentation --- app.hypermedia.testing.dsl/pom.xml | 602 ++++++++++++++--------------- 1 file changed, 301 insertions(+), 301 deletions(-) diff --git a/app.hypermedia.testing.dsl/pom.xml b/app.hypermedia.testing.dsl/pom.xml index 475bce0..fe8acfa 100644 --- a/app.hypermedia.testing.dsl/pom.xml +++ b/app.hypermedia.testing.dsl/pom.xml @@ -1,311 +1,311 @@ - 4.0.0 - - app.hypermedia.testing.dsl - app.hypermedia.testing.dsl.parent - 1.0.0-SNAPSHOT - - app.hypermedia.testing.dsl - jar + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + app.hypermedia.testing.dsl + app.hypermedia.testing.dsl.parent + 1.0.0-SNAPSHOT + + app.hypermedia.testing.dsl + jar - - - - org.codehaus.mojo - exec-maven-plugin - 1.4.0 - - - mwe2Launcher - generate-sources - - java - - - - - org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher - - /${project.basedir}/src/main/java/app/hypermedia/testing/dsl/GenerateCore.mwe2 - -p - rootPath=/${project.basedir}/.. - - compile - true - false - - + + + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + + + mwe2Launcher + generate-sources + + java + + + + + org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher + + /${project.basedir}/src/main/java/app/hypermedia/testing/dsl/GenerateCore.mwe2 + -p + rootPath=/${project.basedir}/.. + + compile + true + false + + - - org.jacoco - jacoco-maven-plugin - 0.8.2 + + org.jacoco + jacoco-maven-plugin + 0.8.2 - - - - pre-unit-test - - prepare-agent - - - - - post-unit-test - package - - report - - - + + + + pre-unit-test + + prepare-agent + + + + + post-unit-test + package + + report + + + - - + + - - org.eclipse.xtend - xtend-maven-plugin + + org.eclipse.xtend + xtend-maven-plugin - - - - compile - testCompile - xtend-install-debug-info - xtend-test-install-debug-info - - - true - ${project.build.directory}/xtend-gen/main - ${project.build.directory}/xtend-gen/test - true - - - - + + + + compile + testCompile + xtend-install-debug-info + xtend-test-install-debug-info + + + true + ${project.build.directory}/xtend-gen/main + ${project.build.directory}/xtend-gen/test + true + + + + - - org.apache.maven.plugins - maven-clean-plugin - - - - ${basedir}/../app.hypermedia.testing.dsl/src/main/xtext-gen/ - - **/* - - - - ${basedir}/../app.hypermedia.testing.dsl/src/test/xtext-gen/ - - **/* - - - - ${basedir}/../app.hypermedia.testing.dsl.ide/src/main/xtext-gen/ - - **/* - - - - ${basedir}/../app.hypermedia.testing.dsl.web/src/main/xtext-gen/ - - **/* - - - - ${basedir}/model/generated/ - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - initialize - - add-source - add-resource - - - - src/main/xtext-gen - - - - src/main/xtext-gen - - **/*.java - **/*.g - - - - - - - add-test-source - initialize - - add-test-source - add-test-resource - - - - src/test/xtext-gen - - - - src/test/xtext-gen - - **/*.java - - - - - - - - - maven-assembly-plugin - 3.1.0 - - - jar-with-ecore-model.xml - - false - - - - make-assembly - package - - single - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.2.1,) - - - java - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-clean-plugin + + + + ${basedir}/../app.hypermedia.testing.dsl/src/main/xtext-gen/ + + **/* + + + + ${basedir}/../app.hypermedia.testing.dsl/src/test/xtext-gen/ + + **/* + + + + ${basedir}/../app.hypermedia.testing.dsl.ide/src/main/xtext-gen/ + + **/* + + + + ${basedir}/../app.hypermedia.testing.dsl.web/src/main/xtext-gen/ + + **/* + + + + ${basedir}/model/generated/ + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + initialize + + add-source + add-resource + + + + src/main/xtext-gen + + + + src/main/xtext-gen + + **/*.java + **/*.g + + + + + + + add-test-source + initialize + + add-test-source + add-test-resource + + + + src/test/xtext-gen + + + + src/test/xtext-gen + + **/*.java + + + + + + + + + maven-assembly-plugin + 3.1.0 + + + jar-with-ecore-model.xml + + false + + + + make-assembly + package + + single + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + exec-maven-plugin + + + [1.2.1,) + + + java + + + + + + + + + + + + + - - - org.junit.jupiter - junit-jupiter-api - test - 5.3.2 - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.eclipse.xtext - org.eclipse.xtext.testing - ${xtextVersion} - test - - - org.eclipse.xtext - org.eclipse.xtext.xbase.testing - ${xtextVersion} - test - - - org.eclipse.xtext - org.eclipse.xtext - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtextVersion} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtextVersion} - true - - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - true - - - org.eclipse.xtext - xtext-antlr-generator - true - - - commons-io - commons-io - 2.5 - - - io.github.json-snapshot - json-snapshot - 1.0.17 - - - org.json - json - 20180813 - - - org.assertj - assertj-core - - 3.11.1 - test - - - org.junit.jupiter - junit-jupiter-params - 5.5.0 - test - - + + + org.junit.jupiter + junit-jupiter-api + test + 5.3.2 + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.eclipse.xtext + org.eclipse.xtext.testing + ${xtextVersion} + test + + + org.eclipse.xtext + org.eclipse.xtext.xbase.testing + ${xtextVersion} + test + + + org.eclipse.xtext + org.eclipse.xtext + ${xtextVersion} + + + org.eclipse.xtext + org.eclipse.xtext.xbase + ${xtextVersion} + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + ${xtextVersion} + true + + + org.eclipse.emf + org.eclipse.emf.mwe2.launch + true + + + org.eclipse.xtext + xtext-antlr-generator + true + + + commons-io + commons-io + 2.5 + + + io.github.json-snapshot + json-snapshot + 1.0.17 + + + org.json + json + 20180813 + + + org.assertj + assertj-core + + 3.11.1 + test + + + org.junit.jupiter + junit-jupiter-params + 5.5.0 + test + +