Skip to content

Commit d329c29

Browse files
committed
Add an additional configuration option to the Java SDK compiler to fix compilation errors
1 parent 1fb029b commit d329c29

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,10 @@
1616
"ProcessMaker\\Package\\DockerExecutorJava\\DockerExecutorJavaServiceProvider"
1717
]
1818
}
19+
},
20+
"require": {
21+
"processmaker/processmaker": "4.*",
22+
"processmaker/packages": "4.*",
23+
"processmaker/package-webentry": "2.*"
1924
}
2025
}

src/DockerExecutorJavaServiceProvider.php

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
<?php
2+
23
namespace ProcessMaker\Package\DockerExecutorJava;
34

4-
use Illuminate\Support\Facades\Route;
5-
use Illuminate\Support\ServiceProvider;
6-
use ProcessMaker\Traits\PluginServiceProviderTrait;
7-
use ProcessMaker\Package\Packages\Events\PackageEvent;
8-
use ProcessMaker\Package\WebEntry\Listeners\PackageListener;
95
use ProcessMaker\Models\ScriptExecutor;
6+
use ProcessMaker\Package\Packages\Events\PackageEvent;
7+
use ProcessMaker\Package\DockerExecutorJava\Listeners\PackageListener;
8+
use ProcessMaker\Traits\PluginServiceProviderTrait;
9+
use Illuminate\Support\Facades\Artisan;
10+
use Illuminate\Support\ServiceProvider;
1011

1112
class DockerExecutorJavaServiceProvider extends ServiceProvider
1213
{
1314
use PluginServiceProviderTrait;
1415

1516
const version = '1.0.0'; // Required for PluginServiceProviderTrait
1617

17-
public function register()
18-
{
19-
}
18+
public function register() {}
2019

2120
/**
2221
* After all service provider's register methods have been called, your boot method
@@ -28,24 +27,26 @@ public function register()
2827
*/
2928
public function boot()
3029
{
31-
\Artisan::command('docker-executor-java:install', function () {
32-
$scriptExecutor = ScriptExecutor::install([
30+
Artisan::command('docker-executor-java:install', function () {
31+
ScriptExecutor::install([
3332
'language' => 'java',
3433
'title' => 'Java Executor',
3534
'description' => 'Default Java Executor',
3635
]);
3736

3837
// Build the instance image. This is the same as if you were to build it from the admin UI
39-
\Artisan::call('processmaker:build-script-executor java');
40-
38+
Artisan::call('processmaker:build-script-executor java');
39+
4140
// Restart the workers so they know about the new supported language
42-
\Artisan::call('horizon:terminate');
41+
Artisan::call('horizon:terminate');
4342
});
44-
45-
$config = [
43+
44+
config(['script-runners.java' => [
4645
'name' => 'Java',
47-
'runner' => 'JavaRunner',
4846
'mime_type' => 'application/java',
47+
'package_path' => __DIR__ . '/..',
48+
'package_version' => self::version,
49+
'runner' => 'JavaRunner',
4950
'options' => [
5051
'invokerPackage' => "ProcessMaker_Client",
5152
'modelPackage' => "ProcessMaker_Model",
@@ -58,10 +59,7 @@ public function boot()
5859
'RUN mvn clean install',
5960
'WORKDIR /opt/executor',
6061
],
61-
'package_path' => __DIR__ . '/..',
62-
'package_version' => self::version,
63-
];
64-
config(['script-runners.java' => $config]);
62+
]]);
6563

6664
$this->app['events']->listen(PackageEvent::class, PackageListener::class);
6765

0 commit comments

Comments
 (0)