Skip to content

Commit 333391d

Browse files
karussellkarussell
committed
move to 'mvn set version' release for better tooling, graphhopper#1285
try to fix checkstyle removed plugin
1 parent 91b77f6 commit 333391d

File tree

12 files changed

+22
-45
lines changed

12 files changed

+22
-45
lines changed

‎.travis.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ sudo: false
44
env:
55
global:
66
- GPG_EXECUTABLE=gpg
7-
- BASEURL=https://www-eu.apache.org/dist/maven/maven-3/VERSION/binaries/apache-maven-VERSION-bin.zip
8-
- FILE=apache-maven-VERSION-bin.zip
9-
- DIR=apache-maven-VERSION
10-
- VERSION=3.3.9
117
# TODO move this into the travis settings
128
- secure: "j6a61/qnfFcSjx5XxmxO2hqBOwtVx5HWrD1+4Atl7WG/pRKz9+jSga1Y7oDAFb2SIl8S65kDmPQB/vC8aHxUDj/Wizjxnxn1FhPqoe9yO6Ztft+984FKFyvj7s6tsBJKcehGec+chTOwZQpH4oI4rU6IlepDHnGLHiOd0Iviryg="
139
- secure: "GiFr+v2lTQk/sTQB7CYjju1/mupS8LSJupmizLqY454utiZkabDMBOZQnF9ukpy7WhveB9hKQyEKf9iP2w7HSYEjgvogT26vZ5f2MeLnR4SWvqEtf/WBvvh+W+k/rb2f6YgitkB4Jlxn2izemBEDuKplGJphzGW41lf8XZ2IxVI="
@@ -33,13 +29,6 @@ install: true
3329
before_install:
3430
- if [ ! -z "$GPG_SECRET_KEYS" ]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi
3531
- if [ ! -z "$GPG_OWNERTRUST" ]; then echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi
36-
# update maven
37-
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
38-
wget -q --no-check-certificate $(echo -n $BASEURL | sed -e 's#VERSION#'$VERSION'#g');
39-
unzip -qq $(echo -n $FILE | sed -e 's#VERSION#'$VERSION'#');
40-
export M2_HOME=$PWD/$(echo -n $DIR | sed -e 's#VERSION#'$VERSION'#');
41-
export PATH=$M2_HOME/bin:$PATH;
42-
fi
4332

4433
# avoid increase of memory via travis https://github.com/travis-ci/travis-ci/issues/8408
4534
before_script:
@@ -57,7 +46,8 @@ after_success:
5746
mvn deploy --settings core/files/settings.xml -DskipTests=true -B;
5847
elif [ "$TRAVIS_JDK_VERSION" == "openjdk8" ] && [ "$TRAVIS_TAG" != "" ]; then
5948
echo "release to maven central";
60-
mvn -P release --settings core/files/settings.xml -DskipTests=true -Drevision=$TRAVIS_TAG -B deploy;
49+
mvn versions:set -DnewVersion=$TRAVIS_TAG -DgenerateBackupPoms=false;
50+
mvn deploy -P release --settings core/files/settings.xml -DskipTests=true -B;
6151
else
6252
echo "Not deploying artifacts for $TRAVIS_BRANCH";
6353
fi

‎android/app/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.graphhopper</groupId>
66
<artifactId>graphhopper-android</artifactId>
7-
<version>${revision}</version>
7+
<version>0.10-SNAPSHOT</version>
88
<name>GraphHopper Android</name>
99
<packaging>apk</packaging>
1010
<organization>
@@ -16,7 +16,7 @@
1616
<relativePath>../..</relativePath>
1717
<groupId>com.graphhopper</groupId>
1818
<artifactId>graphhopper-parent</artifactId>
19-
<version>${revision}</version>
19+
<version>0.10-SNAPSHOT</version>
2020
</parent>
2121
<properties>
2222
<vtm.version>0.9.2</vtm.version>

‎client-hc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323

2424
<groupId>com.graphhopper</groupId>
2525
<artifactId>directions-api-client-hc</artifactId>
26-
<version>${revision}</version>
26+
<version>0.10-SNAPSHOT</version>
2727
<packaging>jar</packaging>
2828
<name>GraphHopper Directions API hand-crafted Java Client.</name>
2929

3030
<parent>
3131
<groupId>com.graphhopper</groupId>
3232
<artifactId>graphhopper-parent</artifactId>
33-
<version>${revision}</version>
33+
<version>0.10-SNAPSHOT</version>
3434
</parent>
3535

3636
<properties>

‎core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-core</artifactId>
88
<name>GraphHopper Core</name>
9-
<version>${revision}</version>
9+
<version>0.10-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>
1212
GraphHopper is a fast and memory efficient Java road routing engine
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.graphhopper</groupId>
1717
<artifactId>graphhopper-parent</artifactId>
18-
<version>${revision}</version>
18+
<version>0.10-SNAPSHOT</version>
1919
</parent>
2020

2121
<properties>

‎graphhopper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ else
188188
fi
189189

190190
GRAPH=$DATADIR/$NAME-gh
191-
VERSION=$(grep '<revision' pom.xml | cut -d'>' -f2 | cut -d'<' -f1)
191+
VERSION=$(grep "<name>" -A 1 pom.xml | grep version | cut -d'>' -f2 | cut -d'<' -f1)
192192
JAR=tools/target/graphhopper-tools-$VERSION-jar-with-dependencies.jar
193193

194194
LINK=$(echo $NAME | tr '_' '/')

‎pom.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-parent</artifactId>
88
<name>GraphHopper Parent Project</name>
9-
<version>${revision}</version>
9+
<version>0.10-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111
<url>https://www.graphhopper.com</url>
1212
<inceptionYear>2012</inceptionYear>
@@ -20,7 +20,6 @@
2020
<commons-compress.version>1.12</commons-compress.version>
2121
<jackson.version>2.8.4</jackson.version>
2222
<maven.compiler.target>1.8</maven.compiler.target>
23-
<revision>0.11-SNAPSHOT</revision>
2423

2524
<org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
2625
<org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>
@@ -203,18 +202,6 @@
203202
</excludes>
204203
</configuration>
205204
</plugin>
206-
<plugin>
207-
<groupId>com.hbakkum.maven.plugins</groupId>
208-
<artifactId>resolve-parent-version-maven-plugin</artifactId>
209-
<version>0.7</version>
210-
<executions>
211-
<execution>
212-
<goals>
213-
<goal>resolve-parent-version</goal>
214-
</goals>
215-
</execution>
216-
</executions>
217-
</plugin>
218205
</plugins>
219206
</build>
220207

‎reader-gtfs/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-reader-gtfs</artifactId>
8-
<version>${revision}</version>
8+
<version>0.10-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>GraphHopper Reader for Gtfs Data</name>
1111

1212
<parent>
1313
<groupId>com.graphhopper</groupId>
1414
<artifactId>graphhopper-parent</artifactId>
15-
<version>${revision}</version>
15+
<version>0.10-SNAPSHOT</version>
1616
</parent>
1717

1818
<dependencies>

‎reader-json/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-reader-json</artifactId>
8-
<version>${revision}</version>
8+
<version>0.10-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>GraphHopper Reader JSON</name>
1111

1212
<parent>
1313
<groupId>com.graphhopper</groupId>
1414
<artifactId>graphhopper-parent</artifactId>
15-
<version>${revision}</version>
15+
<version>0.10-SNAPSHOT</version>
1616
</parent>
1717

1818
<dependencies>

‎reader-osm/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-reader-osm</artifactId>
8-
<version>${revision}</version>
8+
<version>0.10-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>GraphHopper Reader for OpenStreetMap Data</name>
1111

1212
<parent>
1313
<groupId>com.graphhopper</groupId>
1414
<artifactId>graphhopper-parent</artifactId>
15-
<version>${revision}</version>
15+
<version>0.10-SNAPSHOT</version>
1616
</parent>
1717

1818
<dependencies>

‎reader-shp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-reader-shp</artifactId>
8-
<version>${revision}</version>
8+
<version>0.10-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>GraphHopper Reader for Shapefile Data</name>
1111

@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>com.graphhopper</groupId>
1818
<artifactId>graphhopper-parent</artifactId>
19-
<version>${revision}</version>
19+
<version>0.10-SNAPSHOT</version>
2020
</parent>
2121

2222
<dependencies>

‎tools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-tools</artifactId>
8-
<version>${revision}</version>
8+
<version>0.10-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010
<name>GraphHopper Tools</name>
1111

1212
<parent>
1313
<groupId>com.graphhopper</groupId>
1414
<artifactId>graphhopper-parent</artifactId>
15-
<version>${revision}</version>
15+
<version>0.10-SNAPSHOT</version>
1616
</parent>
1717

1818
<dependencies>

‎web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<groupId>com.graphhopper</groupId>
77
<artifactId>graphhopper-web</artifactId>
88
<packaging>jar</packaging>
9-
<version>${revision}</version>
9+
<version>0.10-SNAPSHOT</version>
1010
<name>GraphHopper Web</name>
1111
<description>Use the GraphHopper routing engine as a web-service</description>
1212

1313
<parent>
1414
<groupId>com.graphhopper</groupId>
1515
<artifactId>graphhopper-parent</artifactId>
16-
<version>${revision}</version>
16+
<version>0.10-SNAPSHOT</version>
1717
</parent>
1818
<properties>
1919
<jetty.version>9.4.2.v20170220</jetty.version>

0 commit comments

Comments
 (0)