From 55804b0c5dbd82f13f376c4be8d5afd8152de79f Mon Sep 17 00:00:00 2001 From: Julian Psotta Date: Mon, 25 Sep 2023 15:06:00 +0200 Subject: [PATCH] fix(pom): Rename the project --- README.md | 2 +- client-hc/README.md | 2 +- client-hc/pom.xml | 10 +++---- core/pom.xml | 10 +++---- example/pom.xml | 34 ++++++++++++------------ hmm-lib/pom.xml | 6 ++--- map-matching/README.md | 2 +- map-matching/pom.xml | 16 +++++------ navigation/pom.xml | 14 +++++----- pom.xml | 60 ++++++++++++++++++++++++++++++------------ reader-gtfs/pom.xml | 12 ++++----- tools/pom.xml | 40 ++++++++++++++-------------- web-api/pom.xml | 6 ++--- web-bundle/pom.xml | 26 +++++++++--------- web/pom.xml | 30 +++++++-------------- 15 files changed, 142 insertions(+), 128 deletions(-) diff --git a/README.md b/README.md index 299e0b70da5..f6c4017567a 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ Embed GraphHopper with OpenStreetMap support into your Java application via the ```xml - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core [LATEST-VERSION] diff --git a/client-hc/README.md b/client-hc/README.md index db785c5483f..35d1e79f559 100644 --- a/client-hc/README.md +++ b/client-hc/README.md @@ -6,7 +6,7 @@ include the following Maven snippet: ```xml - com.graphhopper + com.github.GIScience.graphhopper directions-api-client-hc [CURRENT-VERSION] diff --git a/client-hc/pom.xml b/client-hc/pom.xml index 6a4d04a9acf..af65df90298 100644 --- a/client-hc/pom.xml +++ b/client-hc/pom.xml @@ -22,21 +22,21 @@ 4.0.0 directions-api-client-hc - 4.0 + 4.7-SNAPSHOT jar GraphHopper Directions API hand-crafted Java Client. - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-web-api - ${project.parent.version} + 4.7-SNAPSHOT com.squareup.okhttp3 diff --git a/core/pom.xml b/core/pom.xml index 4d948942f5e..d97ba8393d4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,16 +5,16 @@ graphhopper-core GraphHopper Core - 4.0-SNAPSHOT + 4.7-SNAPSHOT jar GraphHopper is a fast and memory efficient Java road routing engine working seamlessly with OpenStreetMap data. - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0-SNAPSHOT + 4.7-SNAPSHOT @@ -36,9 +36,9 @@ - com.graphhopper + com.github.GIScience.graphhopper graphhopper-web-api - ${project.parent.version} + 4.7-SNAPSHOT com.carrotsearch diff --git a/example/pom.xml b/example/pom.xml index cd2546e5dc1..13bf070b6c7 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -5,36 +5,36 @@ 4.0.0 graphhopper-example - 4.0 + 4.7-SNAPSHOT jar GraphHopper Example - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - + + + + + + + + + + + + diff --git a/hmm-lib/pom.xml b/hmm-lib/pom.xml index c81478cb6ad..34e1386d15a 100644 --- a/hmm-lib/pom.xml +++ b/hmm-lib/pom.xml @@ -19,7 +19,7 @@ 4.0.0 hmm-lib-external - 4.0 + 4.7-SNAPSHOT jar hmm-lib @@ -27,9 +27,9 @@ https://github.com/bmwcarit/hmm-lib - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT diff --git a/map-matching/README.md b/map-matching/README.md index 9a2c3d35f47..dbbba35336a 100644 --- a/map-matching/README.md +++ b/map-matching/README.md @@ -36,7 +36,7 @@ of library functions to get an idea how to use map matching in your own project. Use this Maven dependency: ```xml - com.graphhopper + com.github.GIScience.graphhopper graphhopper-map-matching 3.0-SNAPSHOT diff --git a/map-matching/pom.xml b/map-matching/pom.xml index f51bb17052a..c44dfcb04d3 100644 --- a/map-matching/pom.xml +++ b/map-matching/pom.xml @@ -1,32 +1,32 @@ 4.0.0 - com.graphhopper + com.github.GIScience.graphhopper graphhopper-map-matching - 4.0 + 4.7-SNAPSHOT jar GraphHopper Map Matching - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT org.slf4j slf4j-api - com.graphhopper + com.github.GIScience.graphhopper hmm-lib-external - ${project.parent.version} + 4.7-SNAPSHOT ch.qos.logback diff --git a/navigation/pom.xml b/navigation/pom.xml index 1bfb0120b72..86a33229769 100644 --- a/navigation/pom.xml +++ b/navigation/pom.xml @@ -5,26 +5,26 @@ 4.0.0 graphhopper-nav - 4.0 + 4.7-SNAPSHOT jar GraphHopper Navigation - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-web-api - ${project.parent.version} + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT io.dropwizard diff --git a/pom.xml b/pom.xml index 61256a169d0..49c8c5d309f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent GraphHopper Parent Project - 4.0-SNAPSHOT + 4.7-SNAPSHOT pom https://www.graphhopper.com 2012 @@ -307,15 +307,53 @@ + + org.jfrog.buildinfo + artifactory-maven-plugin + 3.6.1 + + + build-info + + publish + + + + true + *password*,*secret*,*key*,*token*,*passphrase* + 60 + + + https://repo.heigit.org/artifactory + ${env.RT_USERNAME} + ${env.RT_PASSWORD} + *-tests.jar + libs-release-local + libs-snapshot-local + + + + + + https://repo.heigit.org/artifactory/ - github - GitHub GraphHopper Apache Maven Packages - https://maven.pkg.github.com/graphhopper/graphhopper + releases + HeiGIT repository + false + https://repo.heigit.org/artifactory/libs-release-local + default + + snapshots + HeiGIT repository (snapshots) + true + https://repo.heigit.org/artifactory/libs-snapshot-local + default + @@ -341,18 +379,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/reader-gtfs/pom.xml b/reader-gtfs/pom.xml index 2299246b4c2..231744d0d8b 100644 --- a/reader-gtfs/pom.xml +++ b/reader-gtfs/pom.xml @@ -8,16 +8,16 @@ GraphHopper Reader for Gtfs Data - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0-SNAPSHOT + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT com.google.guava @@ -53,9 +53,9 @@ test - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT test-jar test diff --git a/tools/pom.xml b/tools/pom.xml index b425ac19b7c..2fb8c07c605 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -8,9 +8,9 @@ GraphHopper Tools - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT package @@ -18,14 +18,14 @@ - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-web-api - ${project.parent.version} + 4.7-SNAPSHOT @@ -48,20 +48,20 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - runtime - - - log4j - log4j - runtime - + + + + + + + + + + + + + + diff --git a/web-api/pom.xml b/web-api/pom.xml index d029da38683..302fc0e37fa 100644 --- a/web-api/pom.xml +++ b/web-api/pom.xml @@ -5,14 +5,14 @@ 4.0.0 graphhopper-web-api jar - 4.0-SNAPSHOT + 4.7-SNAPSHOT GraphHopper Web API JSON Representation of the API classes - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0-SNAPSHOT + 4.7-SNAPSHOT diff --git a/web-bundle/pom.xml b/web-bundle/pom.xml index a59281060b0..700ec77818d 100644 --- a/web-bundle/pom.xml +++ b/web-bundle/pom.xml @@ -5,36 +5,36 @@ 4.0.0 graphhopper-web-bundle jar - 4.0 + 4.7-SNAPSHOT GraphHopper Dropwizard Bundle Use the GraphHopper routing engine as a web-service - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-web-api - ${project.parent.version} + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-core - ${project.parent.version} + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-reader-gtfs - ${project.parent.version} + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-map-matching - ${project.parent.version} + 4.7-SNAPSHOT @@ -116,9 +116,9 @@ - com.graphhopper + com.github.GIScience.graphhopper directions-api-client-hc - ${project.parent.version} + 4.7-SNAPSHOT test diff --git a/web/pom.xml b/web/pom.xml index cdf11431aa9..ecf24c4d2b2 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -5,14 +5,14 @@ 4.0.0 graphhopper-web jar - 4.0 + 4.7-SNAPSHOT GraphHopper Web Use the GraphHopper routing engine as a web-service - com.graphhopper + com.github.GIScience.graphhopper graphhopper-parent - 4.0 + 4.7-SNAPSHOT package @@ -28,14 +28,14 @@ dropwizard-assets - com.graphhopper + com.github.GIScience.graphhopper graphhopper-web-bundle - ${project.parent.version} + 4.7-SNAPSHOT - com.graphhopper + com.github.GIScience.graphhopper graphhopper-nav - ${project.parent.version} + 4.7-SNAPSHOT @@ -43,18 +43,6 @@ dropwizard-testing test - - - ch.poole - ConditionalRestrictionParser - ${crparser.version} - - - ch.poole - OpeningHoursParser - ${ohparser.version} - - org.hamcrest hamcrest-library @@ -64,9 +52,9 @@ - com.graphhopper + com.github.GIScience.graphhopper directions-api-client-hc - ${project.parent.version} + 4.7-SNAPSHOT test