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.

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

remove stargate parent pom #1351

Merged
merged 7 commits into from
Aug 23, 2024
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 64 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,42 +1,57 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.stargate</groupId>
<artifactId>sgv2-api-parent</artifactId>
<version>2.1.0-BETA-14</version>
</parent>
<groupId>io.stargate</groupId>
<artifactId>sgv2-jsonapi</artifactId>
<version>1.0.16-SNAPSHOT</version>
<properties>
<stargate.version>${project.parent.version}</stargate.version>
<!-- 17-May-2023, tatu: [json-api#172] Need at least Jackson 2.15.x -->
<!-- 16-Aug-2024, tatu: Quarkus depends on 2.17 already, but keep explicit -->
<jackson.version>2.17.2</jackson.version>
<!-- 14-Aug-2024, tatu: override here until Stargate gets to this version too -->
<!-- Quarkus -->
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.13.2</quarkus.platform.version>
<!-- miscellaneous -->
<wiremock.version>3.4.2</wiremock.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<!-- Please update github workflows that build docker images if changing image/additional tags -->
<quarkus.container-image.group>stargateio</quarkus.container-image.group>
<quarkus.container-image.name>jsonapi</quarkus.container-image.name>
<quarkus.container-image.tag>v${project.version}</quarkus.container-image.tag>
<quarkus.container-image.additional-tags>v1</quarkus.container-image.additional-tags>
<skipITs>false</skipITs>
<cassandra.version>4.0.11-591d171ac9c9</cassandra.version>
<!-- Integration test props -->
<!-- When updating please change defaults in the DseTestResource class -->
<stargate.int-test.cassandra.image>stargateio/dse-next</stargate.int-test.cassandra.image>
<!-- from Stargate persistence, latest as of 2024-01-24: -->
<stargate.int-test.cassandra.image-tag>${cassandra.version}</stargate.int-test.cassandra.image-tag>
<stargate.int-test.coordinator.image>stargateio/coordinator-dse-next</stargate.int-test.coordinator.image>
<stargate.int-test.coordinator.image-tag>v${stargate.version}</stargate.int-test.coordinator.image-tag>
<stargate.int-test.coordinator.image-tag>v2.1.0-BETA-14</stargate.int-test.coordinator.image-tag>
<stargate.int-test.cluster.name>dse-next-${stargate.int-test.cassandra.image-tag}-cluster</stargate.int-test.cluster.name>
<stargate.int-test.cluster.persistence>persistence-dse-next</stargate.int-test.cluster.persistence>
<stargate.int-test.cluster.dse>false</stargate.int-test.cluster.dse>
<stargate.int-test.cluster.hcd>false</stargate.int-test.cluster.hcd>
<stargate.int-test.cassandra.auth-enabled>true</stargate.int-test.cassandra.auth-enabled>
<stargate.int-test.use-coordinator>true</stargate.int-test.use-coordinator>
<!-- driver -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: driver -> Cassandra driver ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

solved, thanks

<driver.version>4.17.0</driver.version>
<!-- Compiler -->
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<!-- Encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Testing -->
<skipTests>false</skipTests>
<skipUnitTests>${skipTests}</skipUnitTests>
<surefire-plugin.version>3.3.0</surefire-plugin.version>
<skipITs>false</skipITs>



</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -216,6 +231,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.22.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -243,6 +259,45 @@
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<argLine>-Xmx4g</argLine>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
</systemPropertyVariables>
<excludes>
<exclude>**/*EndToEndTest.*</exclude>
Copy link
Contributor

@tatu-at-datastax tatu-at-datastax Aug 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove exclusion of EndToEndTest, I think? Can check other names too; I think we only need to exclude **/*IntegrationTest*

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

solved, thanks

<exclude>**/*IntegrationTest.*</exclude>
<exclude>**/*IT.*</exclude>
</excludes>
<skip>${skipUnitTests}</skip>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.23</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
Expand Down