From 8371bead1687bfa64cb81a659e4fd7358b115ca0 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 19 Apr 2021 16:15:58 +0200 Subject: [PATCH 1/4] speciy version range for OSHDB depenceny --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f85a7fa..a080bae 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 11 11 42.1.4 - 0.6.0 + [0.6.0,0.7.0-a0) -- GitLab From 55e75440bcb274f6ba6746425975c1fea383d189 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 14 Apr 2021 18:49:57 +0200 Subject: [PATCH 2/4] configure sonarcloud via jenkins plugin see also https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/parent/-/merge_requests/20 --- Jenkinsfile | 3 +++ pom.xml | 32 +------------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 05e26fd..4a95a58 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,6 +58,9 @@ pipeline { stage ('Reports and Statistics') { steps { script { + withSonarQubeEnv('sonarcloud GIScience/ohsome') { + sh "mvn sonar:sonar -Dsonar.branch.name=${env.BRANCH_NAME}" + } report_basedir = "/srv/reports/${REPO_NAME}/${VERSION}_${env.BRANCH_NAME}/${env.BUILD_NUMBER}_${LATEST_COMMIT_ID}" // jacoco diff --git a/pom.xml b/pom.xml index a080bae..d2f188e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,13 @@ org.heigit.ohsome ohsome-parent - 2.8 + 2.9 changeset-metadata 0.1-SNAPSHOT - 0.8.5 11 11 42.1.4 @@ -33,33 +32,4 @@ ${postgresql.version} - - - - jacoco - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - default-prepare-agent - - prepare-agent - - - - default-report - - report - - - - - - - - -- GitLab From 3cd25716ff4c4ce84f78459b09a140a2e681fd8f Mon Sep 17 00:00:00 2001 From: Johannes Visintini Date: Mon, 19 Apr 2021 18:47:35 +0200 Subject: [PATCH 3/4] add heigit maven repository --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index d2f188e..1e64892 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,17 @@ changeset-metadata 0.1-SNAPSHOT + + + + false + + oshdb-releases + Heigit/GIScience repository (releases) + https://repo.heigit.org/artifactory/libs-release-local + + + 11 11 -- GitLab From 0ddc04827b1e6f0e105e7b32a67f67a84696e17e Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 19 Apr 2021 19:29:06 +0200 Subject: [PATCH 4/4] add some general information to pom --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 1e64892..349b031 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,13 @@ changeset-metadata 0.1-SNAPSHOT + https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/changeset-metadata + + + https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/changeset-metadata + scm:git:https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/changeset-metadata.git + scm:git:ssh://git@gitlab.gistools.geog.uni-heidelberg.de:2022/giscience/big-data/ohsome/libs/changeset-metadata.git + -- GitLab