Skip to content
This repository was archived by the owner on Nov 28, 2024. It is now read-only.

update to hibernate-ogm 5.3.0.Final #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion cassandra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<groupId>org.hibernate.ogm</groupId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@
*/
package org.hibernate.ogm.datastore.cassandra.query.impl;

import java.util.Map;

import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.Session;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.engine.query.spi.OrdinalParameterDescriptor;
import org.hibernate.engine.query.spi.ParameterMetadata;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Table;
import org.hibernate.ogm.dialect.query.spi.ParameterMetadataBuilder;
import org.hibernate.query.internal.ParameterMetadataImpl;
import org.hibernate.type.Type;

import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.Session;
import java.util.Map;

/**
* {@link ParameterMetadataBuilder} for native Cassandra CQL queries.
Expand All @@ -37,7 +36,7 @@ public CassandraParameterMetadataBuilder(Session session, Map<String, Table> met
}

@Override
public ParameterMetadata buildParameterMetadata(String nativeQuery) {
public ParameterMetadataImpl buildParameterMetadata(String nativeQuery) {
PreparedStatement preparedStatement = session.prepare( nativeQuery );
ColumnDefinitions columnDefinitions = preparedStatement.getVariables();
OrdinalParameterDescriptor[] ordinalDescriptors = new OrdinalParameterDescriptor[columnDefinitions.size()];
Expand All @@ -61,6 +60,6 @@ public ParameterMetadata buildParameterMetadata(String nativeQuery) {
}
}

return new ParameterMetadata( ordinalDescriptors, null );
return new ParameterMetadataImpl( ordinalDescriptors, null );
}
}
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion documentation/examples/gettingstarted/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>hibernate-ogm-cassandra-documentation-examples</artifactId>
<groupId>org.hibernate.ogm</groupId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
</parent>

<artifactId>hibernate-ogm-cassandra-documentation-examples-gettingstarted</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.transaction.TransactionManager;
import java.lang.invoke.MethodHandles;

public class DogBreedRunner {

private static final Log logger = LoggerFactory.make();
private static final Log logger = LoggerFactory.make( MethodHandles.lookup() );

public static void main(String[] args) {

Expand Down
2 changes: 1 addition & 1 deletion documentation/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hibernate-ogm-cassandra-documentation</artifactId>
<groupId>org.hibernate.ogm</groupId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hibernate-ogm-cassandra-documentation-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion documentation/javadoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-documentation</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion documentation/manual/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
</parent>

<artifactId>hibernate-ogm-cassandra-integrationtest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
36 changes: 27 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-bom</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.0.Final</version>
</parent>

<artifactId>hibernate-ogm-cassandra-parent</artifactId>
Expand Down Expand Up @@ -48,17 +48,17 @@
<skipUnitTests>false</skipUnitTests>

<!-- Cassandra -->
<cassandraVersion>3.1.0</cassandraVersion>
<cassandraVersion>3.3.2</cassandraVersion>
<!-- Update dependency versions accordingly when updating C* -->
<!--
The following versions are required for the Cassandra driver; We don't expose a managed versions
of these libraries through this BOM, these versions are for internal usage to make sure the right
JARs end up in the C* driver WildFly module
-->
<cassandraCodahaleMetricsVersion>3.1.2</cassandraCodahaleMetricsVersion>
<cassandraCodahaleMetricsVersion>3.3.2</cassandraCodahaleMetricsVersion>

<!-- Guava version for Cassandra-->
<cassandraGuavaVersion>16.0.1</cassandraGuavaVersion>
<cassandraGuavaVersion>23.0</cassandraGuavaVersion>

<!-- Target version of WildFly (for testing and JipiJapa integration) -->
<version.wildfly>10.1.0.Final</version.wildfly>
Expand Down Expand Up @@ -744,11 +744,29 @@
</pluginManagement>
</build>

<repositories>
<!--
To build Hibernate OGM you have to add the JBoss Maven repository to your settings.xml
See also http://community.jboss.org/wiki/OverviewofHibernateOGM
-->
<repositories>
<repository>
<id>jboss</id>
<name>JBoss nexus</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>jboss-snapshots</id>
<name>JBoss snapshots</name>
<url>https://snapshots.jboss.org/maven2/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<profiles>
Expand Down