Skip to content

Commit

Permalink
Merge pull request #83 from ml054/v6.0
Browse files Browse the repository at this point in the history
V6.0
  • Loading branch information
ml054 authored Jan 12, 2024
2 parents 3594b8c + b287b4a commit 492c2ce
Show file tree
Hide file tree
Showing 542 changed files with 11,546 additions and 6,610 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/RavenClient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
schedule:
- cron: "0 10 * * 6"
push:
branches: [ v5.4 ]
branches: [ v6.0 ]
pull_request:
branches: [ v5.4 ]
branches: [ v6.0 ]

jobs:
build:
Expand All @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
java-version: [8, 11, 14, 16, 17, 21]
serverVersion: ["5.4", "6.0"]
serverVersion: ["6.0"]
fail-fast: false

steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<dependency>
<groupId>net.ravendb</groupId>
<artifactId>ravendb</artifactId>
<version>5.4.0</version>
<version>6.0.0</version>
</dependency>
```


### Gradle
```
implementation 'net.ravendb:ravendb:5.4.0'
implementation 'net.ravendb:ravendb:6.0.0'
```

## Documentation
Expand Down
91 changes: 63 additions & 28 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>net.ravendb</groupId>
<artifactId>ravendb</artifactId>
<version>5.4.3-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>

<name>RavenDB Java Client</name>
<description>RavenDB Java Client</description>
Expand Down Expand Up @@ -47,23 +47,33 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.0</version>
<version>5.10.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.5-11</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.2-jre</version>
<version>33.0.0-jre</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -73,37 +83,32 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<version>1.11.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.14</version>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<version>9.4.52.v20230823</version>
<version>9.4.53.v20231009</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
<version>2.16.1</version>
</dependency>


Expand All @@ -116,16 +121,26 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>3.25.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.70</version>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.77</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.11</version>
<scope>test</scope>
</dependency>

</dependencies>

<distributionManagement>
Expand All @@ -137,10 +152,30 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.2.5</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -153,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.0.1</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
<releaseProfiles>release</releaseProfiles>
Expand All @@ -163,7 +198,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<version>3.6.3</version>
<configuration>
<source>8</source>
</configuration>
Expand All @@ -179,7 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.12.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -189,7 +224,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -201,11 +236,11 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
<version>2.16.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.2.3</version>
</plugin>
</plugins>
</build>
Expand All @@ -217,7 +252,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
46 changes: 43 additions & 3 deletions src/main/java/net/ravendb/client/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ private Metadata() {}
public static final String CHANGE_VECTOR = "@change-vector";
public static final String EXPIRES = "@expires";
public static final String REFRESH = "@refresh";
public static final String ARCHIVE_AT = "@archive-at";
public static final String ARCHIVED = "@archived";
public static final String ALL_DOCUMENTS_COLLECTION = "@all_docs";

public static final String EMPTY_COLLECTION = "@empty";
Expand Down Expand Up @@ -57,6 +59,16 @@ private Spatial() {}
}
}

public static class Querying {
private Querying() {}

public static class Sharding {
private Sharding() {}

public static final String SHARD_CONTEXT_PARAMETER_NAME = "__shardContext";
}
}

public static class PeriodicBackup {

public static final String FULL_BACKUP_EXTENSION = "ravendb-full-backup";
Expand All @@ -74,6 +86,13 @@ public static class Folders {
}
}

public static class QueryString {
private QueryString() {}

public static final String NODE_TAG = "nodeTag";
public static final String SHARD_NUMBER = "shardNumber";
}

public static class Headers {
private Headers() {}

Expand All @@ -96,12 +115,36 @@ private Headers() {}

public static final String ETAG = "ETag";

public static final String IF_MATCH = "If-Match";
public static final String IF_NONE_MATCH = "If-None-Match";
public static final String TRANSFER_ENCODING = "Transfer-Encoding";
public static final String CONTENT_ENCODING = "Content-Encoding";

public static final String ACCEPT_ENCODING = "Accept-Encoding";
public static final String CONTENT_DISPOSITION = "Content-Disposition";

public static final String CONTENT_TYPE = "Content-Type";

public static final String CONTENT_LENGTH = "Content-Length";
public static final String INCREMENTAL_TIME_SERIES_PREFIX = "INC:";

public static final String ORIGIN = "Origin";

public static final String SHARDED = "Sharded";

public static final String ATTACHMENT_HASH = "Attachment-Hash";

public static final String ATTACHMENT_SIZE = "Attachment-Size";

public static final String DATABASE_MISSING = "Database-Missing";


public static class Encodings {
public static final String GZIP = "gzip";

public static final String ZSTD = "zstd";
}

}

public static class Configuration {
Expand Down Expand Up @@ -134,7 +177,4 @@ public static class Identities {
public static final Character DEFAULT_SEPARATOR = '/';
}

public static class Obsolete {
public static final String GRAPH_API = "Graph API will be removed in next major version of the product.";
}
}
Loading

0 comments on commit 492c2ce

Please sign in to comment.