Skip to content

Commit 2391819

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/oracle/soda/rdbms/impl/OracleCursorImpl.java
2 parents e5c36c2 + dbcf357 commit 2391819

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ Oracle gratefully acknowledges the contributions to SODA made by the community
9393

9494
### Getting in touch
9595

96-
Please open an issue [here](https://github.com/oracle/soda-for-java/issues), or post to the [ORDS, SODA, and JSON in the database forum](https://community.oracle.com/community/database/developer-tools/oracle_rest_data_services/) with SODA-FOR-JAVA in the subject line.
96+
Please open an issue [here](https://github.com/oracle/soda-for-java/issues), or post to the [ORDS, SODA, and JSON in the database forum](https://community.oracle.com/tech/developers/categories/oracle_rest_data_services) with SODA-FOR-JAVA in the subject line.

doc/Building-and-running-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The test framework is located in the /test directory under the root SODA directo
1313
in [Building the source code](https://github.com/oracle/soda-for-java/blob/master/doc/Building-source-code.md). Make sure you perform all steps described in this link. Specifically, make sure that the JAVA_HOME environment variable is set, and that the following jars are located in the /lib directory under the top level SODA directory (the one that contains LICENSE.txt):
1414

1515
* JDBC jar
16-
* javax.json-1.0.4.jar (JSR353 jar)
16+
* javax.json-1.1.4.jar (JSR353 jar)
1717
* junit-3.8.1.jar (JUnit jar)
1818
* orajsoda.jar (SODA Java jar)
1919

0 commit comments

Comments
 (0)