diff options
| author | Andreas Fankhauser hiddenalpha.ch | 2024-09-25 13:49:54 +0200 |
|---|---|---|
| committer | Andreas Fankhauser hiddenalpha.ch | 2024-09-25 13:49:54 +0200 |
| commit | 136789a1f14cdc53d1287f1670c7e5e086de4e21 (patch) | |
| tree | a8379d89d139e48b54239dfdddd72f632d31565a /src/main/paisa-nonslim/patches/barman.patch | |
| parent | cb861ff9b25380e6aa6a4b7ef3e3f4352e260d7a (diff) | |
| parent | 54a051e1f3f3cb56a0ea6d5c8439b81093ababeb (diff) | |
| download | UnspecifiedGarbage-136789a1f14cdc53d1287f1670c7e5e086de4e21.zip UnspecifiedGarbage-136789a1f14cdc53d1287f1670c7e5e086de4e21.tar.gz | |
Merge remote-tracking branch 'gh-hiddenalpha/master'
Diffstat (limited to 'src/main/paisa-nonslim/patches/barman.patch')
| -rw-r--r-- | src/main/paisa-nonslim/patches/barman.patch | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/main/paisa-nonslim/patches/barman.patch b/src/main/paisa-nonslim/patches/barman.patch index f93ef4d..2ffb414 100644 --- a/src/main/paisa-nonslim/patches/barman.patch +++ b/src/main/paisa-nonslim/patches/barman.patch @@ -6,36 +6,20 @@ jslPipeline .checkout() .setBranchVersion() -- .buildMaven() -+ .buildMaven() +- .buildMaven([spotless: false]) ++ .buildMaven([spotless: false]) .runKarma() .withInstances([ instances: [ @@ -20,7 +20,7 @@ testInstance: [ services: [ - eagle: [version: '02.01.26.01-PR-379-SNAPSHOT'], -- platform: [version: '03.06.40.01-PR-388-SNAPSHOT'], + eagle: [version: '02.01.27.01-PR-379-SNAPSHOT'], +- platform: [version: '03.06.46.01-PR-388-SNAPSHOT'], + platform: [version: '${j21.platform.version}'], storage: [version: '00.24.00.00'], barman: [version: '%currentBranch%'] ] ---- a/pom.xml -+++ b/pom.xml -@@ -86,6 +86,11 @@ - <artifactId>linti</artifactId> - <version>${linti.version}</version> - </dependency> -+ <dependency> -+ <groupId>org.glassfish</groupId> -+ <artifactId>jakarta.el</artifactId> -+ <version>4.0.2</version> <!-- TODO move this version somewhere else --> -+ </dependency> - </dependencies> - </dependencyManagement> - - - |