From 2fa0cae028bbddabf04d7f8731b26371f76f4b5a Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Mon, 3 Feb 2025 16:56:33 -0500 Subject: [PATCH] Remove dangling file Signed-off-by: Rahul Krishna --- build.gradle | 24 +- gradle.properties | 2 +- src/main/java/com/ibm/cldk/CodeAnalyzer.java | 73 ++-- src/main/java/com/ibm/cldk/SymbolTable.java | 388 ++++++++++-------- .../com/ibm/cldk/SystemDependencyGraph.java | 16 +- .../java/com/ibm/cldk/entities/CallSite.java | 1 + .../com/ibm/cldk/utils/AnalysisUtils.java | 64 +-- .../java/com/ibm/cldk/utils/BuildProject.java | 157 ++++--- .../ibm/cldk/CodeAnalyzerIntegrationTest.java | 145 +++++++ .../java/com/ibm/cldk/CodeAnalyzerTest.java | 56 --- .../com/ibm/cldk/utils/BuildProjectTest.java | 4 + .../gradlew-corrupt-test/.dockerignore | 3 + .../resources/gradlew-corrupt-test/.gitignore | 11 + .../resources/gradlew-corrupt-test/Dockerfile | 10 + .../resources/gradlew-corrupt-test/README.txt | 35 ++ .../gradlew-corrupt-test/build.gradle | 37 ++ .../compileJava/previous-compilation-data.bin | Bin 0 -> 4219 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../resources/gradlew-corrupt-test/gradlew | 0 .../gradlew-corrupt-test/gradlew.bat | 89 ++++ .../gradlew-corrupt-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../gradlew-working-test/.dockerignore | 3 + .../resources/gradlew-working-test/.gitignore | 11 + .../resources/gradlew-working-test/Dockerfile | 10 + .../resources/gradlew-working-test/README.txt | 35 ++ .../gradlew-working-test/build.gradle | 37 ++ .../compileJava/previous-compilation-data.bin | Bin 0 -> 4219 bytes .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../resources/gradlew-working-test/gradlew | 234 +++++++++++ .../gradlew-working-test/gradlew.bat | 89 ++++ .../gradlew-working-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../resources/mvnw-corrupt-test/.dockerignore | 3 + .../resources/mvnw-corrupt-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 2 + .../resources/mvnw-corrupt-test/Dockerfile | 10 + .../resources/mvnw-corrupt-test/README.txt | 35 ++ src/test/resources/mvnw-corrupt-test/mvnw | 0 src/test/resources/mvnw-corrupt-test/pom.xml | 57 +++ .../mvnw-corrupt-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../resources/mvnw-working-test/.dockerignore | 3 + .../resources/mvnw-working-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 19 + .../resources/mvnw-working-test/Dockerfile | 10 + .../resources/mvnw-working-test/README.txt | 35 ++ src/test/resources/mvnw-working-test/mvnw | 259 ++++++++++++ src/test/resources/mvnw-working-test/mvnw.cmd | 149 +++++++ src/test/resources/mvnw-working-test/pom.xml | 57 +++ .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 src/test/resources/no-mvnw-test/.dockerignore | 3 + src/test/resources/no-mvnw-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 2 + src/test/resources/no-mvnw-test/Dockerfile | 10 + src/test/resources/no-mvnw-test/README.txt | 35 ++ src/test/resources/no-mvnw-test/pom.xml | 57 +++ .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 src/test/test-applications copy/.gitignore | 51 +++ .../gradlew-corrupt-test/.dockerignore | 3 + .../gradlew-corrupt-test/.gitignore | 11 + .../gradlew-corrupt-test/Dockerfile | 10 + .../gradlew-corrupt-test/README.txt | 35 ++ .../gradlew-corrupt-test/build.gradle | 37 ++ .../gradle/wrapper/gradle-wrapper.properties | 5 + .../gradlew-corrupt-test/gradlew | 0 .../gradlew-corrupt-test/gradlew.bat | 89 ++++ .../gradlew-corrupt-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../gradlew-working-test/.dockerignore | 3 + .../gradlew-working-test/.gitignore | 11 + .../gradlew-working-test/Dockerfile | 10 + .../gradlew-working-test/README.txt | 35 ++ .../gradlew-working-test/build.gradle | 37 ++ .../gradle/wrapper/gradle-wrapper.properties | 5 + .../gradlew-working-test/gradlew | 234 +++++++++++ .../gradlew-working-test/gradlew.bat | 89 ++++ .../gradlew-working-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../mvnw-corrupt-test/.dockerignore | 3 + .../mvnw-corrupt-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 2 + .../mvnw-corrupt-test/Dockerfile | 10 + .../mvnw-corrupt-test/README.txt | 35 ++ .../mvnw-corrupt-test/mvnw | 0 .../mvnw-corrupt-test/pom.xml | 57 +++ .../mvnw-corrupt-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../mvnw-working-test/.dockerignore | 3 + .../mvnw-working-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 19 + .../mvnw-working-test/Dockerfile | 10 + .../mvnw-working-test/README.txt | 35 ++ .../mvnw-working-test/mvnw | 259 ++++++++++++ .../mvnw-working-test/mvnw.cmd | 149 +++++++ .../mvnw-working-test/pom.xml | 57 +++ .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../no-mvnw-test/.dockerignore | 3 + .../no-mvnw-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 2 + .../no-mvnw-test/Dockerfile | 10 + .../no-mvnw-test/README.txt | 35 ++ .../no-mvnw-test/pom.xml | 57 +++ .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 src/test/test-applications/.gitignore | 51 +++ .../gradlew-corrupt-test/.dockerignore | 3 + .../gradlew-corrupt-test/.gitignore | 11 + .../gradlew-corrupt-test/Dockerfile | 10 + .../gradlew-corrupt-test/README.txt | 35 ++ .../gradlew-corrupt-test/build.gradle | 37 ++ .../gradle/wrapper/gradle-wrapper.properties | 5 + .../gradlew-corrupt-test/gradlew | 0 .../gradlew-corrupt-test/gradlew.bat | 89 ++++ .../gradlew-corrupt-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../gradlew-working-test/.dockerignore | 3 + .../gradlew-working-test/.gitignore | 11 + .../gradlew-working-test/Dockerfile | 10 + .../gradlew-working-test/README.txt | 35 ++ .../gradlew-working-test/build.gradle | 37 ++ .../gradle/wrapper/gradle-wrapper.properties | 5 + .../gradlew-working-test/gradlew | 234 +++++++++++ .../gradlew-working-test/gradlew.bat | 89 ++++ .../gradlew-working-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../mvnw-corrupt-test/.dockerignore | 3 + .../mvnw-corrupt-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 2 + .../mvnw-corrupt-test/Dockerfile | 10 + .../mvnw-corrupt-test/README.txt | 35 ++ .../test-applications/mvnw-corrupt-test/mvnw | 0 .../mvnw-corrupt-test/pom.xml | 57 +++ .../mvnw-corrupt-test/settings.gradle | 5 + .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../mvnw-working-test/.dockerignore | 3 + .../mvnw-working-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 19 + .../mvnw-working-test/Dockerfile | 10 + .../mvnw-working-test/README.txt | 35 ++ .../test-applications/mvnw-working-test/mvnw | 259 ++++++++++++ .../mvnw-working-test/mvnw.cmd | 149 +++++++ .../mvnw-working-test/pom.xml | 57 +++ .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 .../no-mvnw-test/.dockerignore | 3 + .../test-applications/no-mvnw-test/.gitignore | 11 + .../.mvn/wrapper/maven-wrapper.properties | 2 + .../test-applications/no-mvnw-test/Dockerfile | 10 + .../test-applications/no-mvnw-test/README.txt | 35 ++ .../test-applications/no-mvnw-test/pom.xml | 57 +++ .../java/com/demo/CurrentTimeServlet.java | 29 ++ .../java/com/demo/rest/RestApplication.java | 9 + .../src/main/liberty/config/server.xml | 42 ++ .../META-INF/microprofile-config.properties | 0 197 files changed, 6103 insertions(+), 353 deletions(-) create mode 100644 src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java delete mode 100644 src/test/java/com/ibm/cldk/CodeAnalyzerTest.java create mode 100644 src/test/java/com/ibm/cldk/utils/BuildProjectTest.java create mode 100644 src/test/resources/gradlew-corrupt-test/.dockerignore create mode 100644 src/test/resources/gradlew-corrupt-test/.gitignore create mode 100644 src/test/resources/gradlew-corrupt-test/Dockerfile create mode 100644 src/test/resources/gradlew-corrupt-test/README.txt create mode 100644 src/test/resources/gradlew-corrupt-test/build.gradle create mode 100644 src/test/resources/gradlew-corrupt-test/build/tmp/compileJava/previous-compilation-data.bin create mode 100644 src/test/resources/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.jar create mode 100644 src/test/resources/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties create mode 100644 src/test/resources/gradlew-corrupt-test/gradlew create mode 100644 src/test/resources/gradlew-corrupt-test/gradlew.bat create mode 100644 src/test/resources/gradlew-corrupt-test/settings.gradle create mode 100644 src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/resources/gradlew-corrupt-test/src/main/liberty/config/server.xml create mode 100644 src/test/resources/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/resources/gradlew-working-test/.dockerignore create mode 100644 src/test/resources/gradlew-working-test/.gitignore create mode 100644 src/test/resources/gradlew-working-test/Dockerfile create mode 100644 src/test/resources/gradlew-working-test/README.txt create mode 100644 src/test/resources/gradlew-working-test/build.gradle create mode 100644 src/test/resources/gradlew-working-test/build/tmp/compileJava/previous-compilation-data.bin create mode 100644 src/test/resources/gradlew-working-test/gradle/wrapper/gradle-wrapper.jar create mode 100644 src/test/resources/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties create mode 100755 src/test/resources/gradlew-working-test/gradlew create mode 100644 src/test/resources/gradlew-working-test/gradlew.bat create mode 100644 src/test/resources/gradlew-working-test/settings.gradle create mode 100644 src/test/resources/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/resources/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/resources/gradlew-working-test/src/main/liberty/config/server.xml create mode 100644 src/test/resources/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/resources/mvnw-corrupt-test/.dockerignore create mode 100644 src/test/resources/mvnw-corrupt-test/.gitignore create mode 100644 src/test/resources/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/resources/mvnw-corrupt-test/Dockerfile create mode 100644 src/test/resources/mvnw-corrupt-test/README.txt create mode 100644 src/test/resources/mvnw-corrupt-test/mvnw create mode 100644 src/test/resources/mvnw-corrupt-test/pom.xml create mode 100644 src/test/resources/mvnw-corrupt-test/settings.gradle create mode 100644 src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/resources/mvnw-corrupt-test/src/main/liberty/config/server.xml create mode 100644 src/test/resources/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/resources/mvnw-working-test/.dockerignore create mode 100644 src/test/resources/mvnw-working-test/.gitignore create mode 100644 src/test/resources/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/resources/mvnw-working-test/Dockerfile create mode 100644 src/test/resources/mvnw-working-test/README.txt create mode 100755 src/test/resources/mvnw-working-test/mvnw create mode 100644 src/test/resources/mvnw-working-test/mvnw.cmd create mode 100644 src/test/resources/mvnw-working-test/pom.xml create mode 100644 src/test/resources/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/resources/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/resources/mvnw-working-test/src/main/liberty/config/server.xml create mode 100644 src/test/resources/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/resources/no-mvnw-test/.dockerignore create mode 100644 src/test/resources/no-mvnw-test/.gitignore create mode 100644 src/test/resources/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/resources/no-mvnw-test/Dockerfile create mode 100644 src/test/resources/no-mvnw-test/README.txt create mode 100644 src/test/resources/no-mvnw-test/pom.xml create mode 100644 src/test/resources/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/resources/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/resources/no-mvnw-test/src/main/liberty/config/server.xml create mode 100644 src/test/resources/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications copy/.gitignore create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/.dockerignore create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/.gitignore create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/Dockerfile create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/README.txt create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/build.gradle create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/gradlew create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/gradlew.bat create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/settings.gradle create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications copy/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications copy/gradlew-working-test/.dockerignore create mode 100644 src/test/test-applications copy/gradlew-working-test/.gitignore create mode 100644 src/test/test-applications copy/gradlew-working-test/Dockerfile create mode 100644 src/test/test-applications copy/gradlew-working-test/README.txt create mode 100644 src/test/test-applications copy/gradlew-working-test/build.gradle create mode 100644 src/test/test-applications copy/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties create mode 100755 src/test/test-applications copy/gradlew-working-test/gradlew create mode 100644 src/test/test-applications copy/gradlew-working-test/gradlew.bat create mode 100644 src/test/test-applications copy/gradlew-working-test/settings.gradle create mode 100644 src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications copy/gradlew-working-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications copy/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/.dockerignore create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/.gitignore create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/Dockerfile create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/README.txt create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/mvnw create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/pom.xml create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/settings.gradle create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications copy/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications copy/mvnw-working-test/.dockerignore create mode 100644 src/test/test-applications copy/mvnw-working-test/.gitignore create mode 100644 src/test/test-applications copy/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/test-applications copy/mvnw-working-test/Dockerfile create mode 100644 src/test/test-applications copy/mvnw-working-test/README.txt create mode 100755 src/test/test-applications copy/mvnw-working-test/mvnw create mode 100644 src/test/test-applications copy/mvnw-working-test/mvnw.cmd create mode 100644 src/test/test-applications copy/mvnw-working-test/pom.xml create mode 100644 src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications copy/mvnw-working-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications copy/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications copy/no-mvnw-test/.dockerignore create mode 100644 src/test/test-applications copy/no-mvnw-test/.gitignore create mode 100644 src/test/test-applications copy/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/test-applications copy/no-mvnw-test/Dockerfile create mode 100644 src/test/test-applications copy/no-mvnw-test/README.txt create mode 100644 src/test/test-applications copy/no-mvnw-test/pom.xml create mode 100644 src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications copy/no-mvnw-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications copy/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications/.gitignore create mode 100644 src/test/test-applications/gradlew-corrupt-test/.dockerignore create mode 100644 src/test/test-applications/gradlew-corrupt-test/.gitignore create mode 100644 src/test/test-applications/gradlew-corrupt-test/Dockerfile create mode 100644 src/test/test-applications/gradlew-corrupt-test/README.txt create mode 100644 src/test/test-applications/gradlew-corrupt-test/build.gradle create mode 100644 src/test/test-applications/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties create mode 100644 src/test/test-applications/gradlew-corrupt-test/gradlew create mode 100644 src/test/test-applications/gradlew-corrupt-test/gradlew.bat create mode 100644 src/test/test-applications/gradlew-corrupt-test/settings.gradle create mode 100644 src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications/gradlew-corrupt-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications/gradlew-working-test/.dockerignore create mode 100644 src/test/test-applications/gradlew-working-test/.gitignore create mode 100644 src/test/test-applications/gradlew-working-test/Dockerfile create mode 100644 src/test/test-applications/gradlew-working-test/README.txt create mode 100644 src/test/test-applications/gradlew-working-test/build.gradle create mode 100644 src/test/test-applications/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties create mode 100755 src/test/test-applications/gradlew-working-test/gradlew create mode 100644 src/test/test-applications/gradlew-working-test/gradlew.bat create mode 100644 src/test/test-applications/gradlew-working-test/settings.gradle create mode 100644 src/test/test-applications/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications/gradlew-working-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications/mvnw-corrupt-test/.dockerignore create mode 100644 src/test/test-applications/mvnw-corrupt-test/.gitignore create mode 100644 src/test/test-applications/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/test-applications/mvnw-corrupt-test/Dockerfile create mode 100644 src/test/test-applications/mvnw-corrupt-test/README.txt create mode 100644 src/test/test-applications/mvnw-corrupt-test/mvnw create mode 100644 src/test/test-applications/mvnw-corrupt-test/pom.xml create mode 100644 src/test/test-applications/mvnw-corrupt-test/settings.gradle create mode 100644 src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications/mvnw-corrupt-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications/mvnw-working-test/.dockerignore create mode 100644 src/test/test-applications/mvnw-working-test/.gitignore create mode 100644 src/test/test-applications/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/test-applications/mvnw-working-test/Dockerfile create mode 100644 src/test/test-applications/mvnw-working-test/README.txt create mode 100755 src/test/test-applications/mvnw-working-test/mvnw create mode 100644 src/test/test-applications/mvnw-working-test/mvnw.cmd create mode 100644 src/test/test-applications/mvnw-working-test/pom.xml create mode 100644 src/test/test-applications/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications/mvnw-working-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties create mode 100644 src/test/test-applications/no-mvnw-test/.dockerignore create mode 100644 src/test/test-applications/no-mvnw-test/.gitignore create mode 100644 src/test/test-applications/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties create mode 100644 src/test/test-applications/no-mvnw-test/Dockerfile create mode 100644 src/test/test-applications/no-mvnw-test/README.txt create mode 100644 src/test/test-applications/no-mvnw-test/pom.xml create mode 100644 src/test/test-applications/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java create mode 100644 src/test/test-applications/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java create mode 100644 src/test/test-applications/no-mvnw-test/src/main/liberty/config/server.xml create mode 100644 src/test/test-applications/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties diff --git a/build.gradle b/build.gradle index 814beacb..a979aa27 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,10 @@ repositories { mavenLocal() } +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} if (project.hasProperty('mainClass')) { mainClassName = project.getProperty('mainClass') @@ -119,7 +123,25 @@ dependencies { implementation('org.jgrapht:jgrapht-ext:1.5.2') implementation('com.github.javaparser:javaparser-symbol-solver-core:3.25.9') - testImplementation group: 'junit', name: 'junit', version: '4.13.2' + // TestContainers + testImplementation 'org.testcontainers:testcontainers:1.19.3' + testImplementation 'org.testcontainers:junit-jupiter:1.19.3' + + // JUnit 5 + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1' // for @ParameterizedTest + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1' + + // SLF4J - for TestContainers logging + testImplementation 'org.slf4j:slf4j-api:2.0.9' + testImplementation 'org.slf4j:slf4j-simple:2.0.9' + +} + +test { + useJUnitPlatform() + // Optional: Enable TestContainers reuse to speed up tests + systemProperty 'testcontainers.reuse.enable', 'true' } task fatJar(type: Jar) { diff --git a/gradle.properties b/gradle.properties index 166aa4a7..e997a9af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.1.0 \ No newline at end of file +version=2.0.0 \ No newline at end of file diff --git a/src/main/java/com/ibm/cldk/CodeAnalyzer.java b/src/main/java/com/ibm/cldk/CodeAnalyzer.java index 8cdca67c..c4477d17 100644 --- a/src/main/java/com/ibm/cldk/CodeAnalyzer.java +++ b/src/main/java/com/ibm/cldk/CodeAnalyzer.java @@ -9,23 +9,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -*/ - + */ package com.ibm.cldk; -import com.github.javaparser.Problem; -import com.google.common.reflect.TypeToken; -import com.google.gson.*; -import com.ibm.cldk.entities.JavaCompilationUnit; -import com.ibm.cldk.utils.BuildProject; -import com.ibm.cldk.utils.Log; -import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException; -import com.ibm.wala.ipa.cha.ClassHierarchyException; -import org.apache.commons.lang3.tuple.Pair; -import picocli.CommandLine; -import picocli.CommandLine.Command; -import picocli.CommandLine.Option; - import java.io.File; import java.io.FileReader; import java.io.FileWriter; @@ -38,13 +24,32 @@ import java.util.Map; import java.util.stream.Collectors; +import org.apache.commons.lang3.tuple.Pair; + +import com.github.javaparser.Problem; +import com.google.common.reflect.TypeToken; +import com.google.gson.FieldNamingPolicy; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.ibm.cldk.entities.JavaCompilationUnit; +import com.ibm.cldk.utils.BuildProject; +import com.ibm.cldk.utils.Log; + +import picocli.CommandLine; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; class VersionProvider implements CommandLine.IVersionProvider { + public String[] getVersion() throws Exception { String version = getClass().getPackage().getImplementationVersion(); - return new String[]{ version != null ? version : "unknown" }; + return new String[]{version != null ? version : "unknown"}; } } + /** * The type Code analyzer. */ @@ -69,6 +74,8 @@ public class CodeAnalyzer implements Runnable { @Option(names = {"--no-build"}, description = "Do not build your application. Use this option if you have already built your application.") private static boolean noBuild = false; + @Option(names = {"-f", "--project-root-path"}, description = "Path to the root pom.xml/build.gradle file of the project.") + public static String projectRootPom; @Option(names = {"-a", "--analysis-level"}, description = "Level of analysis to perform. Options: 1 (for just symbol table) or 2 (for call graph). Default: 1") private static int analysisLevel = 1; @@ -83,6 +90,7 @@ public class CodeAnalyzer implements Runnable { .setPrettyPrinting() .disableHtmlEscaping() .create(); + /** * The entry point of application. * @@ -108,22 +116,26 @@ private static void analyze() throws Exception { JsonObject combinedJsonObject = new JsonObject(); Map symbolTable; + projectRootPom = projectRootPom == null ? input : projectRootPom; // First of all if, sourceAnalysis is provided, we will analyze the source code instead of the project. if (sourceAnalysis != null) { // Construct symbol table for source code Log.debug("Single file analysis."); Pair, Map>> symbolTableExtractionResult = SymbolTable.extractSingle(sourceAnalysis); symbolTable = symbolTableExtractionResult.getLeft(); - } - - else { + } else { // download library dependencies of project for type resolution String dependencies = null; - if (BuildProject.downloadLibraryDependencies(input)) { - dependencies = String.valueOf(BuildProject.libDownloadPath); - } else { + try { + if (BuildProject.downloadLibraryDependencies(input, projectRootPom)) { + dependencies = String.valueOf(BuildProject.libDownloadPath); + } else { + Log.warn("Failed to download library dependencies of project"); + } + } catch (IllegalStateException illegalStateException) { Log.warn("Failed to download library dependencies of project"); } + boolean analysisFileExists = output != null && Files.exists(Paths.get(output + File.separator + outputFileName)); // if target files are specified, compute symbol table information for the given files @@ -132,8 +144,8 @@ private static void analyze() throws Exception { // if target files specified for analysis level 2, downgrade to analysis level 1 if (analysisLevel > 1) { - Log.warn("Incremental analysis is supported at analysis level 1 only; " + - "performing analysis level 1 for target files"); + Log.warn("Incremental analysis is supported at analysis level 1 only; " + + "performing analysis level 1 for target files"); analysisLevel = 1; } @@ -158,12 +170,10 @@ private static void analyze() throws Exception { } symbolTable = existingSymbolTable; } - } - - else { + } else { // construct symbol table for project, write parse problems to file in output directory if specified - Pair, Map>> symbolTableExtractionResult = - SymbolTable.extractAll(Paths.get(input)); + Pair, Map>> symbolTableExtractionResult + = SymbolTable.extractAll(Paths.get(input)); symbolTable = symbolTableExtractionResult.getLeft(); } @@ -221,7 +231,8 @@ private static void emit(String consolidatedJSONString) throws IOException { } private static Map readSymbolTableFromFile(File analysisJsonFile) { - Type symbolTableType = new TypeToken>() {}.getType(); + Type symbolTableType = new TypeToken>() { + }.getType(); try (FileReader reader = new FileReader(analysisJsonFile)) { JsonObject jsonObject = JsonParser.parseReader(reader).getAsJsonObject(); return gson.fromJson(jsonObject.get("symbol_table"), symbolTableType); @@ -230,4 +241,4 @@ private static Map readSymbolTableFromFile(File ana } return null; } -} \ No newline at end of file +} diff --git a/src/main/java/com/ibm/cldk/SymbolTable.java b/src/main/java/com/ibm/cldk/SymbolTable.java index 584133ff..a589ec7c 100644 --- a/src/main/java/com/ibm/cldk/SymbolTable.java +++ b/src/main/java/com/ibm/cldk/SymbolTable.java @@ -10,7 +10,7 @@ import com.github.javaparser.ast.body.*; import com.github.javaparser.ast.expr.*; import com.github.javaparser.ast.nodeTypes.NodeWithName; -import com.github.javaparser.ast.stmt.BlockStmt; +import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.ReferenceType; import com.github.javaparser.ast.type.Type; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; @@ -41,15 +41,13 @@ public class SymbolTable { private static Set unresolvedExpressions = new HashSet<>(); /** - * Processes the given compilation unit to extract information about classes and - * interfaces - * declared in the unit and returns a JSON object containing the extracted - * information. + * Processes the given compilation unit to extract information about classes + * and interfaces declared in the unit and returns a JSON object containing + * the extracted information. * * @param parseResult compilation unit to be processed * @return JSON object containing extracted information */ - // Let's store the known callables here for future use. public static Table declaredMethodsAndConstructors = Tables.newCustomTable(new HashMap<>(), () -> new HashMap<>() { @Override @@ -102,105 +100,104 @@ private static JavaCompilationUnit processCompilationUnit(CompilationUnit parseR // create array node for type declarations cUnit.setTypeDeclarations(parseResult.findAll(TypeDeclaration.class) - .stream().filter(typeDecl -> typeDecl.getFullyQualifiedName().isPresent()) - .map(typeDecl -> { - // get type name and initialize the type object - String typeName = typeDecl.getFullyQualifiedName().get().toString(); - com.ibm.cldk.entities.Type typeNode = new com.ibm.cldk.entities.Type(); - - if (typeDecl instanceof ClassOrInterfaceDeclaration) { - ClassOrInterfaceDeclaration classDecl = (ClassOrInterfaceDeclaration)typeDecl; - - // Add interfaces implemented by class - typeNode.setImplementsList(classDecl.getImplementedTypes().stream().map(SymbolTable::resolveType) - .collect(Collectors.toList())); - - // Add class modifiers - typeNode.setModifiers(classDecl.getModifiers().stream().map(m -> m.toString().strip()) - .collect(Collectors.toList())); - - // Add class annotations - typeNode.setAnnotations(classDecl.getAnnotations().stream().map(a -> a.toString().strip()) - .collect(Collectors.toList())); - - // add booleans indicating interfaces and inner/local classes - typeNode.setInterface(classDecl.isInterface()); - typeNode.setInnerClass(classDecl.isInnerClass()); - typeNode.setLocalClass(classDecl.isLocalClassDeclaration()); - - // Add extends - typeNode.setExtendsList(classDecl.getExtendedTypes().stream() - .map(SymbolTable::resolveType) - .collect(Collectors.toList())); - - } else if (typeDecl instanceof EnumDeclaration) { - EnumDeclaration enumDecl = (EnumDeclaration)typeDecl; - - // Add interfaces implemented by enum - typeNode.setImplementsList(enumDecl.getImplementedTypes().stream().map(SymbolTable::resolveType) - .collect(Collectors.toList())); - - // Add enum modifiers - typeNode.setModifiers(enumDecl.getModifiers().stream().map(m -> m.toString().strip()) - .collect(Collectors.toList())); - - // Add enum annotations - typeNode.setAnnotations(enumDecl.getAnnotations().stream().map(a -> a.toString().strip()) - .collect(Collectors.toList())); - - // Add enum constants - typeNode.setEnumConstants(enumDecl.getEntries().stream() - .map(SymbolTable::processEnumConstantDeclaration).collect(Collectors.toList())); - - } else { - // TODO: handle AnnotationDeclaration, RecordDeclaration - // set the common type attributes only - Log.warn("Found unsupported type declaration: "+typeDecl.toString()); - typeNode = new com.ibm.cldk.entities.Type(); - } + .stream().filter(typeDecl -> typeDecl.getFullyQualifiedName().isPresent()) + .map(typeDecl -> { + // get type name and initialize the type object + String typeName = typeDecl.getFullyQualifiedName().get().toString(); + com.ibm.cldk.entities.Type typeNode = new com.ibm.cldk.entities.Type(); + + if (typeDecl instanceof ClassOrInterfaceDeclaration) { + ClassOrInterfaceDeclaration classDecl = (ClassOrInterfaceDeclaration) typeDecl; + + // Add interfaces implemented by class + typeNode.setImplementsList(classDecl.getImplementedTypes().stream().map(SymbolTable::resolveType) + .collect(Collectors.toList())); + + // Add class modifiers + typeNode.setModifiers(classDecl.getModifiers().stream().map(m -> m.toString().strip()) + .collect(Collectors.toList())); + + // Add class annotations + typeNode.setAnnotations(classDecl.getAnnotations().stream().map(a -> a.toString().strip()) + .collect(Collectors.toList())); + + // add booleans indicating interfaces and inner/local classes + typeNode.setInterface(classDecl.isInterface()); + typeNode.setInnerClass(classDecl.isInnerClass()); + typeNode.setLocalClass(classDecl.isLocalClassDeclaration()); + + // Add extends + typeNode.setExtendsList(classDecl.getExtendedTypes().stream() + .map(SymbolTable::resolveType) + .collect(Collectors.toList())); + + } else if (typeDecl instanceof EnumDeclaration) { + EnumDeclaration enumDecl = (EnumDeclaration) typeDecl; + + // Add interfaces implemented by enum + typeNode.setImplementsList(enumDecl.getImplementedTypes().stream().map(SymbolTable::resolveType) + .collect(Collectors.toList())); + + // Add enum modifiers + typeNode.setModifiers(enumDecl.getModifiers().stream().map(m -> m.toString().strip()) + .collect(Collectors.toList())); + + // Add enum annotations + typeNode.setAnnotations(enumDecl.getAnnotations().stream().map(a -> a.toString().strip()) + .collect(Collectors.toList())); + + // Add enum constants + typeNode.setEnumConstants(enumDecl.getEntries().stream() + .map(SymbolTable::processEnumConstantDeclaration).collect(Collectors.toList())); + + } else { + // TODO: handle AnnotationDeclaration, RecordDeclaration + // set the common type attributes only + Log.warn("Found unsupported type declaration: " + typeDecl.toString()); + typeNode = new com.ibm.cldk.entities.Type(); + } - /* set common attributes of types that available in type declarations: + /* set common attributes of types that available in type declarations: is nested type, is class or interface declaration, is enum declaration, comments, parent class, callable declarations, field declarations */ - - // Set fields indicating nested, class/interface, enum, annotation, and record types - typeNode.setNestedType(typeDecl.isNestedType()); - typeNode.setClassOrInterfaceDeclaration(typeDecl.isClassOrInterfaceDeclaration()); - typeNode.setEnumDeclaration(typeDecl.isEnumDeclaration()); - typeNode.setAnnotationDeclaration(typeDecl.isAnnotationDeclaration()); - typeNode.setRecordDeclaration(typeDecl.isRecordDeclaration()); - - // Add class comment - typeNode.setComment(typeDecl.getComment().isPresent() ? typeDecl.getComment().get().asString() : ""); - - // add parent class (for nested type declarations) - typeNode.setParentType(typeDecl.getParentNode().get() instanceof TypeDeclaration ? - ((TypeDeclaration>)typeDecl.getParentNode().get()).getFullyQualifiedName().get() : ""); - - typeNode.setNestedTypeDeclarations(typeDecl.findAll(TypeDeclaration.class).stream() - .filter(typ -> typ.isClassOrInterfaceDeclaration() || typ.isEnumDeclaration()) - .filter(typ -> typ.getParentNode().isPresent() && typ.getParentNode().get() == typeDecl) - .map(typ -> typ.getFullyQualifiedName().get().toString()).collect(Collectors.toList())); - - // Add information about declared fields (filtering to fields declared in the - // type, not in a nested type) - typeNode.setFieldDeclarations(typeDecl.findAll(FieldDeclaration.class).stream() - .filter(f -> f.getParentNode().isPresent() && f.getParentNode().get() == typeDecl) - .map(SymbolTable::processFieldDeclaration).collect(Collectors.toList())); - List fieldNames = new ArrayList<>(); - typeNode.getFieldDeclarations().stream().map(fd -> fd.getVariables()).forEach(fieldNames::addAll); - - // Add information about declared methods (filtering to methods declared in the class, not in a nested class) - typeNode.setCallableDeclarations(typeDecl.findAll(CallableDeclaration.class).stream() - .filter(c -> c.getParentNode().isPresent() && c.getParentNode().get() == typeDecl) - .map(meth -> { - Pair callableDeclaration = processCallableDeclaration(meth, fieldNames, typeName, parseResult.getStorage().map(s -> s.getPath().toString()).orElse("")); - declaredMethodsAndConstructors.put(typeName, callableDeclaration.getLeft(), callableDeclaration.getRight()); - return callableDeclaration; - }).collect(Collectors.toMap(p -> p.getLeft(), p -> p.getRight()))); - - return Pair.of(typeName, typeNode); - }).collect(Collectors.toMap(p -> p.getLeft(), p -> p.getRight()))); + // Set fields indicating nested, class/interface, enum, annotation, and record types + typeNode.setNestedType(typeDecl.isNestedType()); + typeNode.setClassOrInterfaceDeclaration(typeDecl.isClassOrInterfaceDeclaration()); + typeNode.setEnumDeclaration(typeDecl.isEnumDeclaration()); + typeNode.setAnnotationDeclaration(typeDecl.isAnnotationDeclaration()); + typeNode.setRecordDeclaration(typeDecl.isRecordDeclaration()); + + // Add class comment + typeNode.setComment(typeDecl.getComment().isPresent() ? typeDecl.getComment().get().asString() : ""); + + // add parent class (for nested type declarations) + typeNode.setParentType(typeDecl.getParentNode().get() instanceof TypeDeclaration + ? ((TypeDeclaration>) typeDecl.getParentNode().get()).getFullyQualifiedName().get() : ""); + + typeNode.setNestedTypeDeclarations(typeDecl.findAll(TypeDeclaration.class).stream() + .filter(typ -> typ.isClassOrInterfaceDeclaration() || typ.isEnumDeclaration()) + .filter(typ -> typ.getParentNode().isPresent() && typ.getParentNode().get() == typeDecl) + .map(typ -> typ.getFullyQualifiedName().get().toString()).collect(Collectors.toList())); + + // Add information about declared fields (filtering to fields declared in the + // type, not in a nested type) + typeNode.setFieldDeclarations(typeDecl.findAll(FieldDeclaration.class).stream() + .filter(f -> f.getParentNode().isPresent() && f.getParentNode().get() == typeDecl) + .map(SymbolTable::processFieldDeclaration).collect(Collectors.toList())); + List fieldNames = new ArrayList<>(); + typeNode.getFieldDeclarations().stream().map(fd -> fd.getVariables()).forEach(fieldNames::addAll); + + // Add information about declared methods (filtering to methods declared in the class, not in a nested class) + typeNode.setCallableDeclarations(typeDecl.findAll(CallableDeclaration.class).stream() + .filter(c -> c.getParentNode().isPresent() && c.getParentNode().get() == typeDecl) + .map(meth -> { + Pair callableDeclaration = processCallableDeclaration(meth, fieldNames, typeName, parseResult.getStorage().map(s -> s.getPath().toString()).orElse("")); + declaredMethodsAndConstructors.put(typeName, callableDeclaration.getLeft(), callableDeclaration.getRight()); + return callableDeclaration; + }).collect(Collectors.toMap(p -> p.getLeft(), p -> p.getRight()))); + + return Pair.of(typeName, typeNode); + }).collect(Collectors.toMap(p -> p.getLeft(), p -> p.getRight()))); return cUnit; } @@ -219,7 +216,7 @@ private static EnumConstant processEnumConstantDeclaration(EnumConstantDeclarati // add enum constant arguments enumConstant.setArguments(enumConstDecl.getArguments().stream().map(a -> a.toString()) - .collect(Collectors.toList())); + .collect(Collectors.toList())); return enumConstant; } @@ -241,15 +238,15 @@ private static ParameterInCallable processParameterDeclaration(Parameter paramDe /** * Processes the given callable declaration to extract information about the - * declared method or - * constructor and returns a JSON object containing the extracted information. + * declared method or constructor and returns a JSON object containing the + * extracted information. * * @param callableDecl callable (method or constructor) to be processed * @return Callable object containing extracted information */ @SuppressWarnings("unchecked") private static Pair processCallableDeclaration(CallableDeclaration callableDecl, - List classFields, String typeName, String filePath) { + List classFields, String typeName, String filePath) { Callable callableNode = new Callable(); // Set file path @@ -269,14 +266,16 @@ private static Pair processCallableDeclaration(CallableDeclara // add exceptions declared in "throws" clause callableNode.setThrownExceptions( - ((NodeList)callableDecl.getThrownExceptions()) - .stream() - .map(SymbolTable::resolveType) - .collect(Collectors.toList())); + ((NodeList) callableDecl.getThrownExceptions()) + .stream() + .map(SymbolTable::resolveType) + .collect(Collectors.toList())); // add the complete declaration string, including modifiers, throws, and // parameter names - callableNode.setDeclaration(callableDecl.getDeclarationAsString(true, true, true).strip()); + callableNode.setDeclaration(callableDecl + .getDeclarationAsString(true, true, true) + .strip().replaceAll("//.*\n", "")); // add information about callable parameters: for each parameter, type, name, // annotations, @@ -292,8 +291,8 @@ private static Pair processCallableDeclaration(CallableDeclara // Same as above, a constructor declaration may not have a return type // and method declaration always has a return type. - callableNode.setReturnType((callableDecl instanceof MethodDeclaration) ? - resolveType(((MethodDeclaration)callableDecl).getType()) : null); + callableNode.setReturnType((callableDecl instanceof MethodDeclaration) + ? resolveType(((MethodDeclaration) callableDecl).getType()) : null); callableNode.setConstructor(callableDecl instanceof ConstructorDeclaration); callableNode.setStartLine(callableDecl.getRange().isPresent() ? callableDecl.getRange().get().begin.line : -1); @@ -304,15 +303,36 @@ private static Pair processCallableDeclaration(CallableDeclara callableNode.setAccessedFields(getAccessedFields(body, classFields, typeName)); callableNode.setCallSites(getCallSites(body)); callableNode.setVariableDeclarations(getVariableDeclarations(body)); + callableNode.setCyclomaticComplexity(getCyclomaticComplexity(callableDecl)); String callableSignature = (callableDecl instanceof MethodDeclaration) ? callableDecl.getSignature().asString() : callableDecl.getSignature().asString().replace(callableDecl.getSignature().getName(), ""); return Pair.of(callableSignature, callableNode); } + /** + * Computes cyclomatic complexity for the given callable. + * + * @param callableDeclaration Callable to compute cyclomatic complexity for + * @return cyclomatic complexity + */ + private static int getCyclomaticComplexity(CallableDeclaration callableDeclaration) { + int ifStmtCount = callableDeclaration.findAll(IfStmt.class).size(); + int loopStmtCount = callableDeclaration.findAll(DoStmt.class).size() + + callableDeclaration.findAll(ForStmt.class).size() + + callableDeclaration.findAll(ForEachStmt.class).size() + + callableDeclaration.findAll(WhileStmt.class).size(); + int switchCaseCount = callableDeclaration.findAll(SwitchStmt.class).stream() + .map(stmt -> stmt.getEntries().size()) + .reduce(0, Integer::sum); + int conditionalExprCount = callableDeclaration.findAll(ConditionalExpr.class).size(); + int catchClauseCount = callableDeclaration.findAll(CatchClause.class).size(); + return ifStmtCount + loopStmtCount + switchCaseCount + conditionalExprCount + catchClauseCount + 1; + } + /** * Processes the given field declaration to extract information about the - * declared field and - * returns a JSON object containing the extracted information. + * declared field and returns a JSON object containing the extracted + * information. * * @param fieldDecl field declaration to be processed * @return Field object containing extracted information @@ -345,8 +365,7 @@ private static Field processFieldDeclaration(FieldDeclaration fieldDecl) { /** * Computes and returns the set of types references in a block of statement - * (method or constructor - * body). + * (method or constructor body). * * @param blockStmt Block statement to compute referenced types for * @return List of types referenced in the block statement @@ -354,33 +373,33 @@ private static Field processFieldDeclaration(FieldDeclaration fieldDecl) { private static List getReferencedTypes(Optional blockStmt) { Set referencedTypes = new HashSet<>(); blockStmt.ifPresent(bs -> bs.findAll(VariableDeclarator.class) - .stream() - .filter(vd -> vd.getType().isClassOrInterfaceType()) - .map(vd -> resolveType(vd.getType())) - .forEach(referencedTypes::add)); + .stream() + .filter(vd -> vd.getType().isClassOrInterfaceType()) + .map(vd -> resolveType(vd.getType())) + .forEach(referencedTypes::add)); // add types of accessed fields to the set of referenced types blockStmt.ifPresent(bs -> bs.findAll(FieldAccessExpr.class) - .stream() - .filter(faExpr -> faExpr.getParentNode().isPresent() && !(faExpr.getParentNode().get() instanceof FieldAccessExpr)) - .map(faExpr -> { - if (faExpr.getParentNode().isPresent() && faExpr.getParentNode().get() instanceof CastExpr) { - return resolveType(((CastExpr)faExpr.getParentNode().get()).getType()); - } else { - return resolveExpression(faExpr); - } - }) - .filter(type -> !type.isEmpty()) - .forEach(referencedTypes::add)); + .stream() + .filter(faExpr -> faExpr.getParentNode().isPresent() && !(faExpr.getParentNode().get() instanceof FieldAccessExpr)) + .map(faExpr -> { + if (faExpr.getParentNode().isPresent() && faExpr.getParentNode().get() instanceof CastExpr) { + return resolveType(((CastExpr) faExpr.getParentNode().get()).getType()); + } else { + return resolveExpression(faExpr); + } + }) + .filter(type -> !type.isEmpty()) + .forEach(referencedTypes::add)); // TODO: add resolved method access expressions - return new ArrayList<>(referencedTypes); } /** - * Returns information about variable declarations in the given callable. The information includes - * var name, var type, var initializer, and position. + * Returns information about variable declarations in the given callable. + * The information includes var name, var type, var initializer, and + * position. * * @param blockStmt Callable to compute var declaration information for * @return list of variable declarations @@ -394,8 +413,8 @@ private static List getVariableDeclarations(Optional getVariableDeclarations(Optional getAccessedFields(Optional callableBody, List classFields, - String typeName) { + String typeName) { Set accessedFields = new HashSet<>(); // process field access expressions in the callable callableBody.ifPresent(cb -> cb.findAll(FieldAccessExpr.class) - .stream() - .filter(faExpr -> faExpr.getParentNode().isPresent() && !(faExpr.getParentNode().get() instanceof FieldAccessExpr)) - .map(faExpr -> { - String fieldDeclaringType = resolveExpression(faExpr.getScope()); - if (!fieldDeclaringType.isEmpty()) { - return fieldDeclaringType + "." + faExpr.getNameAsString(); - } else { - return faExpr.getNameAsString(); - } - }) - .forEach(accessedFields::add) + .stream() + .filter(faExpr -> faExpr.getParentNode().isPresent() && !(faExpr.getParentNode().get() instanceof FieldAccessExpr)) + .map(faExpr -> { + String fieldDeclaringType = resolveExpression(faExpr.getScope()); + if (!fieldDeclaringType.isEmpty()) { + return fieldDeclaringType + "." + faExpr.getNameAsString(); + } else { + return faExpr.getNameAsString(); + } + }) + .forEach(accessedFields::add) ); // process all names expressions in callable and match against names of declared fields @@ -454,8 +474,9 @@ private static List getAccessedFields(Optional callableBody, } /** - * Returns information about call sites in the given callable. The information includes: - * the method name, the declaring type name, and types of arguments used in method call. + * Returns information about call sites in the given callable. The + * information includes: the method name, the declaring type name, and types + * of arguments used in method call. * * @param callableBody callable to compute call-site information for * @return list of call sites @@ -478,8 +499,8 @@ private static List getCallSites(Optional callableBody) { if (declaringType.contains(" | ")) { declaringType = declaringType.split(" \\| ")[0]; } - String declaringTypeName = declaringType.contains(".") ? - declaringType.substring(declaringType.lastIndexOf(".")+1) : declaringType; + String declaringTypeName = declaringType.contains(".") + ? declaringType.substring(declaringType.lastIndexOf(".") + 1) : declaringType; if (declaringTypeName.equals(scopeExpr.toString())) { isStaticCall = true; } @@ -487,7 +508,7 @@ private static List getCallSites(Optional callableBody) { // compute return type for method call taking into account typecast of return value if (methodCallExpr.getParentNode().isPresent() && methodCallExpr.getParentNode().get() instanceof CastExpr) { - returnType = resolveType(((CastExpr)methodCallExpr.getParentNode().get()).getType()); + returnType = resolveType(((CastExpr) methodCallExpr.getParentNode().get()).getType()); } else { returnType = resolveExpression(methodCallExpr); } @@ -505,16 +526,15 @@ private static List getCallSites(Optional callableBody) { try { ResolvedMethodDeclaration resolvedMethodDeclaration = methodCallExpr.resolve(); accessSpecifier = resolvedMethodDeclaration.accessSpecifier(); - } - catch (RuntimeException exception) { + } catch (RuntimeException exception) { Log.debug("Could not resolve access specifier for method call: " + methodCallExpr + ": " + exception.getMessage()); } // resolve arguments of the method call to types List arguments = methodCallExpr.getArguments().stream() - .map(SymbolTable::resolveExpression).collect(Collectors.toList()); + .map(SymbolTable::resolveExpression).collect(Collectors.toList()); // add a new call site object callSites.add(createCallSite(methodCallExpr, methodCallExpr.getNameAsString(), receiverName, declaringType, - arguments, returnType, calleeSignature, isStaticCall, false, accessSpecifier)); + arguments, returnType, calleeSignature, isStaticCall, false, accessSpecifier)); } for (ObjectCreationExpr objectCreationExpr : callableBody.get().findAll(ObjectCreationExpr.class)) { @@ -523,7 +543,7 @@ private static List getCallSites(Optional callableBody) { // resolve arguments of the constructor call to types List arguments = objectCreationExpr.getArguments().stream() - .map(SymbolTable::resolveExpression).collect(Collectors.toList()); + .map(SymbolTable::resolveExpression).collect(Collectors.toList()); // resolve callee and get signature String calleeSignature = ""; @@ -535,20 +555,20 @@ private static List getCallSites(Optional callableBody) { // add a new call site object callSites.add(createCallSite(objectCreationExpr, "", - objectCreationExpr.getScope().isPresent() ? objectCreationExpr.getScope().get().toString() : "", - instantiatedType, arguments, instantiatedType, calleeSignature,false, true, AccessSpecifier.NONE)); + objectCreationExpr.getScope().isPresent() ? objectCreationExpr.getScope().get().toString() : "", + instantiatedType, arguments, instantiatedType, calleeSignature, false, true, AccessSpecifier.NONE)); } return callSites; } /** - * Creates and returns a new CallSite object for the given expression, which can be a method-call or - * object-creation expression. + * Creates and returns a new CallSite object for the given expression, which + * can be a method-call or object-creation expression. * * @param callExpr * @param calleeName - * @param receiverExpr + * @param receiverExpr * @param receiverType * @param arguments * @param isStaticCall @@ -556,8 +576,8 @@ private static List getCallSites(Optional callableBody) { * @return */ private static CallSite createCallSite(Expression callExpr, String calleeName, String receiverExpr, - String receiverType, List arguments, String returnType, - String calleeSignature, boolean isStaticCall, boolean isConstructorCall, AccessSpecifier accessSpecifier) { + String receiverType, List arguments, String returnType, + String calleeSignature, boolean isStaticCall, boolean isConstructorCall, AccessSpecifier accessSpecifier) { CallSite callSite = new CallSite(); callSite.setMethodName(calleeName); callSite.setReceiverExpr(receiverExpr); @@ -586,8 +606,8 @@ private static CallSite createCallSite(Expression callExpr, String calleeName, S } /** - * Calculates type for the given expression and returns the resolved type name, or empty string if - * exception occurs during type resolution. + * Calculates type for the given expression and returns the resolved type + * name, or empty string if exception occurs during type resolution. * * @param expression Expression to be resolved * @return Resolved type name or empty string if type resolution fails @@ -609,8 +629,10 @@ private static String resolveExpression(Expression expression) { } /** - * Resolves the given type and returns string representation of the resolved type. If type resolution - * fails, returns string representation (name) of the type. + * Resolves the given type and returns string representation of the resolved + * type. If type resolution fails, returns string representation (name) of + * the type. + * * @param type Type to be resolved * @return Resolved (qualified) type name */ @@ -628,18 +650,20 @@ private static String resolveType(Type type) { } /** - * Collects all source roots (e.g., "src/main/java", "src/test/java") under the given project root path - * using the symbol solver collection strategy. Parses all source files under each source root and - * returns the complete symbol table as map of file path and java compilation unit pairs. + * Collects all source roots (e.g., "src/main/java", "src/test/java") under + * the given project root path using the symbol solver collection strategy. + * Parses all source files under each source root and returns the complete + * symbol table as map of file path and java compilation unit pairs. * * @param projectRootPath root path of the project to be analyzed - * @return Pair of extracted symbol table map and parse problems map for project + * @return Pair of extracted symbol table map and parse problems map for + * project * @throws IOException */ public static Pair, Map>> extractAll(Path projectRootPath) throws IOException { SymbolSolverCollectionStrategy symbolSolverCollectionStrategy = new SymbolSolverCollectionStrategy(); ProjectRoot projectRoot = symbolSolverCollectionStrategy.collect(projectRootPath); - javaSymbolSolver = (JavaSymbolSolver)symbolSolverCollectionStrategy.getParserConfiguration().getSymbolResolver().get(); + javaSymbolSolver = (JavaSymbolSolver) symbolSolverCollectionStrategy.getParserConfiguration().getSymbolResolver().get(); Map symbolTable = new LinkedHashMap<>(); Map> parseProblems = new HashMap<>(); for (SourceRoot sourceRoot : projectRoot.getSourceRoots()) { @@ -647,8 +671,8 @@ public static Pair, Map>> if (parseResult.isSuccessful()) { CompilationUnit compilationUnit = parseResult.getResult().get(); symbolTable.put( - compilationUnit.getStorage().get().getPath().toString(), - processCompilationUnit(compilationUnit) + compilationUnit.getStorage().get().getPath().toString(), + processCompilationUnit(compilationUnit) ); } else { parseProblems.put(sourceRoot.getRoot().toString(), parseResult.getProblems()); @@ -682,7 +706,9 @@ public static Pair, Map>> } /** - * Parses the given set of Java source files from the given project and constructs the symbol table. + * Parses the given set of Java source files from the given project and + * constructs the symbol table. + * * @param projectRootPath * @param javaFilePaths * @return @@ -696,7 +722,7 @@ public static Pair, Map>> // create symbol solver and parser configuration SymbolSolverCollectionStrategy symbolSolverCollectionStrategy = new SymbolSolverCollectionStrategy(); ProjectRoot projectRoot = symbolSolverCollectionStrategy.collect(projectRootPath); - javaSymbolSolver = (JavaSymbolSolver)symbolSolverCollectionStrategy.getParserConfiguration().getSymbolResolver().get(); + javaSymbolSolver = (JavaSymbolSolver) symbolSolverCollectionStrategy.getParserConfiguration().getSymbolResolver().get(); ParserConfiguration parserConfiguration = new ParserConfiguration(); parserConfiguration.setSymbolResolver(javaSymbolSolver); diff --git a/src/main/java/com/ibm/cldk/SystemDependencyGraph.java b/src/main/java/com/ibm/cldk/SystemDependencyGraph.java index 4ea8b301..06fca3b9 100644 --- a/src/main/java/com/ibm/cldk/SystemDependencyGraph.java +++ b/src/main/java/com/ibm/cldk/SystemDependencyGraph.java @@ -13,10 +13,7 @@ package com.ibm.cldk; -import com.ibm.cldk.entities.AbstractGraphEdge; -import com.ibm.cldk.entities.CallEdge; -import com.ibm.cldk.entities.CallableVertex; -import com.ibm.cldk.entities.SystemDepEdge; +import com.ibm.cldk.entities.*; import com.ibm.cldk.utils.AnalysisUtils; import com.ibm.cldk.utils.Log; import com.ibm.cldk.utils.ScopeUtils; @@ -53,8 +50,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static com.ibm.cldk.utils.AnalysisUtils.createAndPutNewCallableInSymbolTable; -import static com.ibm.cldk.utils.AnalysisUtils.getCallableFromSymbolTable; +import static com.ibm.cldk.utils.AnalysisUtils.*; @Data @@ -277,7 +273,13 @@ public static List construct( + Math.ceil((double) (System.currentTimeMillis() - start_time) / 1000) + " seconds."); // set cyclomatic complexity for callables in the symbol table - AnalysisUtils.setCyclomaticComplexity(callGraph); + callGraph.forEach(cgNode -> { + Callable callable = getCallableObjectFromSymbolTable(cgNode.getMethod()).getRight(); + if (callable != null) { + callable.setCyclomaticComplexity(getCyclomaticComplexity(cgNode.getIR())); + } + }); + // Build SDG graph Log.info("Building System Dependency Graph."); diff --git a/src/main/java/com/ibm/cldk/entities/CallSite.java b/src/main/java/com/ibm/cldk/entities/CallSite.java index 83dd5ba5..a0437884 100644 --- a/src/main/java/com/ibm/cldk/entities/CallSite.java +++ b/src/main/java/com/ibm/cldk/entities/CallSite.java @@ -19,6 +19,7 @@ public class CallSite { private boolean isUnspecified = false; private boolean isStaticCall; private boolean isConstructorCall; + private boolean isDatabase = false; private int startLine; private int startColumn; private int endLine; diff --git a/src/main/java/com/ibm/cldk/utils/AnalysisUtils.java b/src/main/java/com/ibm/cldk/utils/AnalysisUtils.java index 3313c75b..db7d0bce 100644 --- a/src/main/java/com/ibm/cldk/utils/AnalysisUtils.java +++ b/src/main/java/com/ibm/cldk/utils/AnalysisUtils.java @@ -9,8 +9,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -*/ - + */ package com.ibm.cldk.utils; import static com.ibm.cldk.SymbolTable.declaredMethodsAndConstructors; @@ -35,6 +34,9 @@ import org.apache.commons.lang3.tuple.Pair; import org.objectweb.asm.Type; +import com.ibm.wala.ssa.ISSABasicBlock; +import com.ibm.wala.ssa.SSASwitchInstruction; + /** * The type Analysis utils. */ @@ -93,36 +95,31 @@ public static Map createAndPutNewCallableInSymbolTable(IMethod m } /** - * Computes and returns cyclomatic complexity for the given IR (for a method or constructor). + * Computes and returns cyclomatic complexity for the given IR (for a method + * or constructor). * * @param ir IR for method or constructor * @return int Cyclomatic complexity for method/constructor */ public static int getCyclomaticComplexity(IR ir) { - int branchCount = (int)Arrays.stream(ir.getInstructions()) - .filter(inst -> inst instanceof SSAConditionalBranchInstruction) - .count(); - return branchCount + 1; - } - - public static void setCyclomaticComplexity(CallGraph callGraph) { - callGraph.forEach( - cgNode -> { - if (cgNode.getMethod() != null) { - IMethod method = cgNode.getMethod(); - String declaringClassSignature = method.getDeclaringClass().getName().toString().substring(1).replace("/", ".").replace("$", "."); - List arguments = Arrays.stream(Type.getMethodType(method.getDescriptor().toString()).getArgumentTypes()).map(Type::getClassName).collect(Collectors.toList()); - String methodSignature = String.join("", method.getName().toString(), "(", String.join(", ", Optional.of(arguments).orElseGet(Collections::emptyList)), ")"); - Callable callable = declaredMethodsAndConstructors.get(declaringClassSignature, methodSignature); - if (callable != null) { - callable.setCyclomaticComplexity(getCyclomaticComplexity(cgNode.getIR())); - } - } - } - ); + if (ir == null) { + return 0; + } + int conditionalBranchCount = (int) Arrays.stream(ir.getInstructions()) + .filter(inst -> inst instanceof SSAConditionalBranchInstruction) + .count(); + int switchBranchCount = Arrays.stream(ir.getInstructions()) + .filter(inst -> inst instanceof SSASwitchInstruction) + .map(inst -> ((SSASwitchInstruction) inst).getCasesAndLabels().length).reduce(0, Integer::sum); + Iterable iterableBasicBlocks = ir::getBlocks; + int catchBlockCount = (int) StreamSupport.stream(iterableBasicBlocks.spliterator(), false) + .filter(ISSABasicBlock::isCatchBlock) + .count(); + return conditionalBranchCount + switchBranchCount + catchBlockCount + 1; } public static Map getCallableFromSymbolTable(IMethod method) { + // Get the class name, with a . representation. String declaringClassSignature = method.getDeclaringClass().getName().toString().substring(1).replace("/", ".").replace("$", "."); @@ -133,9 +130,9 @@ public static Map getCallableFromSymbolTable(IMethod method) { String methodSignature = String.join("", method.getName().toString(), "(", String.join(", ", Optional.of(arguments).orElseGet(Collections::emptyList)), ")"); Callable callable = declaredMethodsAndConstructors.get(declaringClassSignature, methodSignature); - if (callable == null) + if (callable == null) { return null; - else{ + } else { String signature = callable.getSignature(); if (signature.contains("")) { signature = signature.replace("", declaringClassSignature.substring(declaringClassSignature.lastIndexOf(".") + 1)); @@ -151,6 +148,21 @@ public static Map getCallableFromSymbolTable(IMethod method) { } } + public static Pair getCallableObjectFromSymbolTable(IMethod method) { + + // Get the class name, with a . representation. + String declaringClassSignature = method.getDeclaringClass().getName().toString().substring(1).replace("/", ".").replace("$", "."); + + // Get the method arguments, use a . notation for types. + List arguments = Arrays.stream(Type.getMethodType(method.getDescriptor().toString()).getArgumentTypes()).map(Type::getClassName).collect(Collectors.toList()); + + // Get the method signature. + String methodSignature = String.join("", method.getName().toString(), "(", String.join(", ", Optional.of(arguments).orElseGet(Collections::emptyList)), ")"); + + return Pair.of(declaringClassSignature, declaredMethodsAndConstructors.get(declaringClassSignature, methodSignature)); + } + + /** * Verfy if a class is an application class. * diff --git a/src/main/java/com/ibm/cldk/utils/BuildProject.java b/src/main/java/com/ibm/cldk/utils/BuildProject.java index ed0ce653..541eef0b 100644 --- a/src/main/java/com/ibm/cldk/utils/BuildProject.java +++ b/src/main/java/com/ibm/cldk/utils/BuildProject.java @@ -7,18 +7,47 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.text.MessageFormat; +import java.util.AbstractMap; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static com.ibm.cldk.CodeAnalyzer.projectRootPom; import static com.ibm.cldk.utils.ProjectDirectoryScanner.classFilesStream; public class BuildProject { public static Path libDownloadPath; private static final String LIB_DEPS_DOWNLOAD_DIR = "_library_dependencies"; - private static final String MAVEN_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn"; - private static final String GRADLE_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "gradlew"; - public static Path tempInitScript; + private static final String MAVEN_CMD = BuildProject.getMavenCommand(); + private static final String GRADLE_CMD = BuildProject.getGradleCommand(); + + /** + * Gets the maven command to be used for building the project. + * + * @return the maven command + */ + public static String getMavenCommand() { + String mvnSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null); + File mvnWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "mvnw.cmd") : new File(projectRootPom, "mvnw"); + return commandExists(mvnWrapper).getKey() ? mvnWrapper.toString() : mvnSystemCommand; + } + + /** + * Gets the gradle command to be used for building the project. + * + * @return the gradle command + */ + public static String getGradleCommand() { + String gradleSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "gradle.bat" : "gradle")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null); + File gradleWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "gradlew.bat") : new File(projectRootPom, "gradlew"); + + return commandExists(gradleWrapper).getKey() ? gradleWrapper.toString() : gradleSystemCommand; + } + + public static Path tempInitScript; + static { try { tempInitScript = Files.createTempFile("gradle-init-", ".gradle"); @@ -26,28 +55,40 @@ public class BuildProject { throw new RuntimeException(e); } } - private static final String GRADLE_DEPENDENCIES_TASK = "allprojects { afterEvaluate { project -> task downloadDependencies(type: Copy) {\n" + - " def configs = project.configurations.findAll { it.canBeResolved }\n\n" + - " dependsOn configs\n" + - " from configs\n" + - " into project.hasProperty('outputDir') ? project.property('outputDir') : \"${project.buildDir}/libs\"\n\n" + - " doFirst {\n" + - " println \"Downloading dependencies for project ${project.name} to: ${destinationDir}\"\n" + - " configs.each { config ->\n" + - " println \"Configuration: ${config.name}\"\n" + - " config.resolvedConfiguration.resolvedArtifacts.each { artifact ->\n" + - " println \"\t${artifact.moduleVersion.id}:${artifact.extension}\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - "}"; + + private static final String GRADLE_DEPENDENCIES_TASK = "allprojects { afterEvaluate { project -> task downloadDependencies(type: Copy) {\n" + " def configs = project.configurations.findAll { it.canBeResolved }\n\n" + " dependsOn configs\n" + " from configs\n" + " into project.hasProperty('outputDir') ? project.property('outputDir') : \"${project.buildDir}/libs\"\n\n" + " doFirst {\n" + " println \"Downloading dependencies for project ${project.name} to: ${destinationDir}\"\n" + " configs.each { config ->\n" + " println \"Configuration: ${config.name}\"\n" + " config.resolvedConfiguration.resolvedArtifacts.each { artifact ->\n" + " println \"\t${artifact.moduleVersion.id}:${artifact.extension}\"\n" + " }\n" + " }\n" + " }\n" + " }\n" + " }\n" + "}"; + + private static AbstractMap.SimpleEntry commandExists(File command) { + StringBuilder output = new StringBuilder(); + if (!command.exists()) { + return new AbstractMap.SimpleEntry<>(false, MessageFormat.format("Command {0} does not exist.", command)); + } + try { + Process process = new ProcessBuilder().directory(new File(projectRootPom)).command(String.valueOf(command), "--version").start(); + // Read the output stream + BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line; + while ((line = reader.readLine()) != null) { + output.append(line).append("\n"); + } + + // Read the error stream + BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); + while ((line = errorReader.readLine()) != null) { + output.append(line).append("\n"); + } + + int exitCode = process.waitFor(); + return new AbstractMap.SimpleEntry<>(exitCode == 0, output.toString().trim()); + } catch (IOException | InterruptedException exceptions) { + Log.error(exceptions.getMessage()); + return new AbstractMap.SimpleEntry<>(false, exceptions.getMessage()); + } + } private static boolean buildWithTool(String[] buildCommand) { Log.info("Building the project using " + buildCommand[0] + "."); - ProcessBuilder processBuilder = new ProcessBuilder(buildCommand); - + ProcessBuilder processBuilder = new ProcessBuilder().directory(new File(projectRootPom)).command(buildCommand); try { Process process = processBuilder.start(); BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); @@ -71,13 +112,12 @@ private static boolean buildWithTool(String[] buildCommand) { * @return true if Maven is installed, false otherwise. */ private static boolean isMavenInstalled() { - ProcessBuilder processBuilder = new ProcessBuilder(MAVEN_CMD, "--version"); + ProcessBuilder processBuilder = new ProcessBuilder().directory(new File(projectRootPom)).command(MAVEN_CMD, "--version"); try { Process process = processBuilder.start(); BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); String line = reader.readLine(); // Read the first line of the output if (line != null && line.contains("Apache Maven")) { - Log.info("Maven is installed: " + line); return true; } } catch (IOException e) { @@ -99,19 +139,19 @@ private static boolean mavenBuild(String projectPath) { Log.info("Checking if Maven is installed."); return false; } - String[] mavenCommand = { - MAVEN_CMD, "clean", "compile", "-f", projectPath + "/pom.xml", "-B", "-V", "-e", "-Drat.skip", - "-Dfindbugs.skip", "-Dcheckstyle.skip", "-Dpmd.skip=true", "-Dspotbugs.skip", "-Denforcer.skip", - "-Dmaven.javadoc.skip", "-DskipTests", "-Dmaven.test.skip.exec", "-Dlicense.skip=true", - "-Drat.skip=true", "-Dspotless.check.skip=true"}; + String[] mavenCommand = {MAVEN_CMD, "clean", "compile", "-f", projectPath + "/pom.xml", "-B", "-V", "-e", "-Drat.skip", "-Dfindbugs.skip", "-Dcheckstyle.skip", "-Dpmd.skip=true", "-Dspotbugs.skip", "-Denforcer.skip", "-Dmaven.javadoc.skip", "-DskipTests", "-Dmaven.test.skip.exec", "-Dlicense.skip=true", "-Drat.skip=true", "-Dspotless.check.skip=true"}; return buildWithTool(mavenCommand); } public static boolean gradleBuild(String projectPath) { // Adjust Gradle command as needed - String gradleWrapper = projectPath + File.separator + GRADLE_CMD; - String[] gradleCommand = {gradleWrapper, "clean", "compileJava", "-p", projectPath}; + String[] gradleCommand; + if (GRADLE_CMD.equals("gradlew") || GRADLE_CMD.equals("gradlew.bat")) { + gradleCommand = new String[]{projectPath + File.separator + GRADLE_CMD, "clean", "compileJava", "-p", projectPath}; + } else { + gradleCommand = new String[]{GRADLE_CMD, "clean", "compileJava", "-p", projectPath}; + } return buildWithTool(gradleCommand); } @@ -143,18 +183,19 @@ private static boolean buildProject(String projectPath, String build) { * @return true if the streaming was successful, false otherwise. */ public static List buildProjectAndStreamClassFiles(String projectPath, String build) throws IOException { - return buildProject(projectPath, build) ? classFilesStream(projectPath) : null; + return buildProject(projectPath, build) ? classFilesStream(projectPath) : new ArrayList<>(); } /** - * Downloads library dependency jars of the given project so that the jars can be used - * for type resolution during symbol table creation. + * Downloads library dependency jars of the given project so that the jars + * can be used for type resolution during symbol table creation. * * @param projectPath Path to the project under analysis * @return true if dependency download succeeds; false otherwise */ - public static boolean downloadLibraryDependencies(String projectPath) throws IOException { + public static boolean downloadLibraryDependencies(String projectPath, String projectRootPom) throws IOException { // created download dir if it does not exist + String projectRoot = projectRootPom != null ? projectRootPom : projectPath; libDownloadPath = Paths.get(projectPath, LIB_DEPS_DOWNLOAD_DIR).toAbsolutePath(); if (!Files.exists(libDownloadPath)) { try { @@ -164,21 +205,40 @@ public static boolean downloadLibraryDependencies(String projectPath) throws IOE return false; } } - File pomFile = new File(projectPath, "pom.xml"); + File pomFile = new File(projectRoot, "pom.xml"); if (pomFile.exists()) { + if (MAVEN_CMD == null || !commandExists(new File(MAVEN_CMD)).getKey()) { + String msg = MAVEN_CMD == null + ? "Could not find Maven or a valid Maven Wrapper" + : MessageFormat.format("Could not verify that {0} exists", MAVEN_CMD); + Log.error(msg); + throw new IllegalStateException("Unable to execute Maven command. " + + (MAVEN_CMD == null + ? "Could not find Maven or a valid Maven Wrapper" + : "Attempt failed with message\n" + commandExists(new File(MAVEN_CMD)).getValue())); + } Log.info("Found pom.xml in the project directory. Using Maven to download dependencies."); - String[] mavenCommand = { - MAVEN_CMD, "--no-transfer-progress", "-f", - Paths.get(projectPath, "pom.xml").toString(), - "dependency:copy-dependencies", - "-DoutputDirectory=" + libDownloadPath.toString() - }; + String[] mavenCommand = {MAVEN_CMD, "--no-transfer-progress", "-f", Paths.get(projectRoot, "pom.xml").toString(), "dependency:copy-dependencies", "-DoutputDirectory=" + libDownloadPath.toString()}; return buildWithTool(mavenCommand); - } else if (new File(projectPath, "build.gradle").exists() || new File(projectPath, "build.gradle.kts").exists()) { - Log.info("Found build.gradle[.kts] in the project directory. Using Gradle to download dependencies."); + } else if (new File(projectRoot, "build.gradle").exists() || new File(projectRoot, "build.gradle.kts").exists()) { + if (GRADLE_CMD == null || !commandExists(new File(GRADLE_CMD)).getKey()) { + String msg = GRADLE_CMD == null + ? "Could not find Gradle or valid Gradle Wrapper" + : MessageFormat.format("Could not verify that {0} exists", GRADLE_CMD); + Log.error(msg); + throw new IllegalStateException("Unable to execute Maven command. " + + (GRADLE_CMD == null + ? "Could not find Gradle or valid Gradle Wrapper" + : "Attempt failed with message\n" + commandExists(new File(GRADLE_CMD)).getValue())); + } + Log.info("Found build.gradle or build.gradle.kts in the project directory. Using Gradle to download dependencies."); tempInitScript = Files.writeString(tempInitScript, GRADLE_DEPENDENCIES_TASK); - String[] gradleCommand = {projectPath + File.separator + GRADLE_CMD, "--init-script", tempInitScript.toFile().getAbsolutePath(), "downloadDependencies", "-PoutputDir="+libDownloadPath.toString()}; - System.out.println(Arrays.toString(gradleCommand)); + String[] gradleCommand; + if (GRADLE_CMD.equals("gradlew") || GRADLE_CMD.equals("gradlew.bat")) { + gradleCommand = new String[]{projectRoot + File.separator + GRADLE_CMD, "--init-script", tempInitScript.toFile().getAbsolutePath(), "downloadDependencies", "-PoutputDir=" + libDownloadPath.toString()}; + } else { + gradleCommand = new String[]{GRADLE_CMD, "--init-script", tempInitScript.toFile().getAbsolutePath(), "downloadDependencies", "-PoutputDir=" + libDownloadPath.toString()}; + } return buildWithTool(gradleCommand); } return false; @@ -188,10 +248,7 @@ public static void cleanLibraryDependencies() { if (libDownloadPath != null) { Log.info("Cleaning up library dependency directory: " + libDownloadPath); try { - Files.walk(libDownloadPath) - .filter(Files::isRegularFile) - .map(Path::toFile) - .forEach(File::delete); + Files.walk(libDownloadPath).filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete); Files.delete(libDownloadPath); } catch (IOException e) { Log.error("Error deleting library dependency directory: " + e.getMessage()); diff --git a/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java b/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java new file mode 100644 index 00000000..4b5a19f8 --- /dev/null +++ b/src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java @@ -0,0 +1,145 @@ +package com.ibm.cldk; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; +import org.testcontainers.containers.BindMode; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.utility.MountableFile; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.text.MessageFormat; +import java.util.Properties; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +@Testcontainers +@SuppressWarnings("resource") +public class CodeAnalyzerIntegrationTest { + + /** + * Creates a Java 11 test container that mounts the build/libs folder. + */ + static String codeanalyzerVersion; + static final String javaVersion = "17"; + + static { + // Build project first + try { + Process process = new ProcessBuilder("./gradlew", "fatJar") + .directory(new File(System.getProperty("user.dir"))) + .start(); + if (process.waitFor() != 0) { + throw new RuntimeException("Build failed"); + } + } catch (IOException | InterruptedException e) { + throw new RuntimeException("Failed to build codeanalyzer", e); + } + } + + @Container + static final GenericContainer container = new GenericContainer<>("openjdk:17-jdk") + .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh")) + .withCommand("-c", "while true; do sleep 1; done") + .withFileSystemBind( + String.valueOf(Paths.get(System.getProperty("user.dir")).resolve("build/libs")), + "/opt/jars", + BindMode.READ_WRITE) + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("build/libs")), "/opt/jars") + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications")), "/"); + + @Container + static final GenericContainer mavenContainer = new GenericContainer<>("maven:3.8.3-openjdk-17") + .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh")) + .withCommand("-c", "while true; do sleep 1; done") + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("build/libs")), "/opt/jars") + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get(System.getProperty("user.dir")).resolve("src/test/resources/test-applications")), "/"); + + + @BeforeAll + static void setUp() { + Properties properties = new Properties(); + try (FileInputStream fis = new FileInputStream( + Paths.get(System.getProperty("user.dir"), "gradle.properties").toFile())) { + properties.load(fis); + } catch (IOException e) { + throw new RuntimeException(e); + } + codeanalyzerVersion = properties.getProperty("version"); + } + + @Test + void shouldHaveCorrectJavaVersionInstalled() throws Exception { + var baseContainerresult = container.execInContainer("java", "-version"); + var mvnContainerresult = mavenContainer.execInContainer("java", "-version"); + Assertions.assertTrue(baseContainerresult.getStderr().contains("openjdk version \"" + javaVersion), "Base container Java version should be " + javaVersion); + Assertions.assertTrue(mvnContainerresult.getStderr().contains("openjdk version \"" + javaVersion), "Maven container Java version should be " + javaVersion); + } + + @Test + void shouldHaveCodeAnalyzerJar() throws Exception { + var dirContents = container.execInContainer("ls", "/opt/jars/"); + Assertions.assertTrue(dirContents.getStdout().length() > 0, "Directory listing should not be empty"); + Assertions.assertTrue(dirContents.getStdout().contains("codeanalyzer"), "Codeanalyzer.jar not found in the container."); + } + + @Test + void shouldBeAbleToRunCodeAnalyzer() throws Exception { + var runCodeAnalyzerJar = container.execInContainer( + "java", + "-jar", + String.format("/opt/jars/codeanalyzer-%s.jar", codeanalyzerVersion), + "--help" + ); + + Assertions.assertEquals(0, runCodeAnalyzerJar.getExitCode(), + "Command should execute successfully"); + Assertions.assertFalse(runCodeAnalyzerJar.getStdout().isEmpty(), "Should have some output"); + } + + @Test + void corruptMavenShouldNotBuildWithWrapper() throws IOException, InterruptedException { + // Make executable + mavenContainer.execInContainer("chmod", "+x", "/test-applications/mvnw-corrupt-test/mvnw"); + // Let's start by building the project by itself + var mavenProjectBuildWithWrapper = mavenContainer.withWorkingDirectory("/test-applications/mvnw-corrupt-test").execInContainer("/test-applications/mvnw-corrupt-test/mvnw", "clean", "compile"); + Assertions.assertNotEquals(0, mavenProjectBuildWithWrapper.getExitCode()); + } + + @Test + void corruptMavenShouldProduceAnalysisArtifactsWhenMVNCommandIsInPath() throws IOException, InterruptedException { + // Let's start by building the project by itself + var corruptMavenProjectBuild = mavenContainer.withWorkingDirectory("/test-applications/mvnw-corrupt-test").execInContainer("mvn", "-f", "/test-applications/mvnw-corrupt-test/pom.xml", "clean", "compile"); + Assertions.assertEquals(0, corruptMavenProjectBuild.getExitCode(), "Failed to build the project with system's default Maven."); + // NOw run codeanalyzer and assert if analysis.json is generated. + var runCodeAnalyzer = mavenContainer.execInContainer("java", "-jar", String.format("/opt/jars/codeanalyzer-%s.jar", codeanalyzerVersion), "--input=/test-applications/mvnw-corrupt-test", "--output=/tmp/", "--analysis-level=2", "--verbose", "--no-build"); + var codeAnalyzerOutputDirContents = mavenContainer.execInContainer("ls", "/tmp/analysis.json"); + String codeAnalyzerOutputDirContentsStdOut = codeAnalyzerOutputDirContents.getStdout(); + Assertions.assertTrue(codeAnalyzerOutputDirContentsStdOut.length() > 0, "Could not find 'analysis.json'."); + // mvnw is corrupt, so we should see an error message in the output. + Assertions.assertTrue(runCodeAnalyzer.getStdout().contains("[ERROR]\tCannot run program \"/test-applications/mvnw-corrupt-test/mvnw\"") && runCodeAnalyzer.getStdout().contains("/mvn.")); + // We should correctly identify the build tool used in the mvn command from the system path. + Assertions.assertTrue(runCodeAnalyzer.getStdout().contains("[INFO]\tBuilding the project using /usr/bin/mvn.")); + } + + @Test + void corruptMavenShouldNotTerminateWithErrorWhenMavenIsNotPresentUnlessAnalysisLevel2() throws IOException, InterruptedException { + // When analysis level 2, we should get a Runtime Exception + var runCodeAnalyzer = container.execInContainer( + "java", + "-jar", + String.format("/opt/jars/codeanalyzer-%s.jar", codeanalyzerVersion), + "--input=/test-applications/mvnw-corrupt-test", + "--output=/tmp/", + "--analysis-level=2" + ); + Assertions.assertEquals(1, runCodeAnalyzer.getExitCode()); + Assertions.assertTrue(runCodeAnalyzer.getStderr().contains("java.lang.RuntimeException")); + } +} \ No newline at end of file diff --git a/src/test/java/com/ibm/cldk/CodeAnalyzerTest.java b/src/test/java/com/ibm/cldk/CodeAnalyzerTest.java deleted file mode 100644 index 96b0df4f..00000000 --- a/src/test/java/com/ibm/cldk/CodeAnalyzerTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ibm.cldk; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -class CodeAnalyzerTest { - - @BeforeEach - void setUp() { - } - - @AfterEach - void tearDown() { - } - - @Test - void testOutputJSONShape() { - - } - - private boolean compareJsonStructure(JsonElement referenceElement, JsonElement actualElement) { - if (referenceElement.isJsonObject() && actualElement.isJsonObject()) { - JsonObject referenceObject = referenceElement.getAsJsonObject(); - JsonObject actualObject = actualElement.getAsJsonObject(); - - // Ensure that all keys in the reference JSON are present in the actual JSON - for (String key : referenceObject.keySet()) { - if (!actualObject.has(key)) { - return false; - } - // Recursively compare the child elements - if (!compareJsonStructure(referenceObject.get(key), actualObject.get(key))) { - return false; - } - } - } else if (referenceElement.isJsonArray() && actualElement.isJsonArray()) { - // If both are arrays, compare their elements - JsonArray referenceArray = referenceElement.getAsJsonArray(); - JsonArray actualArray = actualElement.getAsJsonArray(); - if (referenceArray.size() != actualArray.size()) { - return false; - } - for (int i = 0; i < referenceArray.size(); i++) { - if (!compareJsonStructure(referenceArray.get(i), actualArray.get(i))) { - return false; - } - } - } - // If neither is an object or array, just return true (for primitives) - return true; - } -} \ No newline at end of file diff --git a/src/test/java/com/ibm/cldk/utils/BuildProjectTest.java b/src/test/java/com/ibm/cldk/utils/BuildProjectTest.java new file mode 100644 index 00000000..48e3aae0 --- /dev/null +++ b/src/test/java/com/ibm/cldk/utils/BuildProjectTest.java @@ -0,0 +1,4 @@ +package com.ibm.cldk.utils; + +public class BuildProjectTest { +} diff --git a/src/test/resources/gradlew-corrupt-test/.dockerignore b/src/test/resources/gradlew-corrupt-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/resources/gradlew-corrupt-test/.gitignore b/src/test/resources/gradlew-corrupt-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/resources/gradlew-corrupt-test/Dockerfile b/src/test/resources/gradlew-corrupt-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/resources/gradlew-corrupt-test/README.txt b/src/test/resources/gradlew-corrupt-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/resources/gradlew-corrupt-test/build.gradle b/src/test/resources/gradlew-corrupt-test/build.gradle new file mode 100644 index 00000000..c80e50c1 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/build.gradle @@ -0,0 +1,37 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'javax:javaee-api:7.0' + compileOnly 'org.eclipse.microprofile:microprofile:1.4' +} + +group = 'com.demo' +version = '1.0-SNAPSHOT' +description = 'my-javaee-mvn' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/src/test/resources/gradlew-corrupt-test/build/tmp/compileJava/previous-compilation-data.bin b/src/test/resources/gradlew-corrupt-test/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..0b2935da2c925a33b59b2ceded7ad0eda3034ee0 GIT binary patch literal 4219 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/src/test/resources/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties b/src/test/resources/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/resources/gradlew-corrupt-test/gradlew b/src/test/resources/gradlew-corrupt-test/gradlew new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/gradlew-corrupt-test/gradlew.bat b/src/test/resources/gradlew-corrupt-test/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/resources/gradlew-corrupt-test/settings.gradle b/src/test/resources/gradlew-corrupt-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/resources/gradlew-corrupt-test/src/main/liberty/config/server.xml b/src/test/resources/gradlew-corrupt-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/resources/gradlew-corrupt-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/resources/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/gradlew-working-test/.dockerignore b/src/test/resources/gradlew-working-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/resources/gradlew-working-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/resources/gradlew-working-test/.gitignore b/src/test/resources/gradlew-working-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/resources/gradlew-working-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/resources/gradlew-working-test/Dockerfile b/src/test/resources/gradlew-working-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/resources/gradlew-working-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/resources/gradlew-working-test/README.txt b/src/test/resources/gradlew-working-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/resources/gradlew-working-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/resources/gradlew-working-test/build.gradle b/src/test/resources/gradlew-working-test/build.gradle new file mode 100644 index 00000000..c80e50c1 --- /dev/null +++ b/src/test/resources/gradlew-working-test/build.gradle @@ -0,0 +1,37 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'javax:javaee-api:7.0' + compileOnly 'org.eclipse.microprofile:microprofile:1.4' +} + +group = 'com.demo' +version = '1.0-SNAPSHOT' +description = 'my-javaee-mvn' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/src/test/resources/gradlew-working-test/build/tmp/compileJava/previous-compilation-data.bin b/src/test/resources/gradlew-working-test/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..0b2935da2c925a33b59b2ceded7ad0eda3034ee0 GIT binary patch literal 4219 zcmYLM30#a@8$ag=Q;9c1)Rh!jPn4^&Hl|WZ`WlJ2+%fZ3quI>7laeLvDXGwMizqEp zL~)~#rMmWgzjocYxR%1rlJ9xDzx#dDuX)b$JkR+*>p4S^5c?C_jT+GIC{C(Y_CWD6 zR;liZ;PHzy;jSrI0nVZm8>aBWVPW6mSggRkRIOzNMqP^&+#SS@bb!EgB1(>svKrnA7~mij4gdf9ME^UI{YWQK zC+bXH=wvzt#i_L+QvrxnA=l{GX=tNTF4d|vT6M5o!A?g>Y7MKBXyh|c>i@0QxuOIm zE0arvXro3V4U>ehsYB?E9WAGjFGAL z-dUcV>vq@PxoMyqRpl=75X}-hdV+^^IzaA)64dH2IqMBn6)X>7noiN=Zbn>Z+4zr! zckj;E&89xoX%0$YReGgP$b#Z`6!hQk?T0^Kd}r%iIFM^*w1Wk5>LOez`n;r z>AgV(C3&d}=t3Gqofn}*rCP=+bgn|?lUIq-?o@t6z|zl4RF3PEi|J3)X$jf@nb{Rm zz_z9Ba!%v4uwHIU?0sXZoo+3qKT`>HS%x+ROY{nkQ!7}lL?vaVD24quav-*31!pPH zjQF_uRr#BT)6Z^^QImR-|B(4ic3Rwwg&z~1I67awQXS~jprJuR=14%r?_=ccnN{RV zVvBQ~^9r%nU+2!*>c!z=Gt-rP0(NDHAOgiJHC$vQB&LF01?x(Qii422pZvJksCbe1 zi1FtAhBrp0N72>PWerLKk7(smz#{1Db?fHK($Wvl+EZO;cHCG?*HOP{3>_kZ6Efr7 zwy7dbXgOz_>DFW47`z}B(>P4yF-^d9U?T8FC>2Q<#V?bqWP=3B7{w|T8!(E| zG0m$6bX;hPt-rE=(TC+Hj|)>UO~uq@BZe&NN>m{;(j)iR@7){NjUM))vi{tmG%VVL z=cHp#GwTct3Co45WtkXl0M9|j$)OE-vvtk&v9q%JnLqYTXgA)n8PhG8I&H-$DU_AS zx*|Q#j{EQ?H-ou8*-F|JHsXF3rrDSV<$xloM4?y)U28eKtwj-&N@~N+huv|_ z#o}M^EXO>6$EsLxkSU|kgnf~nSnD<|bIF(b3A0bD7A7=QWopG zCqbV!>#KVK7VW^$(RP9owTc5bGE2T?jbw&5_HwbQ^GdVYd#ezOV{j1|2N|Q3Fg`o$ zot&Bl1KbC?M4Y!;tKWr1#dwZc2}a3~?{Y|B&YNk=Hqz2N536E+k2>o1F6T)pb}Pf8 z-PpSv(><6DsK6*i#_FV6xrS3~1(gs4oyL1F*!#alCV$dk|CDc>%5LK4K{@^&G5heW zDm;(d4+lX-K>=#H1N@;-F#w!pemb4AW}V5o1w(K3^^u%={<0d2YOv7pAlR;pR7rPY z=H}rG6)D4odp*3o%vblhT4cf0KGu}~q~ZRW5N+A*%JE0H4q=~PaiC)@$UrM&4?~ck zb@1M0$_3J0D)UPwR(&3egLI!fk6>B{G1`uWOtD5C61C98vFz2rsEr;YNj;`V!RyCB zn!iuFLY#YUTnE|NQS;<>*rJ$GOAj8$v;oB3gv>g%tnA8iHnh+sc?%l$ru77#e-hJE zn4ZS85z{G607k6~kq>GHr}4_5Eaj>Y!Eb!ryJk#jyNm4tPj0Hn&vf*pyre~X=9Tbm zc+iO2H&Zt|`+AQ|&h5+mcFC;TyyGM8TvRpon6t^bGgy?4Gchya@{On3{OT{Yvx2*Q zZ2ua27E?bV6ImLN*|V_dc8<_!f8Ka2`*WC{2e?b1E4AAmcD>ct;QhmZs}(bSwHGkG z2t{%Uqg4JHfvlGTIw3Q?WZK0lk*VaXaqfbF&##QSj71I*gSXQI&dzFfUzii`5|%w` z&G9SP?JBla3j&$ZtJM*G$lwCQo*55{E|}fEhUs;_0B?Yua@BHH3KhOA#r7*&E zvUi%l?UjA;CZ@MAb-oQ%t<%Vb%;?J1QE}~4FI5>=U8wWuWpD?JLhge9LZK9yonNy` zGapu@Z{4SNS=+ftH-ULJ)j3O3@g{6Tp5*TOp)b70F*)7l`QtnDCvP9$ICihCwc;Lj zufe~AhH(B#F;?(k(uLfO=lxVonP(RcntC74dVuLe=qrN+k02NMM3Hc;jCmf|At;+s2L# z|I+(faopTC1Do1jEm-si4jeMLwX3J7zzGn2=6vYa19RhE*cHX*-XHiP&;B{45+PIb z{=_wD`iFku&MOkjnoNs!U?%$I?q(N*X(K);*IEax_YHi3>7SUs2{R=|-2E4m`C3wH0V+4MkXZNFLlU0w-Y{Bfe z*zFy*eUJSe=0p5k?nXC$E*WT-pXgoP5?ibdU{2_toUJLi6E(^<Oy0^W?U z*0G0yc!B)gqhA6Y)>`*y$9^BMSHF*Nib~FX0vGXjAoFS*-DV&Di`}0cOA?bm=1=(> z(+Bub5f1vmDV20LBt-d$#WdSdyMwY{9aVEPsOoC8H^-CEbytw~(a*L~va z)?1EezG2!4^1(u8l`9>-e_-0`tcKx3eXp-v_#L}P6VZAy$FT%^#}JgLV3mBdWzC|w zPEDt5%1%7}tKz7rCYI1RLj7)l^4XiLl`k_(lZ z5xeTSDC27ap^1bh5$ci*TA|x3xX{}my)WzB)XpS#^AShan8i3{FW*3*+=UF&@%hl> zpv2$5`keLd-ccEt!pp*~cI4yNrx8wJ*mUlyUYj%#sf2DMbTzzqPTFd`bFKzW-x1Je z)pXQwR~n(4;IMQ8F4S|OLMEqfU+bK4n=dZgZxog|M}9MdxMvd4X5#5+orz-zW84t* zSJ}E38THR6d*>ZLm;W9!qixR7^TRq*WKEWTH-4_G+d{-!iI+nb=u~O+TsA=ooR)?7 zoHe|%^_XCabj7y5C*mJIcgP{0xg_9+U%*mLh!!rkJQzt-GI;+mjhQuL?}i;ymn3gI+KoPG4-vv>$ek+^|*lWPgW&!y~OKsRG^FPJE_e@ zVfmLnI|$uLXwX)WbA4ey#LG?Jd8kiQ@0Ya=Zwm=6BG4^(ovty5ZY0$fKZ+0Pu{i3x zP3SHnE+%swN&vf_>oS6oRUEMDZ#HtbS6hO-Z^Mk_QsQ1l#11RLDWeaV%@9Y43(|JX z`RqFW)x_OIG{lSPZ!#|?eA;*M8s&pe(thu0IiY(9b*ccJ3b~5Ep3~f}X63Yxdlopx zy;@T{-MkWVViGxM8IK`}i&aT>emkN3HI3Ec-KJO!Aq{n+s9>eU)~{F3k1+sjo| zpiju0+F2dbY%ZZN&(M(E8b8>ZQ~wY<{#V4kj@LHND<;fBK*Y0~NRKYp;gw8p2! zB)I6eC;JIK07@$$Te{&NUmQ=}dhe2(bnvp?yQftX>MUgD9V*P6LR&{g1@-hau+?3t zA@m>!90L?HUN)ruY`D8Dz$(GRJJIgaA>udWSMWdFh~2I0|;`UhI$33o93$_YX4@O>Ghd;IJfMq-S}TYLqh z`xsT})OxLy9jb-5F+3I3s-ge?r83kmT%ypkc0)rYx}nlgi7JGZJ>zv$W7NXa9D+jr zQN07E#G(MBxBNPs6@XE<_gF1PZTwCyc0ld?PG98EH3bei3@Ql>)G)Zr!}-p0yv1k* z$ezJzID??|{8AxCX*|`Vc!H799b8E)RLhePbeJbw2&(64B|(>gsmBf&wE?hNhzh#Gi-9W;y!8`xQ>?mYy37}G}RQv5G@;K9aCgf*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~ ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u z=ASkePDZA-X8)rp%D;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5 z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5 zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59e zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!) zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl z(o?YlOI=jl(`L9^ z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d* zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP zWOeX5G;9(m@?GOG7g;e74i_|SmE?`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB z?2iK-u(DC_T1};KaUT@3nP~LEcENT^UgPvp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)na-5x1#OsVE#m*+k84Y^+UMeSAa zbrVZHU=mFwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7~-6hl;*-*}2Xz;J#a8Wn;_B5=m zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{ z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*#1!6}5K<*xDPJ{wv4& zM$17DFd~L*Te3A%yD;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0> z@x>;EzyBv>AI-~{D6l6{ST=em*U( z(r$nuXY-#CCi^8Z2#v#UXOt`dbYN1z5jzNF2 z411?w)whZrfA20;nl&C1Gi+gk<`JSm+{|*2o<< zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto& zR`c~ClHpE~4Z=uKa5S(-?M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F>k6k zz21?d+dw7b&i*>Kv5L(LH-?J%@WnqT7j#qZ9B>|Zl+=> z^U-pV@1y_ptHo4hl^cPRWewbLQ#g6XYQ@EkiP z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It z0CBpUcMA*QvsPy)#lr!lIdCi@1k4V2m!NH)%Px(vu-r(Q)HYc!p zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMiNP_o*lvx*q%_odv49Dsv$NV;6J z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB8zyvh*xhHKE``99>y#TdD z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4 z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@ zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp zOH4qlEOW4OMUc)_m)fMR_rl^pCfXc{$fQbI*E&mV77}kRF z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf! zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr# zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-PyuqGn3^M^Rz%WT{e?OI^svARX&SAdU77V(C~ zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<%z*+!*<e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4 z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!dchdkRiHbXW1FMrIIBwjsai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^# z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5ShD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@ zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&5#YbXkl`q?<*XtsqD z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-} z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;RN zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0 zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7z|=ALF5SNGkrtPG@Y~niUQV2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHpyznGG4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc? zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9ZybFY%jdnA)PeHvtBe- zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>( z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7 zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe zq!K%{e-rT5jX19`(bP23LUN4+_zh2KD~EAYzhpEO3MUG8@}uBHH@4J zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V%|; zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7 z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa z@w;^c|K3da#$TB0P3;MPlF7RuQeXT$ zS<<|C0OF(k)>fr&wOB=gP8!Qm>F41u;3esv7_0l%QHt(~+n; zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90jH@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`? zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb zpe^BChDK>sc-WLKl<6 zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re* zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK| zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#* zBP=a{)K#CwIY%p} zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!OY{eB24%xY7ml@|M7I(Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{ zv9@%7*#RI9;fv;Yii5CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0 zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^CfoY`?|#x9)-*yjv#lo&zP=uI`M?J zbzC<^3x7GfXA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_ zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W* z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L z@w67!DqVf7D%7XtXX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k= zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb zv(n3+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L65B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR z>U+KQekVGon)Yi<93(d!(yw1h3&X0N(PxN2{%vn}cnV?rYw z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpAi-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_ znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$ z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7sBDOA)$VThRCI0_+2=( zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;hg0Umh#c;hU3RhCUX=8aR>rmd` z7Orw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y( zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF& zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K| z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3 zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$I{Z^Hsj@D=E{MnnL+TbC@HEU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG zlP>XLMj2!VF^0k#ole7`-c~*~+_T5ls?x4)ah(j8vo_ zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@ z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j z1v&%a;OSKc8EIrodmIiw$lOES2hzGDcjjB`kEDfJe{r}yE6`eZL zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3 z03s0-sSlwbvgi&_R8s={6<~M^pGvBNjKOa>tWenzS8s zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+ zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2 zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_ z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE& z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{ zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3 z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_$r-2{$d~0g2oLETx9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f# zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)>gpS~1rNEh z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-pqZ1t|?cnaVOd;1(h9 z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al zvLo7Xte=C{aIt*otJD}BUq)|_pdR>{zBMT< z(^1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb- z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4` z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@ zM2NVLDxZ@GIv7*gzl1 zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U} zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl@O!Ak;(o*m!pZqe9 z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&q zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I> z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe= z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65 z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM z`Ub{+J3dMD!)mzC8b(2tZtokKW5pAwHa?NFiso~# z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3 z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4 z7ib0UOPqN40X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl})G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0 zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3 z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_ zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{ z0QQ(8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!IgDTVqt31wX#n+@!a_A0ZQkA zCJ2@M_4Gb5MfCrm5UPggeyh)8 zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgDs4swy5&8RAHZ~$)hrTF4W zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(35$ zWa07ON$`OMBOHgCmfO(9RFc<)?$x)N}Jd2A(<*Ll7+4jrRt9w zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8 z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+; zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+ zmcZ6?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50; zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?MM`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$ zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8 zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN zv98?fqqTUH8r8C7v(cx#BQ5P9W>- zmW93;eH6T`vuJ~rqtIBg%A6>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB zK_7G3!n7PL>d!kj){HQE zE8(%J%dWLh1_k%gVXTZt zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i( zZcTT@2`9(Mecptm@{3A_Y(X`w9K0EwtPq~O!16bq{7c0f7#(3wn-^)h zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7 zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH zqgcqW>Gm?6oV#AldDPKVRcEyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT zBbj@*SY;o2^_h*>R0e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot zmb)sZaly_P%BeX_9 zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}> z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e! z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-Nj$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR= z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@a? z%({Gn14b4-a|#uY^=@iiKH+k?~~wTj5K1A&hU z2^9-HTC)7zpoWK|$JXaBL6C z#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#yEFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={( zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|FAcx?r4$N z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd-(+9>G7*Nt%T zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6 zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8 ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5 z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%* zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9 zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ( zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;? zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?S|P z5|6b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0 zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S z7l(riiCwgghC=Lm5hWGf5NdGp#01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd z*6+-QXJ*&Kvk9ht0f0*rO_|FMBALen{j7T1l%=Q>gf#kma zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3 zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3< zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+Ln1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7 zcMcD$Hsjko3`-{bn)jPL6E9Ds{WskMrivsUu5apD z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90KT!JXUhYS`ZgX3jnu@Ja^seA*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S z6NE`3z!IS^$s7m}PCwQutVQ#~w+V z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_) zvE|L(L1jP@F%gOGtnlXtIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd>XI3-O?Wp z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm znsNt@Q&N{TLrmsoKFw0&_M9$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(- zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x z0$!q7iFu zZ`tryM70qBI6JWWTF9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye} zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*H9=l=D3r!GLM?UV zOxa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D zzDp3c9yEbGCY$U<8biJ_gB*`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu$$-C=*|X?R0~hu z8`J6TdgflslhrmDZq1f?GXF7*ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC z)ff9Yk?wZ}dZ-^)?cbb9Fw#EjqQ8jxF4G3=L?Ra zg_)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{ zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4 zeBs>KR)izRG1gRVL;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)CWNn9pCtBE}+`Jelk4{>S)M)`Ll=!~gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux} z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~ z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$ zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw% zGz)~?B4}u0CzOf@l^um}HZzbaIwPmb<)< zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$ zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_` zfnHQPANx z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@ zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+cU@DbR^_SXY`MC7HOsCN z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$NkI!0E;Y z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X? z6vV3*m~IBHTy*^E!<0nA(tCOJW2G4DsH7)BxLV8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-D zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}SjL=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-# zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN*zw9N+_=odt<$_H_8dbo;0=42wcAETPCVGUr~v(`Uai zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3 zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xfVqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6 zImRCr?(iyu_4W_6AWo3*vxTPUw@vPwy@E0`(>1Qi=%>5eSIrp^`` zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6 z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|ITJ}JDg@o8y>(rF9mXk5M z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j! zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(XuAYtTsYy-dz+w=$ir)VJpe!_$ z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~ z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3aPp z;o)|L6Rk569KGxFLUPx@!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1 z4=jk@7EEj`u(jy$HnzE33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5 zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|moUBAV_^f$hpaUuyQeY3da^ zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl z-OylnqOpLg}or7_VNwRg2za3VBK6FUfFX{|TD z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t zE%t!J0 zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9 z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$ zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_muEFI}U_4$phjvYgleK~`Fo`;GiC07&Hq1F<%p;9Q;tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%&p~D=K#KpfoJ@ zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXzjYaM{8$s&wEx@aVkQ6M{E2 zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7am^_F!Lz>;~{VrIO$;!#30XRhE1QqO_~#+Ux;B_D{Nk=grn z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw z*T#a=+WcTwL78exTgBn|iNE3#EsOorO z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8# z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4 z0DIL&vsJ1_s%<@y%U*-eX z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8# zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK} zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{JohU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~- zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$) z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$ z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)2r9W<> zT5L8BB^er3zxKt1v(y&OYk!^aoQisqU zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i z8lWr4g5nctBHtigX%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB>u&aUQl+7GiY2|dAEg@%Al3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3 zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI z_(gk!k+0%CG)%!WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7 z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_ z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrHFcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^% zmrkc4o6rvBI;Q8rj4*=AZacy*n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K& z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0 zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dWB7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG ztIHpY8F5xBP{mtQidqNRoz= z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$# zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G zFj6bV{`Y6)YoKgqnir2&+sl+i6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+= zYO=&t#5oSKB^pYhNdzPgH~aEGW2=ec1O#s-KG z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn< zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ| zJ5Wlj+4q~($hbtuY zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l~ zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5& znWoHlA-(z@3n0=l{E)R-p8sB9XkV zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g= zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8 zCRvMB^{GO@j=cHfmy}_pCGbP%xb{pNN>? z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0 zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jnTT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)Us)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP# zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|Uivj5u!xk0 z_^-N9r9o;(rFDt~q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL^d!r z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94 zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?w}{>8>$3236T-VMh@B zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG` zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h9sF@U20DHSB3~WMa zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR zE%B`Vi&m8f3T~&myTEK28BDWCVzfWir1I?03;pX))|kY5ClO^+bae z*7E?g=3g7EiisYOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU= zE*OY%QY58fW#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW>Z z`)>V2XC?NJT26mL^@ zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZupzM77m^=9 z&(a?-LxIq}*nvv)y?27lZ{j zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{`4 zU#kYOv{#A&gGPwT+$Ud}AXlK3K7hYzo$(fBSFjrP{QQ zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G! z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4 zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms| zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X zucyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~ z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^ zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF! z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJisifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8 z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~ zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h?Y8rS1S&-G+m$FNMP?(8N`MZP zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!by?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|) z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c zfs`aw?II0e(h=|7o&T+hq&m$; zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h) zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+K@61f}0e z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$Je1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`THd>2 zsWfU$9=p;yLyJyM^t zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2 zO?n3DEzpT+EoSV-%OdvZvNF+pDd-ZVZ&d8 zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op% z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc& zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{8r?;q3_kpZZ${?|( z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K> zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8 z6Mkf>2)WunY2eU@C-Uj-A zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK`` z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg z191aWoR^rDX#@iSq0n z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$ zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh z)lMbA69y7*5ufET>P*gXQrxsW+ zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBXQI2|g}FGJfJ+ zY-*2hB?o{TVL;Wt_ek;AP5PBqfDR4@Z->_182W z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24 z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU* zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)cEZ%vge965AS_am#DK#pjPRr-!^za8>`kksCAUj(Xr*1NW5~e zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%# zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0bD@_vGAr*NcFoMW;@r?@LUhRI zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V> zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g zJGpKk%%Sdc5xBa$Q^_I~(F97eqDO7AN3EN0u)PNBAb+n+ zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$N4yr^^o$ON8d{PQ=!O zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35va%4v>gc zEX-@h8esj=a4szW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1* znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP> zrp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{ zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx zK%p23>M&=KTCgR!Ee8c?DAO2_R?B zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw- z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8 z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*( ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEX zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_ zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm zZi-noqS!^Ftb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@ zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn` zEgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@ zK^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf z9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^&X%=?`6lCy~?`&WSWt z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRHZphp zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{eSyybt)m<=zXoA^RALYG-2t zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhRmh=)R0bg~ zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+ zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai< z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF# zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg% zbOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi zPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wB zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P;=!y-AjFrERh%8la!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2 zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJSBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-} z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU? zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R% zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=Es(9&S@K@)ZjA{lj3ea7_MBP zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5 zI7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw z`P+tft^E2B$domKT@|nNW`EHwyj>&}K;eDpe z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA zv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$ z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3 z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6< znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_ z%7SUeH6=TrXt3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9ATD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j( ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|HQ`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^ zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K! z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^vq@Q_SRl|V z#lU<~n67$mT)NvHh`%als+G-)x1`Y%4Bp*6Un5Ri9h=_Db zA-AdP!f>f0m@~>7X#uBM?diI@)Egjuz@jXKvm zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#> z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|rlC1EA<1#`iuyNO z(=;irt{_&K=i4)^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf zL#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84 z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d zbzar4Fz&RSR(-|s!Z6+za&Z zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<815<5sOHQdeax9_!PyM&;{P zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L% z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+WXyYu*y3?px*=8MAK@EA+jRX8{CG?GI-< z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*qVE*y0`7J>l2wCmW zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw z4)>7caf^Ki_KJ^Zx2JUb z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ zC(JupLfFp8y43%PMj2}T|VS@%LVp>hv4Y!RPMF?pp8U_$xCJ)S zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR& zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk zwDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){} zGr}Exom_qDO{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6 zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj zKYug($r*Q#W9`p%Bf{bi6;IY0v`pB^^qu)gbg9QHQ7 zWBj(a1YSu)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>kYJC z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8iVx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY zSmfi)F`m94zL8>#zu;8|{aBui@RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm){>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(Xekg*ix@r|ymDw*{*s0?dlVys2e)z62u1 z+k3esbJE=-P5S$&KdFp+2H7_2e=}OKDrf( z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9 z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>Kwe zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L0JV9f3g{-RK!A?vBUA}${YF(vO4)@`6f1 z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi! zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0& QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/src/test/resources/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties b/src/test/resources/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/src/test/resources/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/resources/gradlew-working-test/gradlew b/src/test/resources/gradlew-working-test/gradlew new file mode 100755 index 00000000..1b6c7873 --- /dev/null +++ b/src/test/resources/gradlew-working-test/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/test/resources/gradlew-working-test/gradlew.bat b/src/test/resources/gradlew-working-test/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/src/test/resources/gradlew-working-test/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/resources/gradlew-working-test/settings.gradle b/src/test/resources/gradlew-working-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/resources/gradlew-working-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/resources/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/resources/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/resources/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/resources/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/resources/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/resources/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/resources/gradlew-working-test/src/main/liberty/config/server.xml b/src/test/resources/gradlew-working-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/resources/gradlew-working-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/resources/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/mvnw-corrupt-test/.dockerignore b/src/test/resources/mvnw-corrupt-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/resources/mvnw-corrupt-test/.gitignore b/src/test/resources/mvnw-corrupt-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/resources/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties b/src/test/resources/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..207aa436 --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/src/test/resources/mvnw-corrupt-test/Dockerfile b/src/test/resources/mvnw-corrupt-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/resources/mvnw-corrupt-test/README.txt b/src/test/resources/mvnw-corrupt-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/resources/mvnw-corrupt-test/mvnw b/src/test/resources/mvnw-corrupt-test/mvnw new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/mvnw-corrupt-test/pom.xml b/src/test/resources/mvnw-corrupt-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/resources/mvnw-corrupt-test/settings.gradle b/src/test/resources/mvnw-corrupt-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/resources/mvnw-corrupt-test/src/main/liberty/config/server.xml b/src/test/resources/mvnw-corrupt-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/resources/mvnw-corrupt-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/resources/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/mvnw-working-test/.dockerignore b/src/test/resources/mvnw-working-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/resources/mvnw-working-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/resources/mvnw-working-test/.gitignore b/src/test/resources/mvnw-working-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/resources/mvnw-working-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/resources/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties b/src/test/resources/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..2f093d08 --- /dev/null +++ b/src/test/resources/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip diff --git a/src/test/resources/mvnw-working-test/Dockerfile b/src/test/resources/mvnw-working-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/resources/mvnw-working-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/resources/mvnw-working-test/README.txt b/src/test/resources/mvnw-working-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/resources/mvnw-working-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/resources/mvnw-working-test/mvnw b/src/test/resources/mvnw-working-test/mvnw new file mode 100755 index 00000000..19529ddf --- /dev/null +++ b/src/test/resources/mvnw-working-test/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/src/test/resources/mvnw-working-test/mvnw.cmd b/src/test/resources/mvnw-working-test/mvnw.cmd new file mode 100644 index 00000000..b150b91e --- /dev/null +++ b/src/test/resources/mvnw-working-test/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/src/test/resources/mvnw-working-test/pom.xml b/src/test/resources/mvnw-working-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/resources/mvnw-working-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/resources/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/resources/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/resources/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/resources/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/resources/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/resources/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/resources/mvnw-working-test/src/main/liberty/config/server.xml b/src/test/resources/mvnw-working-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/resources/mvnw-working-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/resources/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/no-mvnw-test/.dockerignore b/src/test/resources/no-mvnw-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/resources/no-mvnw-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/resources/no-mvnw-test/.gitignore b/src/test/resources/no-mvnw-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/resources/no-mvnw-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/resources/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties b/src/test/resources/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..207aa436 --- /dev/null +++ b/src/test/resources/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/src/test/resources/no-mvnw-test/Dockerfile b/src/test/resources/no-mvnw-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/resources/no-mvnw-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/resources/no-mvnw-test/README.txt b/src/test/resources/no-mvnw-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/resources/no-mvnw-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/resources/no-mvnw-test/pom.xml b/src/test/resources/no-mvnw-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/resources/no-mvnw-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/resources/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/resources/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/resources/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/resources/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/resources/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/resources/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/resources/no-mvnw-test/src/main/liberty/config/server.xml b/src/test/resources/no-mvnw-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/resources/no-mvnw-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/resources/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/.gitignore b/src/test/test-applications copy/.gitignore new file mode 100644 index 00000000..4d81f976 --- /dev/null +++ b/src/test/test-applications copy/.gitignore @@ -0,0 +1,51 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# Don't ignore jar files in any level of binary and dependencies +!**/binaries/**/*.jar +!**/libs/**/*.jar + +# virtual machine crash logs +hs_err_pid* + +# Ignore Gradle files +.gradle/ +build/ + +# Ignore Maven target folder +target/ + +# Ignore IntelliJ IDEA files +.idea/ +*.iml +*.iws +*.ipr + +# Ignore Eclipse files +.settings/ +*.classpath +*.project + +# Ignore VS Code files +.vscode/ + +# Ignore everything in codeql-db except the directory itself +codeql-db/* +!codeql-db/.keep diff --git a/src/test/test-applications copy/gradlew-corrupt-test/.dockerignore b/src/test/test-applications copy/gradlew-corrupt-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications copy/gradlew-corrupt-test/.gitignore b/src/test/test-applications copy/gradlew-corrupt-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications copy/gradlew-corrupt-test/Dockerfile b/src/test/test-applications copy/gradlew-corrupt-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications copy/gradlew-corrupt-test/README.txt b/src/test/test-applications copy/gradlew-corrupt-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications copy/gradlew-corrupt-test/build.gradle b/src/test/test-applications copy/gradlew-corrupt-test/build.gradle new file mode 100644 index 00000000..c80e50c1 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/build.gradle @@ -0,0 +1,37 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'javax:javaee-api:7.0' + compileOnly 'org.eclipse.microprofile:microprofile:1.4' +} + +group = 'com.demo' +version = '1.0-SNAPSHOT' +description = 'my-javaee-mvn' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/src/test/test-applications copy/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties b/src/test/test-applications copy/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/test-applications copy/gradlew-corrupt-test/gradlew b/src/test/test-applications copy/gradlew-corrupt-test/gradlew new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/gradlew-corrupt-test/gradlew.bat b/src/test/test-applications copy/gradlew-corrupt-test/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/test-applications copy/gradlew-corrupt-test/settings.gradle b/src/test/test-applications copy/gradlew-corrupt-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications copy/gradlew-corrupt-test/src/main/liberty/config/server.xml b/src/test/test-applications copy/gradlew-corrupt-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications copy/gradlew-corrupt-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications copy/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications copy/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/gradlew-working-test/.dockerignore b/src/test/test-applications copy/gradlew-working-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications copy/gradlew-working-test/.gitignore b/src/test/test-applications copy/gradlew-working-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications copy/gradlew-working-test/Dockerfile b/src/test/test-applications copy/gradlew-working-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications copy/gradlew-working-test/README.txt b/src/test/test-applications copy/gradlew-working-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications copy/gradlew-working-test/build.gradle b/src/test/test-applications copy/gradlew-working-test/build.gradle new file mode 100644 index 00000000..c80e50c1 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/build.gradle @@ -0,0 +1,37 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'javax:javaee-api:7.0' + compileOnly 'org.eclipse.microprofile:microprofile:1.4' +} + +group = 'com.demo' +version = '1.0-SNAPSHOT' +description = 'my-javaee-mvn' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/src/test/test-applications copy/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties b/src/test/test-applications copy/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/test-applications copy/gradlew-working-test/gradlew b/src/test/test-applications copy/gradlew-working-test/gradlew new file mode 100755 index 00000000..1b6c7873 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/test/test-applications copy/gradlew-working-test/gradlew.bat b/src/test/test-applications copy/gradlew-working-test/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/test-applications copy/gradlew-working-test/settings.gradle b/src/test/test-applications copy/gradlew-working-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications copy/gradlew-working-test/src/main/liberty/config/server.xml b/src/test/test-applications copy/gradlew-working-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications copy/gradlew-working-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications copy/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications copy/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/mvnw-corrupt-test/.dockerignore b/src/test/test-applications copy/mvnw-corrupt-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications copy/mvnw-corrupt-test/.gitignore b/src/test/test-applications copy/mvnw-corrupt-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications copy/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties b/src/test/test-applications copy/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..207aa436 --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/src/test/test-applications copy/mvnw-corrupt-test/Dockerfile b/src/test/test-applications copy/mvnw-corrupt-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications copy/mvnw-corrupt-test/README.txt b/src/test/test-applications copy/mvnw-corrupt-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications copy/mvnw-corrupt-test/mvnw b/src/test/test-applications copy/mvnw-corrupt-test/mvnw new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/mvnw-corrupt-test/pom.xml b/src/test/test-applications copy/mvnw-corrupt-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/test-applications copy/mvnw-corrupt-test/settings.gradle b/src/test/test-applications copy/mvnw-corrupt-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications copy/mvnw-corrupt-test/src/main/liberty/config/server.xml b/src/test/test-applications copy/mvnw-corrupt-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications copy/mvnw-corrupt-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications copy/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications copy/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/mvnw-working-test/.dockerignore b/src/test/test-applications copy/mvnw-working-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications copy/mvnw-working-test/.gitignore b/src/test/test-applications copy/mvnw-working-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications copy/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties b/src/test/test-applications copy/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..2f093d08 --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip diff --git a/src/test/test-applications copy/mvnw-working-test/Dockerfile b/src/test/test-applications copy/mvnw-working-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications copy/mvnw-working-test/README.txt b/src/test/test-applications copy/mvnw-working-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications copy/mvnw-working-test/mvnw b/src/test/test-applications copy/mvnw-working-test/mvnw new file mode 100755 index 00000000..19529ddf --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/src/test/test-applications copy/mvnw-working-test/mvnw.cmd b/src/test/test-applications copy/mvnw-working-test/mvnw.cmd new file mode 100644 index 00000000..b150b91e --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/src/test/test-applications copy/mvnw-working-test/pom.xml b/src/test/test-applications copy/mvnw-working-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications copy/mvnw-working-test/src/main/liberty/config/server.xml b/src/test/test-applications copy/mvnw-working-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications copy/mvnw-working-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications copy/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications copy/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications copy/no-mvnw-test/.dockerignore b/src/test/test-applications copy/no-mvnw-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications copy/no-mvnw-test/.gitignore b/src/test/test-applications copy/no-mvnw-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications copy/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties b/src/test/test-applications copy/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..207aa436 --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/src/test/test-applications copy/no-mvnw-test/Dockerfile b/src/test/test-applications copy/no-mvnw-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications copy/no-mvnw-test/README.txt b/src/test/test-applications copy/no-mvnw-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications copy/no-mvnw-test/pom.xml b/src/test/test-applications copy/no-mvnw-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications copy/no-mvnw-test/src/main/liberty/config/server.xml b/src/test/test-applications copy/no-mvnw-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications copy/no-mvnw-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications copy/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications copy/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/.gitignore b/src/test/test-applications/.gitignore new file mode 100644 index 00000000..4d81f976 --- /dev/null +++ b/src/test/test-applications/.gitignore @@ -0,0 +1,51 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# Don't ignore jar files in any level of binary and dependencies +!**/binaries/**/*.jar +!**/libs/**/*.jar + +# virtual machine crash logs +hs_err_pid* + +# Ignore Gradle files +.gradle/ +build/ + +# Ignore Maven target folder +target/ + +# Ignore IntelliJ IDEA files +.idea/ +*.iml +*.iws +*.ipr + +# Ignore Eclipse files +.settings/ +*.classpath +*.project + +# Ignore VS Code files +.vscode/ + +# Ignore everything in codeql-db except the directory itself +codeql-db/* +!codeql-db/.keep diff --git a/src/test/test-applications/gradlew-corrupt-test/.dockerignore b/src/test/test-applications/gradlew-corrupt-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications/gradlew-corrupt-test/.gitignore b/src/test/test-applications/gradlew-corrupt-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications/gradlew-corrupt-test/Dockerfile b/src/test/test-applications/gradlew-corrupt-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications/gradlew-corrupt-test/README.txt b/src/test/test-applications/gradlew-corrupt-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications/gradlew-corrupt-test/build.gradle b/src/test/test-applications/gradlew-corrupt-test/build.gradle new file mode 100644 index 00000000..c80e50c1 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/build.gradle @@ -0,0 +1,37 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'javax:javaee-api:7.0' + compileOnly 'org.eclipse.microprofile:microprofile:1.4' +} + +group = 'com.demo' +version = '1.0-SNAPSHOT' +description = 'my-javaee-mvn' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/src/test/test-applications/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties b/src/test/test-applications/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/test-applications/gradlew-corrupt-test/gradlew b/src/test/test-applications/gradlew-corrupt-test/gradlew new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/gradlew-corrupt-test/gradlew.bat b/src/test/test-applications/gradlew-corrupt-test/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/test-applications/gradlew-corrupt-test/settings.gradle b/src/test/test-applications/gradlew-corrupt-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications/gradlew-corrupt-test/src/main/liberty/config/server.xml b/src/test/test-applications/gradlew-corrupt-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications/gradlew-corrupt-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications/gradlew-corrupt-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/gradlew-working-test/.dockerignore b/src/test/test-applications/gradlew-working-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications/gradlew-working-test/.gitignore b/src/test/test-applications/gradlew-working-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications/gradlew-working-test/Dockerfile b/src/test/test-applications/gradlew-working-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications/gradlew-working-test/README.txt b/src/test/test-applications/gradlew-working-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications/gradlew-working-test/build.gradle b/src/test/test-applications/gradlew-working-test/build.gradle new file mode 100644 index 00000000..c80e50c1 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/build.gradle @@ -0,0 +1,37 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + compileOnly 'javax:javaee-api:7.0' + compileOnly 'org.eclipse.microprofile:microprofile:1.4' +} + +group = 'com.demo' +version = '1.0-SNAPSHOT' +description = 'my-javaee-mvn' +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/src/test/test-applications/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties b/src/test/test-applications/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/test-applications/gradlew-working-test/gradlew b/src/test/test-applications/gradlew-working-test/gradlew new file mode 100755 index 00000000..1b6c7873 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/test/test-applications/gradlew-working-test/gradlew.bat b/src/test/test-applications/gradlew-working-test/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/test/test-applications/gradlew-working-test/settings.gradle b/src/test/test-applications/gradlew-working-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/test-applications/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications/gradlew-working-test/src/main/liberty/config/server.xml b/src/test/test-applications/gradlew-working-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications/gradlew-working-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications/gradlew-working-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/mvnw-corrupt-test/.dockerignore b/src/test/test-applications/mvnw-corrupt-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications/mvnw-corrupt-test/.gitignore b/src/test/test-applications/mvnw-corrupt-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties b/src/test/test-applications/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..207aa436 --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/src/test/test-applications/mvnw-corrupt-test/Dockerfile b/src/test/test-applications/mvnw-corrupt-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications/mvnw-corrupt-test/README.txt b/src/test/test-applications/mvnw-corrupt-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications/mvnw-corrupt-test/mvnw b/src/test/test-applications/mvnw-corrupt-test/mvnw new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/mvnw-corrupt-test/pom.xml b/src/test/test-applications/mvnw-corrupt-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/test-applications/mvnw-corrupt-test/settings.gradle b/src/test/test-applications/mvnw-corrupt-test/settings.gradle new file mode 100644 index 00000000..81f4ec38 --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'my-javaee-mvn' diff --git a/src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications/mvnw-corrupt-test/src/main/liberty/config/server.xml b/src/test/test-applications/mvnw-corrupt-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications/mvnw-corrupt-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications/mvnw-corrupt-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/mvnw-working-test/.dockerignore b/src/test/test-applications/mvnw-working-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications/mvnw-working-test/.gitignore b/src/test/test-applications/mvnw-working-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties b/src/test/test-applications/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..2f093d08 --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip diff --git a/src/test/test-applications/mvnw-working-test/Dockerfile b/src/test/test-applications/mvnw-working-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications/mvnw-working-test/README.txt b/src/test/test-applications/mvnw-working-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications/mvnw-working-test/mvnw b/src/test/test-applications/mvnw-working-test/mvnw new file mode 100755 index 00000000..19529ddf --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/src/test/test-applications/mvnw-working-test/mvnw.cmd b/src/test/test-applications/mvnw-working-test/mvnw.cmd new file mode 100644 index 00000000..b150b91e --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/src/test/test-applications/mvnw-working-test/pom.xml b/src/test/test-applications/mvnw-working-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/test-applications/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications/mvnw-working-test/src/main/liberty/config/server.xml b/src/test/test-applications/mvnw-working-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications/mvnw-working-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications/mvnw-working-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/test/test-applications/no-mvnw-test/.dockerignore b/src/test/test-applications/no-mvnw-test/.dockerignore new file mode 100644 index 00000000..326c2bc2 --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/.dockerignore @@ -0,0 +1,3 @@ +target/ +!target/*.war +!target/liberty/wlp/usr/shared/resources/* diff --git a/src/test/test-applications/no-mvnw-test/.gitignore b/src/test/test-applications/no-mvnw-test/.gitignore new file mode 100644 index 00000000..fef207d2 --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/.gitignore @@ -0,0 +1,11 @@ +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file diff --git a/src/test/test-applications/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties b/src/test/test-applications/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..207aa436 --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/src/test/test-applications/no-mvnw-test/Dockerfile b/src/test/test-applications/no-mvnw-test/Dockerfile new file mode 100644 index 00000000..05e9a7e2 --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/Dockerfile @@ -0,0 +1,10 @@ + +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi + +COPY --chown=1001:0 /src/main/liberty/config /config + +RUN features.sh + +COPY --chown=1001:0 target/*.war /config/apps + +RUN configure.sh diff --git a/src/test/test-applications/no-mvnw-test/README.txt b/src/test/test-applications/no-mvnw-test/README.txt new file mode 100644 index 00000000..0e4c219b --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/README.txt @@ -0,0 +1,35 @@ +After you generate a starter project, these instructions will help you with what to do next. + +The Open Liberty starter gives you a simple, quick way to get the necessary files to start building +an application on Open Liberty. There is no need to search how to find out what to add to your +Maven build files. A simple RestApplication.java file is generated for you to start +creating a REST based application. A server.xml configuration file is provided with the necessary +features for the MicroProfile and Jakarta EE versions that you previously selected. + +If you plan on developing and/or deploying your app in a containerized environment, the included +Dockerfile will make it easier to create your application image on top of the Open Liberty Docker +image. + +1) Once you download the starter project, unpackage the .zip file on your machine. +2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). + This will install all required dependencies and start the default server. When complete, you will + see the necessary features installed and the message "server is ready to run a smarter planet." + +For information on developing your application in dev mode using Maven, see the +dev mode documentation (https://openliberty.io/docs/latest/development-mode.html). + +For further help on getting started actually developing your application, see some of our +MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE +guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag). + +If you have problems building the starter project, make sure the Java SE version on your +machine matches the Java SE version you picked from the Open Liberty starter on the downloads +page (https://openliberty.io/downloads/). You can test this with the command `java -version`. + +Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru +(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported +Java SE versions and where to obtain them, reference the Java SE support page +(https://openliberty.io/docs/latest/java-se.html). + +If you find any issues with the starter project or have recommendations to improve it, open an +issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io). diff --git a/src/test/test-applications/no-mvnw-test/pom.xml b/src/test/test-applications/no-mvnw-test/pom.xml new file mode 100644 index 00000000..9b78f42c --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + com.demo + my-javaee-mvn + 1.0-SNAPSHOT + war + + + 17 + 17 + UTF-8 + + + + + javax + javaee-api + 7.0 + provided + + + org.eclipse.microprofile + microprofile + 1.4 + pom + provided + + + + + my-javaee-mvn + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + io.openliberty.tools + liberty-maven-plugin + 3.11.1 + + + + + + io.openliberty.tools + liberty-maven-plugin + + + + diff --git a/src/test/test-applications/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java b/src/test/test-applications/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java new file mode 100644 index 00000000..60ba828f --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/src/main/java/com/demo/CurrentTimeServlet.java @@ -0,0 +1,29 @@ +// Assisted by watsonx Code Assistant + +package com.demo; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet("/currentTime") +public class CurrentTimeServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.println("

Current Time

"); + out.println("

The current date and time is:

"); + out.println("

" + new Date() + "

"); + } + +} diff --git a/src/test/test-applications/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java b/src/test/test-applications/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java new file mode 100644 index 00000000..eb0e4660 --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/src/main/java/com/demo/rest/RestApplication.java @@ -0,0 +1,9 @@ +package com.demo.rest; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("/api") +public class RestApplication extends Application { + +} \ No newline at end of file diff --git a/src/test/test-applications/no-mvnw-test/src/main/liberty/config/server.xml b/src/test/test-applications/no-mvnw-test/src/main/liberty/config/server.xml new file mode 100644 index 00000000..70e8fc1a --- /dev/null +++ b/src/test/test-applications/no-mvnw-test/src/main/liberty/config/server.xml @@ -0,0 +1,42 @@ + + + + + + javaee-7.0 + microProfile-1.4 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/test-applications/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties b/src/test/test-applications/no-mvnw-test/src/main/resources/META-INF/microprofile-config.properties new file mode 100644 index 00000000..e69de29b