Skip to content

Commit b9824cb

Browse files
hessjcghessjcg
authored
Merge branch 'main' into gh-2243-instance-dns-lookup
2 parents 12b8c64 + 6881969 commit b9824cb

11 files changed

Lines changed: 58 additions & 62 deletions

File tree

‎build.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
SCRIPT_DIR=$(cd -P "$(dirname "$0")" >/dev/null 2>&1 && pwd)
1919
SCRIPT_FILE="${SCRIPT_DIR}/$(basename "$0")"
2020

21+
mvn_cmd=$SCRIPT_DIR/mvnw
22+
2123
##
2224
## Local Development
2325
##
@@ -26,12 +28,12 @@ SCRIPT_FILE="${SCRIPT_DIR}/$(basename "$0")"
2628

2729
## clean - Cleans the build output
2830
function clean() {
29-
mvn clean
31+
$mvn_cmd clean
3032
}
3133

3234
## build - Builds the project without running tests.
3335
function build() {
34-
mvn install -DskipTests=true
36+
$mvn_cmd install -DskipTests=true
3537
}
3638

3739
## test - Runs local unit tests.
@@ -46,7 +48,7 @@ function test() {
4648
sudo ifconfig lo0 alias 127.0.0.3 up
4749
fi
4850
fi
49-
mvn -P coverage test
51+
$mvn_cmd -P coverage test
5052
}
5153

5254
## e2e - Runs end-to-end integration tests.
@@ -70,18 +72,18 @@ function e2e_graalvm() {
7072

7173
## fix - Fixes java code format.
7274
function fix() {
73-
mvn com.coveo:fmt-maven-plugin:format
75+
$mvn_cmd com.coveo:fmt-maven-plugin:format
7476
}
7577

7678
## lint - runs the java lint
7779
function lint() {
78-
mvn -P lint install -DskipTests=true
80+
$mvn_cmd -P lint install -DskipTests=true
7981
}
8082

8183

8284
## deps - updates dependencies to the latest version
8385
function deps() {
84-
mvn versions:use-latest-versions
86+
$mvn_cmd versions:use-latest-versions
8587
find . -name 'pom.xml.versionsBackup' -print0 | xargs -0 rm -f
8688
}
8789

‎core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
<dependency>
6262
<groupId>com.github.jnr</groupId>
6363
<artifactId>jnr-enxio</artifactId>
64-
<version>0.32.18</version>
64+
<version>0.32.19</version>
6565
</dependency>
6666

6767
<dependency>
6868
<groupId>com.github.jnr</groupId>
6969
<artifactId>jnr-unixsocket</artifactId>
70-
<version>0.38.23</version>
70+
<version>0.38.24</version>
7171
<exclusions>
7272
<exclusion>
7373
<groupId>org.ow2.asm</groupId>

‎jdbc/mariadb/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.mariadb.jdbc</groupId>
5151
<artifactId>mariadb-java-client</artifactId>
52-
<version>3.5.5</version>
52+
<version>3.5.7</version>
5353
<exclusions>
5454
<exclusion>
5555
<groupId>org.slf4j</groupId>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>org.mariadb.jdbc</groupId>
8989
<artifactId>mariadb-java-client</artifactId>
90-
<version>3.5.5</version>
90+
<version>3.5.7</version>
9191
</dependency>
9292
</dependencies>
9393
</profile>
@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>org.mariadb.jdbc</groupId>
103103
<artifactId>mariadb-java-client</artifactId>
104-
<version>3.5.5</version>
104+
<version>3.5.7</version>
105105
</dependency>
106106
</dependencies>
107107
</profile>

‎jdbc/mysql-j-8/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.mysql</groupId>
5555
<artifactId>mysql-connector-j</artifactId>
56-
<version>9.4.0</version>
56+
<version>9.5.0</version>
5757
<scope>provided</scope>
5858
</dependency>
5959
<dependency>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>com.mysql</groupId>
8888
<artifactId>mysql-connector-j</artifactId>
89-
<version>9.4.0</version>
89+
<version>9.5.0</version>
9090
</dependency>
9191
</dependencies>
9292
</profile>
@@ -100,7 +100,7 @@
100100
<dependency>
101101
<groupId>com.mysql</groupId>
102102
<artifactId>mysql-connector-j</artifactId>
103-
<version>9.4.0</version>
103+
<version>9.5.0</version>
104104
</dependency>
105105
</dependencies>
106106
</profile>

‎jdbc/postgres/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.postgresql</groupId>
5151
<artifactId>postgresql</artifactId>
52-
<version>42.7.7</version>
52+
<version>42.7.8</version>
5353
<scope>provided</scope>
5454
</dependency>
5555
<dependency>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>org.postgresql</groupId>
8888
<artifactId>postgresql</artifactId>
89-
<version>42.7.7</version>
89+
<version>42.7.8</version>
9090
</dependency>
9191
</dependencies>
9292
</profile>
@@ -100,7 +100,7 @@
100100
<dependency>
101101
<groupId>org.postgresql</groupId>
102102
<artifactId>postgresql</artifactId>
103-
<version>42.7.7</version>
103+
<version>42.7.8</version>
104104
</dependency>
105105
</dependencies>
106106
</profile>

‎jdbc/sqlserver/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.microsoft.sqlserver</groupId>
5151
<artifactId>mssql-jdbc</artifactId>
52-
<version>13.2.0.jre8</version>
52+
<version>13.2.1.jre8</version>
5353
<scope>provided</scope>
5454
<exclusions>
5555
<exclusion>
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.microsoft.sqlserver</groupId>
9898
<artifactId>mssql-jdbc</artifactId>
99-
<version>13.2.0.jre8</version>
99+
<version>13.2.1.jre8</version>
100100
</dependency>
101101
</dependencies>
102102
</profile>

0 commit comments

Comments
 (0)