Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

java formatting, hop and dependency upgrades #13

Merged
merged 3 commits into from
Jun 3, 2024
Merged

java formatting, hop and dependency upgrades #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f858b5d
resolve merge conflicts
bamaer Jun 1, 2024
a11f0e4
updated github action for java 17
bamaer Jun 1, 2024
6f5129c
more version updates
bamaer Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDK 17
uses: actions/setup-java@v4.2.1
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Verify with Maven
Expand All @@ -31,4 +31,4 @@ jobs:
- uses: actions/upload-artifact@v3
with:
name: Upload artifact
path: staging
path: staging
14 changes: 7 additions & 7 deletions concave-hull/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.atolcd.gis</groupId>
<artifactId>concave-hull</artifactId>
<version>1.1</version>
<version>1.1.0</version>
<packaging>jar</packaging>

<name>AtolCD concave-hull</name>
Expand All @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<build>
Expand All @@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>11</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -44,7 +44,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.18.1</version>
<version>1.22.0</version>
</googleJavaFormat>
</java>
</configuration>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
</dependencies>

Expand Down
12 changes: 6 additions & 6 deletions dxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<build>
Expand All @@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -44,7 +44,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.18.1</version>
<version>1.22.0</version>
</googleJavaFormat>
</java>
</configuration>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
<!-- In the local repository -->
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions geojson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<build>
Expand All @@ -23,8 +23,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -44,7 +44,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.18.1</version>
<version>1.22.0</version>
</googleJavaFormat>
</java>
</configuration>
Expand Down Expand Up @@ -94,22 +94,22 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.10.1</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.10.1</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.4</version>
<version>2.17.1</version>
</dependency>
</dependencies>

Expand Down
14 changes: 7 additions & 7 deletions gpx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<build>
Expand All @@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -44,7 +44,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.18.1</version>
<version>1.22.0</version>
</googleJavaFormat>
</java>
</configuration>
Expand Down Expand Up @@ -94,12 +94,12 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
<version>2.0.6.1</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions hop-gis-plugins/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.13.0</version>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -68,13 +68,13 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>

<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.commands</artifactId>
<version>3.9.600</version>
<version>3.12.0</version>
</dependency>

</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions mifmid/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<build>
Expand All @@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -44,7 +44,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.18.1</version>
<version>1.22.0</version>
</googleJavaFormat>
</java>
</configuration>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
</dependencies>

Expand Down
17 changes: 8 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,21 @@

<properties>
<!-- Set this to the Hop version you want to debug against-->
<hop.version>2.7.0-SNAPSHOT</hop.version>
<hop.version>2.10.0-SNAPSHOT</hop.version>

<!-- Path You will be using to debug the application >
<hop.debug.path>TODO ?</hop.debug.path-->

<!-- Third-party dependencies-->
<org.eclipse.platform.version>3.122.0</org.eclipse.platform.version>
<org.eclipse.platform.version>3.123.0</org.eclipse.platform.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>

<!-- Jandex For annotation Detection -->
<jandex.version>3.0.5</jandex.version>
<jandex.version>3.1.0</jandex.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>

<spotless.version>2.43.0</spotless.version>
</properties>

<modules>
Expand Down Expand Up @@ -236,7 +235,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.23</version>
<version>42.7.3</version>
</dependency>
<dependency>
<groupId>net.postgis</groupId>
Expand All @@ -246,7 +245,7 @@
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2.0.1</version>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>net.postgis</groupId>
Expand Down Expand Up @@ -276,7 +275,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>org.locationtech.spatial4j</groupId>
Expand Down Expand Up @@ -357,7 +356,7 @@
<dependency>
<groupId>com.atolcd.gis</groupId>
<artifactId>concave-hull</artifactId>
<version>1.1</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.atolcd.gis</groupId>
Expand Down
12 changes: 6 additions & 6 deletions shp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.version>2.40.0</spotless.version>
<spotless.version>2.43.0</spotless.version>
</properties>

<build>
Expand All @@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand All @@ -44,7 +44,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.18.1</version>
<version>1.22.0</version>
</googleJavaFormat>
</java>
</configuration>
Expand Down Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
<version>1.19.0</version>
</dependency>
</dependencies>

Expand Down