Skip to content

Commit

Permalink
Bump version to 0.3.3; Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fruhland committed Aug 4, 2022
1 parent 60726dc commit 85d52da
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 23 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Transparent acceleration for Java NIO applications via [UCX](https://openucx.org
<p align="center">
<a href="https://travis-ci.com/github/hhu-bsinfo/hadroNIO"><img src="https://www.travis-ci.com/hhu-bsinfo/hadroNIO.svg?branch=main"></a>
<a href="https://openjdk.java.net/"><img src="https://img.shields.io/badge/java-8+-blue.svg"></a>
<a href="https://openucx.org/"><img src="https://img.shields.io/badge/ucx-1.13.0_rc1-blue.svg"></a>
<a href="https://openucx.org/"><img src="https://img.shields.io/badge/ucx-1.13.0-blue.svg"></a>
<a href="https://github.com/hhu-bsinfo/hadroNIO/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-GPLv3-orange.svg"></a>
</p>

Expand Down Expand Up @@ -41,19 +41,19 @@ cd hadroNIO/
./gradlew shadowJar
```

The JAR-file should now be located at `build/provider/libs/hadronio-0.3.2-SNAPSHOT-all.jar`.
The JAR-file should now be located at `build/provider/libs/hadronio-0.3.3-SNAPSHOT-all.jar`.

### Known issues

- Building hadroNIO with a Java version higher than 8, but then running it with a Java 8 JVM results in a `java.lang.NoSuchMethodError`, regarding the class `java.nio.ByteBuffer`. This happens, because the `ByteBuffer` overrides methods of its super class `Buffer` in Java 9+, while it relies on the implementations provided by `Buffer` in Java 8. If you come across this error, make sure to both build an run hadroNIO using Java 8, or use a newer version of Java altogether.

## Run instructions

To run hadroNIO, **UCX 1.13.0-rc1** needs to be installed on your system. See the [OpenUCX GitHub Repository](https://github.com/openucx/ucx) for information on how to build and install UCX.
To run hadroNIO, **UCX 1.13.0** needs to be installed on your system. See the [OpenUCX GitHub Repository](https://github.com/openucx/ucx) for information on how to build and install UCX.

To accelerate an existing Java application (e.g. `application.jar`), the hadroNIO JAR-file needs to be included in the classpath. Additionally, the property `java.nio.channels.spi.SelectorProvider` must be set to `de.hhu.bsinfo.hadronio.HadronioProvider`:
```shell
java -cp path/to/hadronio-0.3.2-SNAPSHOT-all.jar -Djava.nio.channels.spi.SelectorProvider=de.hhu.bsinfo.hadronio.HadronioProvider -jar application.jar
java -cp path/to/hadronio-0.3.3-SNAPSHOT-all.jar -Djava.nio.channels.spi.SelectorProvider=de.hhu.bsinfo.hadronio.HadronioProvider -jar application.jar
```

### Enable logging
Expand Down Expand Up @@ -266,7 +266,7 @@ repositories {
}
dependencies {
implementation 'de.hhu.bsinfo:hadronio:0.3.2'
implementation 'de.hhu.bsinfo:hadronio:0.3.3'
}
```

Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ buildscript {
}

ext {
projectVersion = '0.3.2' + (Boolean.valueOf(System.getProperty('release')) ? '' : '-SNAPSHOT')
projectVersion = '0.3.3' + (Boolean.valueOf(System.getProperty('release')) ? '' : '-SNAPSHOT')

buildConfigPluginVersion = '1.1.8'
gitVersionPluginVersion = '0.15.0'
shadowPluginVersion = '7.1.2'
protobufPluginVersion = '0.8.18'

jucxVersion = '1.13.0-rc2'
jucxVersion = '1.13.0'
infinileapVersion = '0.1.0-SNAPSHOT'
agronaVersion = '1.15.2'
agronaVersion = '1.16.0'
picocliVersion = '4.6.3'
kryoVersion = '5.3.0'
nettyVersion = '4.1.78.Final'
nettyVersion = '4.1.79.Final'
threadAffinityVersion = '3.20.0'
grpcVersion = '1.47.0'
protobufVersion = '3.21.1'
grpcVersion = '1.48.1'
protobufVersion = '3.21.4'
ycsbVersion = '0.17.0'
slf4jVersion = '1.7.36'
log4jVersion = '2.17.2'
junitJupiterVersion = '5.8.2'
log4jVersion = '2.18.0'
junitJupiterVersion = '5.9.0'
}

subprojects {
Expand All @@ -40,5 +40,5 @@ subprojects {
}

wrapper {
gradleVersion = "7.4.2"
gradleVersion = "7.5"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
5 changes: 3 additions & 2 deletions infinileap-binding/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
plugins {
// TODO: Reactive, once infinileap is compatible with Java 20
/*plugins {
id 'java-library'
}
Expand Down Expand Up @@ -30,4 +31,4 @@ dependencies {
test {
useJUnitPlatform()
}
}*/
Binary file removed infinileap-binding/core-0.1.0-SNAPSHOT.jar
Binary file not shown.

0 comments on commit 85d52da

Please sign in to comment.