Skip to content

Commit

Permalink
support springboot3 javadoc (#827)
Browse files Browse the repository at this point in the history
* Ark2.0 support Netty plugin (#653)

* Ark support Netty plugin

* fix mvn issue

* fix pom issue

---------

Co-authored-by: Xuhao Wang <1023605039@qq.com>
Co-authored-by: leo james <leojames.googol@gmail.com>
Co-authored-by: yuanyuancin <yuancin@163.com>

(cherry picked from commit 362f9a8)

* Bump org.springframework.boot:spring-boot-starter-webflux from 2.1.0.RELEASE to 2.5.12 in /sofa-ark-plugin/netty-ark-plugin (#785)

* Bump org.springframework.boot:spring-boot-starter-webflux

Bumps [org.springframework.boot:spring-boot-starter-webflux](https://github.com/spring-projects/spring-boot) from 2.1.0.RELEASE to 2.5.12.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.1.0.RELEASE...v2.5.12)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-webflux
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update pom.xml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 6a9f471)

* support spring cloud for base (#784)

* support .* for exclude

* support .* for exclude

* support spring cloud

* update to 2.2.5-SNAPSHOT

* remove duplicate version properties setting

* update to 2.2.5

(cherry picked from commit cefc679)

* update guava or netty (#788)

* support .* for exclude

* support .* for exclude

* update version

(cherry picked from commit ef684f6)

* Optimize to support spring webflux in ark (#798)

* extend ArkNettyReactiveWebServerFactory

* fix biz override master ReactorHttpHandlerAdapter

* fix Port in use

* fix base service faile when biz uninstalled

* fix the biz service is still accessible after biz was uninstalled

* change version to 2.2.5

* remove unuse code

* disposableServer dispose when master stopping

* fix ut,sofa-ark-springboot-starter dependent reactor-netty, change netty-handler version

* fix ci check

---------

Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com>
Co-authored-by: leo james <leojames.googol@gmail.com>

(cherry picked from commit 361d445)

* Create cloud_code_scan.yml (#797)

Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 584ac7c)

* Add a newFile method to handle file paths with spaces. (#803)

(cherry picked from commit 9c37315)

* enable override for plugin (#790)

* support .* for exclude

* support .* for exclude

* enable override for plugin

* optimize static import

* enable classpath for plugin

* add test for override

* remove unused import

* format

* update 2.2.5-SNAPSHOT

(cherry picked from commit 7de1384)

* Export plugin project classes by default (#799)

* feat: export plugin classes by default.

* feat: export plugin classes by default.

* feat: export plugin classes by default.

* feat: export plugin package by default.

* feat: export plugin package by default.

* default add all packages for plugin

* format

---------

Co-authored-by: yanhuai.yh <yanhuai.yh@antgroup.com>
Co-authored-by: leojames <leojames.googol@gmail.com>
(cherry picked from commit 4ade973)

* 插件内部将参数解析成set,避免对maven版本有要求 (#805)

(cherry picked from commit a491814)

* support biz multi context for logback (#807)

Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com>

(cherry picked from commit 52910e5)

* Add ut 1221 (#813)

* add ut

* add tests

* update test

* update format

* update test

* update jarutils test

* update tests

* update tests

* update web server test

* update tests

* update tests

* update test

* update test

* update tests

* update tests

* update format

* update tests

* update test

---------

Co-authored-by: LiuYu <ly109106@alibaba-inc.com>
(cherry picked from commit bb17be2)

* Avoid biz logger context being attached early,support for logback (#816)

* Avoid biz logger context being attached early,support for logback

* format

* fix ut

---------

Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com>
(cherry picked from commit 3fca4a6)

* default exclude pack rules (#814)

* default exclude pack rules

* formar

---------

Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com>
Co-authored-by: leo james <leojames.googol@gmail.com>
(cherry picked from commit 7ec6184)

* Add ut 1221 (#817)

* add ut

* add tests

* update test

* update format

* update test

* update jarutils test

* update tests

* update tests

* update web server test

* update tests

* update tests

* update test

* update test

* update tests

* update tests

* update format

* update tests

* update test

* update tests

* update test

* Delete sofa-ark-parent/core/common/C:\temp dir\b\c directory

* update test

* update test

---------

Co-authored-by: LiuYu <ly109106@alibaba-inc.com>
(cherry picked from commit dfef361)

* support delegate from classLoaderHook for getResourceAsStream (#811)

* support delegate from classLoaderHook for getResourceAsStream

* rm guice-multibinding

* remove guice multi binding lib

* Revert "support delegate from classLoaderHook for getResourceAsStream"

This reverts commit 5bd306b.

* fix typo

* remove guice-multibinding

* fix format

(cherry picked from commit 3bcf96f)

* plugin default export package without activator, modify to set (#818)

* support delegate from classLoaderHook for getResourceAsStream

* Revert "support delegate from classLoaderHook for getResourceAsStream"

This reverts commit 5bd306b.

* fix typo

* plugin default export package without activator, modify to set

* fix format

(cherry picked from commit 9c5ce37)

* modify plugin export with classes as default (#819)

* support delegate from classLoaderHook for getResourceAsStream

* Revert "support delegate from classLoaderHook for getResourceAsStream"

This reverts commit 5bd306b.

* fix typo

* plugin default export package without activator, modify to set

* fix format

* export class for plugin as default

(cherry picked from commit ef9584d)

* Add ut 1221 (#820)

* add ut

* add tests

* update test

* update format

* update test

* update jarutils test

* update tests

* update tests

* update web server test

* update tests

* update tests

* update test

* update test

* update tests

* update tests

* update format

* update tests

* update test

* update tests

* update test

* Delete sofa-ark-parent/core/common/C:\temp dir\b\c directory

* update test

* update test

* update tesst

* update test

* update test

* update test

* update test

* update test

* update test

* update test

---------

Co-authored-by: LiuYu <ly109106@alibaba-inc.com>
(cherry picked from commit c3192d0)

* 1. update 2.2.7-SNAPSHOT (#823)

2. support SpringBoot 3.2.0 new LaunchedURLClassLoader class

Co-authored-by: 致节 <hzj266771@antgroup.com>

(cherry picked from commit 11f5507)

* Add ut 1221 (#824)

* add ut

* add tests

* update test

* update format

* update test

* update jarutils test

* update tests

* update tests

* update web server test

* update tests

* update tests

* update test

* update test

* update tests

* update tests

* update format

* update tests

* update test

* update tests

* update test

* Delete sofa-ark-parent/core/common/C:\temp dir\b\c directory

* update test

* update test

* update tesst

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

---------

Co-authored-by: LiuYu <ly109106@alibaba-inc.com>
(cherry picked from commit bc52a4c)

* update javadoc to support multi jdk env

* ut for the target jdk17 branch

* update logback

* remove logback context selector adapter, cause it had beed abandoned by qos-ch/logback#765

* fix autoconfiguration

* ark logger lazy init (#829)

* support delegate from classLoaderHook for getResourceAsStream

* Revert "support delegate from classLoaderHook for getResourceAsStream"

This reverts commit 5bd306b.

* fix typo

* plugin default export package without activator, modify to set

* fix format

* export class for plugin as default

* update to 2.2.6

* ark logger lazy init

* format

(cherry picked from commit 368a8be)

* fix windows mvn goal parse (#831)

* update to 2.2.7

* fix windows mvn goal parse

(cherry picked from commit 6a97493)

* enable sub bundle pom analysis first

* remove unused imports

(cherry picked from commit b3133d4)

* modify github to httpbin

(cherry picked from commit f8d2b07)

* support run mvn tree in test

(cherry picked from commit 34580be)

* 支持对tomcat进行配置 (#839)

Co-authored-by: 巨鹿 <yanwen@cai-inc.com>

(cherry picked from commit 1b2ac68)

* Update inactive_issues_robot.yml (#840)

(cherry picked from commit 4f8c7d6)

* modify test for zip fill to support jdk9+

* fix export import config

* support multi sdk

* format test

* add guice lib

---------

Co-authored-by: FanYang <399284508@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: yuanyuancin <yuancin@163.com>
Co-authored-by: Duan-0916 <76544421+Duan-0916@users.noreply.github.com>
Co-authored-by: FlyAbner <776070848@qq.com>
Co-authored-by: Yan Huai <compasty@163.com>
Co-authored-by: Liu Jing <anderson.liuj@antfin.com>
Co-authored-by: lylingzhen <101314559+lylingzhen@users.noreply.github.com>
Co-authored-by: HzjNeverStop <441627022@qq.com>
Co-authored-by: 巨鹿 <290584697@qq.com>
  • Loading branch information
11 people authored Feb 1, 2024
1 parent 75ac143 commit ffdda25
Show file tree
Hide file tree
Showing 134 changed files with 4,410 additions and 1,251 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/cloud_code_scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Alipay Cloud Devops Codescan
on:
pull_request_target:
jobs:
stc: # Code security scanning
runs-on: ubuntu-latest
steps:
- name: codeScan
uses: layotto/alipay-cloud-devops-codescan@main
with:
parent_uid: ${{ secrets.ALI_PID }}
private_key: ${{ secrets.ALI_PK }}
scan_type: stc
sca: # Open source compliance scanning
runs-on: ubuntu-latest
steps:
- name: codeScan
uses: layotto/alipay-cloud-devops-codescan@main
with:
parent_uid: ${{ secrets.ALI_PID }}
private_key: ${{ secrets.ALI_PK }}
scan_type: sca
53 changes: 0 additions & 53 deletions .github/workflows/codecov.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/inactive_issues_robot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ jobs:
activity in the last 37 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
Thank you for your contributions!
stale-issue-label: 'stale'
exempt-issue-labels: 'pinned,good first issue,help wanted'
exempt-issue-labels: 'pinned,good first issue,help wanted,backlog'
stale-pr-label: 'stale'
exempt-pr-labels: 'pinned'
6 changes: 3 additions & 3 deletions .github/workflows/linux_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Test for linux

on:
push:
branches: [ master ]
branches: [ springboot3-master ]
pull_request:
branches: [ master ]
branches: [ springboot3-master ]

jobs:
unit_test_for_jdk17:
Expand All @@ -27,4 +27,4 @@ jobs:
&& sh ./check_format.sh
&& mvn test -DargLine="-Djdk.util.zip.disableZip64ExtraFieldValidation=true"
- name: Codecov
uses: codecov/codecov-action@v4.0.0-beta.3
uses: codecov/codecov-action@v3.1.4
6 changes: 3 additions & 3 deletions .github/workflows/windows_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ name: Test for windows

on:
push:
branches: [ "master" ]
branches: [ springboot3-master ]
pull_request:
branches: [ "master" ]
branches: [ springboot3-master ]

jobs:
unit_test_for_jdk17:
Expand All @@ -32,4 +32,4 @@ jobs:
&& sh ./check_format.sh
&& mvn test -DargLine="-Djdk.util.zip.disableZip64ExtraFieldValidation=true"
- name: Codecov
uses: codecov/codecov-action@v4.0.0-beta.3
uses: codecov/codecov-action@v3.1.4
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ sofa-ark-parent/support/ark-plugin-maven-plugin/com/alipay/sofa/ark/plugin/mark
sofa-ark-parent/support/ark-plugin-maven-plugin/null.ark.plugin
sofa-ark-parent/support/ark-plugin-maven-plugin/null.ark.plugin.bak
sofa-ark-parent/support/ark-plugin-maven-plugin/xxx.ark.plugin
sofa-ark-parent/core/common/C/\temp dir\b\c/test.txt
6 changes: 4 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<module>sofa-ark-parent</module>
<module>sofa-ark-plugin/config-ark-plugin</module>
<module>sofa-ark-plugin/web-ark-plugin</module>
<module>sofa-ark-plugin/netty-ark-plugin</module>
</modules>

<properties>
Expand All @@ -22,10 +23,10 @@
<maven.java.formatter.plugin>0.4</maven.java.formatter.plugin>
<maven.compiler.plugin>3.1</maven.compiler.plugin>
<maven.source.plugin>3.0.0</maven.source.plugin>
<maven.javadoc.plugin>3.2.0</maven.javadoc.plugin>
<maven.javadoc.plugin>3.6.2</maven.javadoc.plugin>
<maven.staging.plugin>1.6.13</maven.staging.plugin>
<maven.gpg.pluign>1.6</maven.gpg.pluign>
<jacoco.maven.plugin>0.8.4</jacoco.maven.plugin>
<jacoco.maven.plugin>0.8.11</jacoco.maven.plugin>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
</properties>

Expand Down Expand Up @@ -174,6 +175,7 @@
<docencoding>UTF-8</docencoding>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
Expand Down
22 changes: 14 additions & 8 deletions sofa-ark-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
<packaging>pom</packaging>

<properties>
<log4j.version>2.0.7</log4j.version>
<log.sofa.starter.version>3.2.0</log.sofa.starter.version>
<logback.version>1.2.9</logback.version>
<log4j.version>2.0.11</log4j.version>
<log.sofa.starter.version>3.9.1</log.sofa.starter.version>
<sofa.common.tools.version>2.0.3</sofa.common.tools.version>
<logback.version>1.4.14</logback.version>

<guice.version>5.1.0</guice.version>
<guice.version>6.0.0</guice.version>
<asm.version>9.4</asm.version>
<commons.io.version>2.7</commons.io.version>
<commons.lang3.version>3.3.1</commons.lang3.version>
Expand Down Expand Up @@ -46,7 +47,7 @@
<maven.assembly.plugin>2.4</maven.assembly.plugin>
<maven.plugin.plugin>3.6.1</maven.plugin.plugin>
<surefire.version>2.22.2</surefire.version>
<netty.version>4.1.90.Final</netty.version>
<netty.version>4.1.94.Final</netty.version>
<spring.boot.version>3.0.9</spring.boot.version>
</properties>

Expand Down Expand Up @@ -190,9 +191,9 @@
</dependency>

<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>4.2.3</version>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -249,6 +250,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
<version>${sofa.common.tools.version}</version>
</dependency>

<!-- maven -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.alipay.sofa.ark.bootstrap;

import com.alipay.sofa.ark.common.util.FileUtils;
import com.alipay.sofa.ark.loader.ExecutableArkBizJar;
import com.alipay.sofa.ark.loader.archive.ExplodedArchive;
import com.alipay.sofa.ark.loader.archive.JarFileArchive;
Expand Down Expand Up @@ -66,7 +67,7 @@ protected ExecutableArchive createArchive() throws Exception {
if (path == null) {
throw new IllegalStateException("Unable to determine code source archive");
}
File root = new File(path);
File root = FileUtils.file(path);
if (!root.exists()) {
throw new IllegalStateException("Unable to determine code source archive from " + root);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
*/
package com.alipay.sofa.ark.bootstrap;

import com.alipay.sofa.ark.common.util.AssertUtils;
import com.alipay.sofa.ark.common.util.ClassLoaderUtils;
import com.alipay.sofa.ark.common.util.ClassUtils;
import com.alipay.sofa.ark.common.util.StringUtils;
import com.alipay.sofa.ark.common.util.*;
import com.alipay.sofa.ark.exception.ArkRuntimeException;
import com.alipay.sofa.ark.loader.*;
import com.alipay.sofa.ark.loader.archive.JarFileArchive;
Expand Down Expand Up @@ -115,7 +112,8 @@ protected ContainerArchive getJarContainerArchive() throws Exception {
throw new ArkRuntimeException("Duplicate Container Jar File Found.");
}

return new JarContainerArchive(new JarFileArchive(new File(urlList.get(0).getFile())));
return new JarContainerArchive(new JarFileArchive(FileUtils.file(urlList.get(0)
.getFile())));
}

@Override
Expand All @@ -128,7 +126,8 @@ public List<BizArchive> getBizArchives() throws Exception {
}

for (URL url : urlList) {
bizArchives.add(new JarBizArchive(new JarFileArchive(new File(url.getFile()))));
bizArchives
.add(new JarBizArchive(new JarFileArchive(FileUtils.file(url.getFile()))));
}

return bizArchives;
Expand All @@ -140,8 +139,8 @@ public List<PluginArchive> getPluginArchives() throws Exception {

List<PluginArchive> pluginArchives = new ArrayList<>();
for (URL url : urlList) {
pluginArchives
.add(new JarPluginArchive(new JarFileArchive(new File(url.getFile()))));
pluginArchives.add(new JarPluginArchive(new JarFileArchive(FileUtils.file(url
.getFile()))));
}

return pluginArchives;
Expand Down Expand Up @@ -177,9 +176,10 @@ private File deduceArkConfBaseDir() {
if (classLocation.startsWith("file:")) {
classLocation = classLocation.substring("file:".length());
}
File file = classLocation == null ? null : new File(classLocation);
File file = classLocation == null ? null : FileUtils.file(classLocation);
while (file != null) {
arkConfDir = new File(file.getPath() + File.separator + ARK_CONF_BASE_DIR);
arkConfDir = FileUtils
.file(file.getPath() + File.separator + ARK_CONF_BASE_DIR);
if (arkConfDir.exists() && arkConfDir.isDirectory()) {
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ public class DirectoryContainerArchive implements ContainerArchive {
private final URL[] urls;

private final static String[] AKR_CONTAINER_JAR = { "aopalliance-1.0", "commons-io-2.7",
"guava-30.1-jre", "guice-5.1.0", "guice-multibindings-4.2.3", "failureaccess-1.0.1",
"javax.inject-1", "logback-core-1.3.5", "logback-classic-1.3.5", "slf4j-api-2.0.7",
"sofa-common-tools", "netty-all-4.1.90.Final", "netty-transport-4.1.90.Final",
"netty-common-4.1.90.Final", "netty-handler-4.1.90.Final", "netty-codec-4.1.90.Final",
"netty-buffer-4.1.90.Final", "sofa-ark-parent/core-impl/container/target/classes",
"guava-32.1.3-jre", "guice-6.0.0", "failureaccess-1.0.1", "javax.inject-1",
"jakarta.inject-api-2.0.1", "logback-core-1.4.14", "logback-classic-1.4.14",
"slf4j-api-2.0.11", "sofa-common-tools", "netty-all-4.1.94.Final",
"netty-transport-4.1.94.Final", "netty-common-4.1.94.Final",
"netty-handler-4.1.94.Final", "netty-codec-4.1.94.Final", "netty-buffer-4.1.94.Final",
"sofa-ark-parent/core-impl/container/target/classes",
"sofa-ark-parent/core-impl/archive/target/classes",
"sofa-ark-parent/core/spi/target/classes",
"sofa-ark-parent/core/common/target/classes",
Expand Down Expand Up @@ -94,4 +95,4 @@ public InputStream getInputStream(ZipEntry zipEntry) {
public Iterator<Entry> iterator() {
throw new RuntimeException("unreachable invocation.");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.alipay.sofa.ark.loader;

import com.alipay.sofa.ark.bootstrap.ClasspathLauncher;
import com.alipay.sofa.ark.common.util.FileUtils;
import com.alipay.sofa.ark.exception.ArkRuntimeException;
import com.alipay.sofa.ark.loader.archive.JarFileArchive;
import com.alipay.sofa.ark.spi.archive.Archive;
Expand Down Expand Up @@ -73,7 +74,8 @@ public List<BizArchive> getBizArchives() throws Exception {
}

} else {
bizArchives.add(new JarBizArchive(new JarFileArchive(new File(url.getFile()))));
bizArchives
.add(new JarBizArchive(new JarFileArchive(FileUtils.file(url.getFile()))));
}
}
return bizArchives;
Expand All @@ -88,7 +90,7 @@ public List<BizArchive> getBizArchives() throws Exception {
private Archive getArchiveFromJarEntry(URL jarUrl) throws IOException {
String jarPath = jarUrl.getPath().substring(0, jarUrl.getPath().indexOf("!"));
String bizPath = jarUrl.getPath().substring(jarUrl.getPath().indexOf("!") + 2);
List<Archive> nestedArchives = new JarFileArchive(new File(jarPath))
List<Archive> nestedArchives = new JarFileArchive(FileUtils.file(jarPath))
.getNestedArchives(entry -> entry.getName().equals(bizPath));
if (nestedArchives.isEmpty()) {
return null;
Expand Down Expand Up @@ -127,13 +129,13 @@ protected JarFileArchive getUrlJarFileArchive(URL url) throws IOException {
String file = url.getFile();
if (file.contains(FILE_IN_JAR)) {
int pos = file.indexOf(FILE_IN_JAR);
File fatJarFile = new File(file.substring(0, pos));
File fatJarFile = FileUtils.file(file.substring(0, pos));
String nestedJar = file.substring(file.lastIndexOf("/") + 1);
JarFileArchive fatJarFileArchive = new JarFileArchive(fatJarFile);
List<Archive> matched = fatJarFileArchive.getNestedArchives(entry -> entry.getName().contains(nestedJar));
return (JarFileArchive) matched.get(0);
} else {
return new JarFileArchive(new File(file));
return new JarFileArchive(FileUtils.file(file));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;

import com.alipay.sofa.ark.common.util.FileUtils;
import com.alipay.sofa.ark.loader.jar.JarFile;
import com.alipay.sofa.ark.loader.data.RandomAccessData.ResourceAccess;
import com.alipay.sofa.ark.spi.archive.Archive;
Expand Down Expand Up @@ -125,7 +126,7 @@ private Archive getUnpackedNestedArchive(JarEntry jarEntry) throws IOException {

private File getTempUnpackFolder() {
if (this.tempUnpackFolder == null) {
File tempFolder = new File(System.getProperty("java.io.tmpdir"));
File tempFolder = FileUtils.file(System.getProperty("java.io.tmpdir"));
this.tempUnpackFolder = createUnpackFolder(tempFolder);
}
return this.tempUnpackFolder;
Expand All @@ -134,7 +135,7 @@ private File getTempUnpackFolder() {
private File createUnpackFolder(File parent) {
int attempts = 0;
while (attempts++ < 1000) {
String fileName = new File(this.jarFile.getName()).getName();
String fileName = FileUtils.file(this.jarFile.getName()).getName();
File unpackFolder = new File(parent, fileName + "-spring-boot-libs-"
+ UUID.randomUUID());
if (unpackFolder.mkdirs()) {
Expand Down
Loading

0 comments on commit ffdda25

Please sign in to comment.