Skip to content

Commit

Permalink
Merge branch 'master' into enforce_join_filter
Browse files Browse the repository at this point in the history
  • Loading branch information
wcekan authored Mar 25, 2020
2 parents 354297e + 045c192 commit a985f0f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion elide-contrib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>add-source-generate-sources</id>
Expand Down
2 changes: 1 addition & 1 deletion elide-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>add-source-generate-sources</id>
Expand Down
2 changes: 1 addition & 1 deletion elide-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<properties>
<parent.pom.dir>${project.basedir}/../..</parent.pom.dir>
<version.log4j>2.13.0</version.log4j>
<version.log4j>2.13.1</version.log4j>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion elide-standalone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<properties>
<!-- Versions -->
<logback.version>1.2.3</logback.version>
<metrics.version>4.1.2</metrics.version>
<metrics.version>4.1.5</metrics.version>

<!-- Settings -->
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@
<!-- dependency versions -->
<version.antlr4>4.8-1</version.antlr4>
<version.logback>1.2.3</version.logback>
<version.jetty>9.4.26.v20200117</version.jetty>
<version.jetty>9.4.27.v20200227</version.jetty>
<version.restassured>4.2.0</version.restassured>
<version.jackson>2.10.3</version.jackson>
<version.jersey>2.30</version.jersey>
<version.jersey>2.30.1</version.jersey>
<version.junit>5.6.0</version.junit>
<hibernate3.version>3.6.10.Final</hibernate3.version>
<version.mysql>8.0.19</version.mysql>
Expand Down

0 comments on commit a985f0f

Please sign in to comment.