mirror of
https://github.com/nosqlbench/nosqlbench.git
synced 2025-02-25 18:55:28 -06:00
merge fixups
This commit is contained in:
@@ -38,7 +38,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy</artifactId>
|
<artifactId>groovy</artifactId>
|
||||||
<version>3.0.9</version>
|
<version>3.0.10</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -1,3 +1,19 @@
|
|||||||
|
<!--
|
||||||
|
~ Copyright (c) 2022 nosqlbench
|
||||||
|
~
|
||||||
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
~ you may not use this file except in compliance with the License.
|
||||||
|
~ You may obtain a copy of the License at
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
~ See the License for the specific language governing permissions and
|
||||||
|
~ limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@@ -29,7 +45,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.amazonaws</groupId>
|
<groupId>com.amazonaws</groupId>
|
||||||
<artifactId>aws-java-sdk-dynamodb</artifactId>
|
<artifactId>aws-java-sdk-dynamodb</artifactId>
|
||||||
<version>1.12.129</version>
|
<version>1.12.233</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -1,3 +1,19 @@
|
|||||||
|
<!--
|
||||||
|
~ Copyright (c) 2022 nosqlbench
|
||||||
|
~
|
||||||
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
~ you may not use this file except in compliance with the License.
|
||||||
|
~ You may obtain a copy of the License at
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
~ See the License for the specific language governing permissions and
|
||||||
|
~ limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@@ -6,7 +22,7 @@
|
|||||||
<name>docsys</name>
|
<name>docsys</name>
|
||||||
<url>http://nosqlbench.io/</url>
|
<url>http://nosqlbench.io/</url>
|
||||||
<properties>
|
<properties>
|
||||||
<jersey.version>3.0.2</jersey.version>
|
<jersey.version>3.0.4</jersey.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
|
|||||||
@@ -94,7 +94,8 @@ public class StatementsOwner extends RawStmtFields {
|
|||||||
}};
|
}};
|
||||||
itemizedMaps.add(stmtDetails);
|
itemizedMaps.add(stmtDetails);
|
||||||
} else {
|
} else {
|
||||||
throw new RuntimeException("Unknown inner value type on map-based statement definition.");
|
throw new RuntimeException("Unknown inner value type on map-based statement definition: name:'" + entries.getKey() + "', type:'" +
|
||||||
|
entries.getValue().getClass() + "', only maps and strings are recognized.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setStatementsFieldByType(itemizedMaps);
|
setStatementsFieldByType(itemizedMaps);
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
<jaxb.api.version>2.4.0-b180830.0359</jaxb.api.version>
|
<jaxb.api.version>2.4.0-b180830.0359</jaxb.api.version>
|
||||||
<jaxb.core.version>2.3.0.1</jaxb.core.version>
|
<jaxb.core.version>2.3.0.1</jaxb.core.version>
|
||||||
<jaxb.impl.version>2.4.0-b180830.0438</jaxb.impl.version>
|
<jaxb.impl.version>2.4.0-b180830.0438</jaxb.impl.version>
|
||||||
<joda.time.version>2.10.13</joda.time.version>
|
<joda.time.version>2.10.14</joda.time.version>
|
||||||
<jmh.version>1.34</jmh.version>
|
<jmh.version>1.34</jmh.version>
|
||||||
<junit.jupiter.version>5.7.2</junit.jupiter.version>
|
<junit.jupiter.version>5.7.2</junit.jupiter.version>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user