Skip to content

Commit

Permalink
Merge pull request #93 from GIScience/fix/make-ready-for-release
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelsJP
MichaelsJP authored Sep 25, 2023
2 parents 66e57e0 + 55804b0 commit 0970a68
Show file tree
Hide file tree
Showing 15 changed files with 142 additions and 128 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Embed GraphHopper with OpenStreetMap support into your Java application via the

```xml
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>[LATEST-VERSION]</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion client-hc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include the following Maven snippet:

```xml
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>directions-api-client-hc</artifactId>
<version>[CURRENT-VERSION]</version>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions client-hc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>directions-api-client-hc</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GraphHopper Directions API hand-crafted Java Client.</name>

<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-web-api</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand Down
10 changes: 5 additions & 5 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

<artifactId>graphhopper-core</artifactId>
<name>GraphHopper Core</name>
<version>4.0-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
<packaging>jar</packaging>
<description>
GraphHopper is a fast and memory efficient Java road routing engine
working seamlessly with OpenStreetMap data.
</description>
<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -36,9 +36,9 @@
</licenses>
<dependencies>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-web-api</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.carrotsearch</groupId>
Expand Down
34 changes: 17 additions & 17 deletions example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>graphhopper-example</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GraphHopper Example</name>

<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>

<!-- you can use this for logging or any slf4j log implementation -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>slf4j-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>slf4j-log4j12</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>log4j</groupId>-->
<!-- <artifactId>log4j</artifactId>-->
<!-- </dependency>-->
</dependencies>

</project>
6 changes: 3 additions & 3 deletions hmm-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>hmm-lib-external</artifactId>
<!-- SNAPSHOT is necessary otherwise it says: Deployment failed: repository element was not specified in the POM inside distributionManagement element-->
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
<packaging>jar</packaging>

<name>hmm-lib</name>
<description>Hidden Markov Model (HMM) library for time-inhomogeneous Markov processes</description>
<url>https://github.com/bmwcarit/hmm-lib</url>

<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion map-matching/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-map-matching</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
Expand Down
16 changes: 8 additions & 8 deletions map-matching/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-map-matching</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GraphHopper Map Matching</name>

<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>hmm-lib-external</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
14 changes: 7 additions & 7 deletions navigation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>graphhopper-nav</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GraphHopper Navigation</name>

<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0</version>
<version>4.7-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-web-api</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
Expand Down
60 changes: 43 additions & 17 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<name>GraphHopper Parent Project</name>
<version>4.0-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
<packaging>pom</packaging>
<url>https://www.graphhopper.com</url>
<inceptionYear>2012</inceptionYear>
Expand Down Expand Up @@ -307,15 +307,53 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.jfrog.buildinfo</groupId>
<artifactId>artifactory-maven-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>build-info</id>
<goals>
<goal>publish</goal>
</goals>
<configuration>
<artifactory>
<includeEnvVars>true</includeEnvVars>
<envVarsExcludePatterns>*password*,*secret*,*key*,*token*,*passphrase*</envVarsExcludePatterns>
<timeoutSec>60</timeoutSec>
</artifactory>
<publisher>
<contextUrl>https://repo.heigit.org/artifactory</contextUrl>
<username>${env.RT_USERNAME}</username>
<password>${env.RT_PASSWORD}</password>
<excludePatterns>*-tests.jar</excludePatterns>
<repoKey>libs-release-local</repoKey>
<snapshotRepoKey>libs-snapshot-local</snapshotRepoKey>
</publisher>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<distributionManagement>
<downloadUrl>https://repo.heigit.org/artifactory/</downloadUrl>
<repository>
<id>github</id>
<name>GitHub GraphHopper Apache Maven Packages</name>
<url>https://maven.pkg.github.com/graphhopper/graphhopper</url>
<id>releases</id>
<name>HeiGIT repository</name>
<uniqueVersion>false</uniqueVersion>
<url>https://repo.heigit.org/artifactory/libs-release-local</url>
<layout>default</layout>
</repository>
<snapshotRepository>
<id>snapshots</id>
<name>HeiGIT repository (snapshots)</name>
<uniqueVersion>true</uniqueVersion>
<url>https://repo.heigit.org/artifactory/libs-snapshot-local</url>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>

<!-- mvn clean deploy -P release -->
Expand All @@ -341,18 +379,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions reader-gtfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
<name>GraphHopper Reader for Gtfs Data</name>

<parent>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-parent</artifactId>
<version>4.0-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -53,9 +53,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.graphhopper</groupId>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>${project.parent.version}</version>
<version>4.7-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
Loading

0 comments on commit 0970a68

Please sign in to comment.