Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Switch to using java11 by default and update obtaining process … #517

Merged
merged 1 commit into from
Sep 29, 2023
Merged

feat: Switch to using java11 by default and update obtaining process … #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<selenium.version>3.12.0</selenium.version>
<kotlin.version>1.6.21</kotlin.version>
<exec.mainClass>org.jitsi.jibri.MainKt</exec.mainClass>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<jackson.version>2.9.5</jackson.version>
<junit.version>5.8.2</junit.version>
Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/org/jitsi/jibri/util/ProcessWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.jitsi.jibri.util

import org.jitsi.jibri.util.extensions.pidValue
import org.jitsi.utils.logging2.Logger
import org.jitsi.utils.logging2.createChildLogger
import java.io.InputStream
Expand Down Expand Up @@ -99,7 +98,7 @@ class ProcessWrapper(
// because we want them to read everything available from the
// process' inputstream. Once it's done, they'll read
// the EOF and close things up correctly
runtime.exec("kill -s SIGINT ${process.pidValue}")
runtime.exec("kill -s SIGINT ${process.pid()}")
}

/**
Expand Down
40 changes: 0 additions & 40 deletions src/main/kotlin/org/jitsi/jibri/util/extensions/Process.kt
View file
Open in desktop

This file was deleted.

Loading