Commit 6063b51e authored by Johannes Visintini's avatar Johannes Visintini
Browse files

Merge branch 'update-parent-2.10' into 'master'

update parent to 2.10

See merge request !27
parents daa5e269 be7a6996
Pipeline #1783 passed with stage
in 0 seconds
......@@ -3,12 +3,12 @@
<component name="CheckStyle-IDEA">
<option name="configuration">
<map>
<entry key="active-configuration" value="HTTP_URL:https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/parent/raw/2.9/ohsome-codestyle/src/main/resources/checkstyle-google-ohsome.xml:ohsome Google Checks" />
<entry key="active-configuration" value="HTTP_URL:https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/parent/raw/2.10/ohsome-codestyle/src/main/resources/checkstyle-google-ohsome.xml:ohsome Google Checks" />
<entry key="checkstyle-version" value="8.35" />
<entry key="copy-libs" value="false" />
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
<entry key="location-2" value="HTTP_URL:https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/parent/raw/2.9/ohsome-codestyle/src/main/resources/checkstyle-google-ohsome.xml:ohsome Google Checks" />
<entry key="location-2" value="HTTP_URL:https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/parent/raw/2.10/ohsome-codestyle/src/main/resources/checkstyle-google-ohsome.xml:ohsome Google Checks" />
<entry key="property-2.org.checkstyle.google.suppressionfilter.config" value="" />
<entry key="property-2.org.checkstyle.google.suppressionxpathfilter.config" value="" />
<entry key="scan-before-checkin" value="false" />
......
Changelog
=========
## current master
## 2.10
* add timeout for Jenkins pipeline run
* define maven version to be >= 3.6
......
......@@ -11,7 +11,7 @@
<parent>
<groupId>org.heigit.ohsome</groupId>
<artifactId>ohsome-parent</artifactId>
<version>2.9</version>
<version>2.10</version>
<relativePath>../</relativePath>
</parent>
</project>
......@@ -5,7 +5,7 @@
<groupId>org.heigit.ohsome</groupId>
<artifactId>ohsome-parent</artifactId>
<version>2.9</version>
<version>2.10</version>
<packaging>pom</packaging>
<name>HeiGIT ohsome parent</name>
......@@ -166,7 +166,7 @@
<dependency>
<groupId>org.heigit.ohsome</groupId>
<artifactId>ohsome-codestyle</artifactId>
<version>2.9</version>
<version>2.10</version>
</dependency>
</dependencies>
</plugin>
......
  • jenkinsci/branch: The Jenkins CI build failed - Details

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment