Skip to content

Commit

Permalink
Update dependencies: checkstyle to 8.23, jmockit to 1.48, junit to 5.…
Browse files Browse the repository at this point in the history
…5.1, h2 to 1.4.199, hsqldb to 2.5.0, maven-project-info-reports-plugin to 3.0.0, maven-site-plugin so 3.8.2
  • Loading branch information
snuyanzin authored and julianhyde committed Sep 23, 2019
1 parent c47c709 commit d44f190
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
22 changes: 17 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<top.dir>${project.basedir}</top.dir>

<!-- The following list is sorted. -->
<checkstyle.version>8.22</checkstyle.version>
<checkstyle.version>8.23</checkstyle.version>
<docbkx-maven-plugin.version>2.0.17</docbkx-maven-plugin.version>
<forbiddenapis.version>2.6</forbiddenapis.version>
<h2.version>1.4.197</h2.version>
<h2.version>1.4.199</h2.version>
<hamcrest.version>2.1</hamcrest.version>
<hsqldb.version>2.4.1</hsqldb.version>
<hsqldb.version>2.5.0</hsqldb.version>
<jline.version>3.12.1</jline.version>
<jmockit.version>1.47</jmockit.version>
<junit.version>5.5.0</junit.version>
<jmockit.version>1.48</jmockit.version>
<junit.version>5.5.1</junit.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<maven.compiler.source>1.8</maven.compiler.source>
Expand All @@ -44,6 +44,8 @@
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.additionalOptions>-html5</maven-javadoc-plugin.additionalOptions>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-site-plugin.version>3.8.2</maven-site-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<scott-data-hsqldb.version>0.1</scott-data-hsqldb.version>
<skip.docbkx>false</skip.docbkx>
Expand Down Expand Up @@ -311,6 +313,16 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin.version}</version>
</plugin>
</plugins>

<pluginManagement>
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/sqlline/SqlLineArgsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public void testNull() {
@Test
public void testScan() {
final String expectedLine0 = "Compliant Version Driver Class";
final String expectedLine1 = "yes 2.4 org.hsqldb.jdbc.JDBCDriver";
final String expectedLine1 = "yes 2.5 org.hsqldb.jdbc.JDBCDriver";
checkScriptFile("!scan\n", false,
equalTo(SqlLine.Status.OK),
allOf(containsString(expectedLine0), containsString(expectedLine1)));
Expand Down Expand Up @@ -1983,7 +1983,7 @@ public List<String> allowedDrivers() {
+ " sqlline.extensions.CustomApplication\n"
+ "!scan";
checkScriptFile(script, true, equalTo(SqlLine.Status.OK),
allOf(containsString("yes 2.4 org.hsqldb.jdbc.JDBCDriver"),
allOf(containsString("yes 2.5 org.hsqldb.jdbc.JDBCDriver"),
not(containsString("org.h2.Driver"))));
}

Expand Down Expand Up @@ -2117,8 +2117,8 @@ public void testRerun() {

sqlLine.runCommands(dc, "!/ 1");
String output = os.toString("UTF8");
final String expected0 = "+----------------------------+";
final String expected1 = "| C1 |";
final String expected0 = "+----------------------------";
final String expected1 = "C1";
final String expected2 = "1 row selected";
assertThat(output,
allOf(containsString(expected0),
Expand Down

0 comments on commit d44f190

Please sign in to comment.