From 2add8073d789e05d403ec48f82847d3de4e41370 Mon Sep 17 00:00:00 2001 From: Mushfiq Ahmed <53420663+abmushfiq@users.noreply.github.com> Date: Fri, 26 Nov 2021 10:06:48 +0530 Subject: [PATCH 1/7] Renamed javaTarget to javaVersion in create project.java file renamed instanse variable javaTarget to javaVersion --- .../java/io/quarkus/devtools/commands/CreateProject.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java index 87b383ec65b82..8c8f2601ef5f9 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java @@ -43,7 +43,7 @@ public class CreateProject { public static final String EXTRA_CODESTARTS = "quarkus.create-project.extra-codestarts"; private QuarkusProject quarkusProject; - private String javaTarget; + private String javaVersion; private Set extensions = new HashSet<>(); private Map values = new HashMap<>(); @@ -98,8 +98,8 @@ public CreateProject extraCodestarts(Set extraCodestarts) { return this; } - public CreateProject javaTarget(String javaTarget) { - this.javaTarget = javaTarget; + public CreateProject javaVersion(String javaVersion) { + this.javaVersion = javaVersion; return this; } From 12acab205e18dd02675f8ac7b2450bcb3df90a42 Mon Sep 17 00:00:00 2001 From: Mushfiq Ahmed <53420663+abmushfiq@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:22:58 +0530 Subject: [PATCH 2/7] Rename to JAVA_TARGET to JAVA_VERSION instance variable name chaged --- .../io/quarkus/devtools/project/codegen/ProjectGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java index 3fa899fcf0432..e871b83edbd2d 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java @@ -24,7 +24,7 @@ public interface ProjectGenerator { String EXTENSIONS = "extensions"; String IS_SPRING = "is_spring"; String RESOURCE_PATH = "path"; - String JAVA_TARGET = "java_target"; + String JAVA_VERSION = "java_version"; String APP_CONFIG = "app-config"; // codestart uses dashes String getName(); From cf0ad03acf223dfc6642ac0ad5d3316d6e021d58 Mon Sep 17 00:00:00 2001 From: Mushfiq Ahmed <53420663+abmushfiq@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:29:07 +0530 Subject: [PATCH 3/7] Rename javaTarget to javaVersion chaging name javaTarget to javaVersion --- .../devtools/project/codegen/CreateProjectHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java index 33e670544c398..5f0edc334d866 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java @@ -76,18 +76,18 @@ public static SourceType determineSourceType(Set extensions) { return sourceType.orElse(SourceType.JAVA); } - public static void setJavaVersion(Map values, String javaTarget) { + public static void setJavaVersion(Map values, String javaVersion) { requireNonNull(values, "Must provide values"); Matcher matcher = JAVA_VERSION_PATTERN - .matcher(javaTarget != null ? javaTarget : System.getProperty("java.version", "")); + .matcher(javaVersion != null ? javaVersion : System.getProperty("java.version", "")); if (matcher.matches()) { String versionExtracted = matcher.group(1); String version = JAVA_VERSIONS_LTS.contains(versionExtracted) ? versionExtracted : DEFAULT_JAVA_VERSION; - values.put(ProjectGenerator.JAVA_TARGET, version); + values.put(ProjectGenerator.JAVA_VERSION, version); } else { - values.put(ProjectGenerator.JAVA_TARGET, DEFAULT_JAVA_VERSION); + values.put(ProjectGenerator.JAVA_VERSION, DEFAULT_JAVA_VERSION); } } From 4858c349b0d51387c11957257722ac0f4d28c3af Mon Sep 17 00:00:00 2001 From: abmushfiq Date: Sat, 27 Nov 2021 14:07:34 +0530 Subject: [PATCH 4/7] Sqaushing all rename commits java_target to java_version --- .github/ci-prerequisites.sh | 0 .github/docker-prune.sh | 0 .github/filter-native-tests-json.sh | 0 .github/quarkusbuilditemdoc.java | 0 coverage-report/prepare.sh | 0 devtools/gradle/gradlew | 0 devtools/gradle/gradlew.bat | 178 +++++++-------- .../base/azure-config/host.json | 6 +- .../base/azure-config/local.settings.json | 14 +- .../base/README.tpl.qute.md | 0 .../codestart.yml | 0 .../HelloWorldBackgroundFunction.java | 0 .../HelloWorldHttpFunction.java | 0 .../base/src/main/resources/application.yml | 0 .../main/kotlin/org/acme/GreetingConfig.kt | 0 .../main/kotlin/org/acme/MyLivenessCheck.kt | 0 docs/sync-web-site.sh | 0 .../azure-config/host.json | 6 +- .../azure-config/local.settings.json | 14 +- .../image/jib/deployment/PlatformHelper.java | 0 .../google-cloud-functions/deployment/pom.xml | 0 .../GoogleCloudFunctionsProcessor.java | 0 extensions/google-cloud-functions/pom.xml | 0 .../google-cloud-functions/runtime/pom.xml | 0 .../gcp/functions/QuarkusHttpFunction.java | 0 ...tipleSqlLoadScriptsFileAbsentTestCase.java | 0 .../ImportMultipleSqlLoadScriptsTestCase.java | 0 ...port-multiple-load-scripts-test.properties | 0 .../import-multiple-load-scripts-1.sql | 0 .../import-multiple-load-scripts-2.sql | 0 .../jackson/deployment/JacksonProcessor.java | 0 .../jsonb/deployment/JsonbProcessor.java | 0 .../jsonp/deployment/JsonpProcessor.java | 0 .../k8s/test-k8s/.hidden-symlink-dir | 0 .../src/test/resources/k8s/test-k8s/provider | 0 .../resources/k8s/test-k8s/test-secret-key | 0 .../src/test/resources/k8s/test-k8s/type | 0 .../test/resources/certs/generate-certs.sh | 0 .../test/resources/exportedCertificate.pem | 36 +-- .../panache/kotlin/PanacheMongoEntity.kt | 0 .../panache/kotlin/PanacheMongoEntityBase.kt | 0 .../panache/kotlin/PanacheMongoRepository.kt | 0 .../kotlin/PanacheMongoRepositoryBase.kt | 0 .../mongodb/panache/PanacheMongoEntity.java | 0 .../panache/PanacheMongoEntityBase.java | 0 .../panache/PanacheMongoRepository.java | 0 .../panache/PanacheMongoRepositoryBase.java | 0 .../deployment/RestClientJaxbProcessor.java | 0 .../deployment/RestClientJsonbProcessor.java | 0 .../deployment/ResteasyJaxbProcessor.java | 0 .../deployment/ResteasyJsonbProcessor.java | 0 .../ResteasyServerCommonProcessor.java | 0 .../vertx/test/matching/GeneralResource.java | 0 .../vertx/test/matching/SpecificResource.java | 0 ...e{class-name-base}ResourceIT.tpl.qute.java | 7 - .../tooling/jbang-wrapper/base/jbang | 0 .../tooling/gradle-wrapper/base/gradlew.bat | 208 +++++++++--------- .../tooling/maven-wrapper/base/mvnw.tpl.qute | 0 .../project/codegen/CreateProjectHelper.java | 8 +- .../project/codegen/ProjectGenerator.java | 2 +- integration-tests/gradle/gradlew | 0 integration-tests/gradle/gradlew.bat | 178 +++++++-------- .../org/acme/gradle/multi/dao/Product.java | 70 +++--- .../acme/gradle/multi/dao/ProductService.java | 36 +-- .../src/main/resources/application.properties | 8 +- .../main/java/org/acme/lib/LibService.java | 10 - .../gradle/update-dependencies.sh | 0 .../panache/NamedQueryWith2QueriesEntity.java | 0 .../NamedQueryWith2QueriesRepository.java | 0 .../it/panache/ObjectWithCompositeId.java | 0 .../it/panache/ObjectWithEmbeddableId.java | 0 .../NamedQueryWith2QueriesEntity.java | 0 .../NamedQueryWith2QueriesRepository.java | 0 .../reactive/ObjectWithCompositeId.java | 0 .../reactive/ObjectWithEmbeddableId.java | 0 .../src/test/resources/certificates/gen-ca.sh | 0 .../certificates/gen-keycloak-certs.sh | 0 .../it/jpa/AbstractCustomUserType.java | 0 .../java/io/quarkus/it/jpa/AnimalType.java | 0 .../java/io/quarkus/it/jpa/BigIntType.java | 0 .../java/io/quarkus/it/jpa/CustomEnum.java | 0 .../io/quarkus/it/jpa/CustomTypeEntity.java | 0 .../it/jpa/LowerCaseCustomEnumType.java | 0 .../mongodb-panache-kotlin/pom.xml | 0 integration-tests/mongodb-panache/pom.xml | 0 .../generate-trust-store-for-bad-ssl.sh | 0 ...lrye.config.ConfigSourceInterceptorFactory | 0 mvnw | 0 tcks/resteasy-reactive/update-dependencies.sh | 0 tcks/resteasy-reactive/update-ref.sh | 0 update-extension-dependencies.sh | 0 91 files changed, 382 insertions(+), 399 deletions(-) mode change 100755 => 100644 .github/ci-prerequisites.sh mode change 100755 => 100644 .github/docker-prune.sh mode change 100755 => 100644 .github/filter-native-tests-json.sh mode change 100755 => 100644 .github/quarkusbuilditemdoc.java mode change 100755 => 100644 coverage-report/prepare.sh mode change 100755 => 100644 devtools/gradle/gradlew mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/base/README.tpl.qute.md mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/codestart.yml mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/base/src/main/resources/application.yml mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/kotlin/src/main/kotlin/org/acme/GreetingConfig.kt mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/smallrye-health-codestart/kotlin/src/main/kotlin/org/acme/MyLivenessCheck.kt mode change 100755 => 100644 docs/sync-web-site.sh mode change 100755 => 100644 extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java mode change 100755 => 100644 extensions/google-cloud-functions/deployment/pom.xml mode change 100755 => 100644 extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java mode change 100755 => 100644 extensions/google-cloud-functions/pom.xml mode change 100755 => 100644 extensions/google-cloud-functions/runtime/pom.xml mode change 100755 => 100644 extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/resources/application-import-multiple-load-scripts-test.properties mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-1.sql mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-2.sql mode change 100755 => 100644 extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java mode change 100755 => 100644 extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java mode change 100755 => 100644 extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type mode change 100755 => 100644 extensions/mailer/runtime/src/test/resources/certs/generate-certs.sh mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntity.java mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepository.java mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java mode change 100755 => 100644 extensions/resteasy-classic/rest-client-jaxb/deployment/src/main/java/io/quarkus/restclient/jaxb/deployment/RestClientJaxbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java mode change 100755 => 100644 independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java mode change 100755 => 100644 independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java delete mode 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java mode change 100755 => 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang mode change 100755 => 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat mode change 100755 => 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/base/mvnw.tpl.qute mode change 100755 => 100644 integration-tests/gradle/gradlew delete mode 100644 integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java mode change 100755 => 100644 integration-tests/gradle/update-dependencies.sh mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java mode change 100755 => 100644 integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-ca.sh mode change 100755 => 100644 integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-keycloak-certs.sh mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/AbstractCustomUserType.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/AnimalType.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/BigIntType.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomEnum.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/LowerCaseCustomEnumType.java mode change 100755 => 100644 integration-tests/mongodb-panache-kotlin/pom.xml mode change 100755 => 100644 integration-tests/mongodb-panache/pom.xml mode change 100755 => 100644 integration-tests/rest-client/generate-trust-store-for-bad-ssl.sh mode change 100755 => 100644 integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory mode change 100755 => 100644 mvnw mode change 100755 => 100644 tcks/resteasy-reactive/update-dependencies.sh mode change 100755 => 100644 tcks/resteasy-reactive/update-ref.sh mode change 100755 => 100644 update-extension-dependencies.sh diff --git a/.github/ci-prerequisites.sh b/.github/ci-prerequisites.sh old mode 100755 new mode 100644 diff --git a/.github/docker-prune.sh b/.github/docker-prune.sh old mode 100755 new mode 100644 diff --git a/.github/filter-native-tests-json.sh b/.github/filter-native-tests-json.sh old mode 100755 new mode 100644 diff --git a/.github/quarkusbuilditemdoc.java b/.github/quarkusbuilditemdoc.java old mode 100755 new mode 100644 diff --git a/coverage-report/prepare.sh b/coverage-report/prepare.sh old mode 100755 new mode 100644 diff --git a/devtools/gradle/gradlew b/devtools/gradle/gradlew old mode 100755 new mode 100644 diff --git a/devtools/gradle/gradlew.bat b/devtools/gradle/gradlew.bat index ac1b06f93825d..107acd32c4e68 100644 --- a/devtools/gradle/gradlew.bat +++ b/devtools/gradle/gradlew.bat @@ -1,89 +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 +@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/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json index a8fe8c4c8e513..d2059a46b515b 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json @@ -1,3 +1,3 @@ -{ - "version": "2.0" -} +{ + "version": "2.0" +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json index 8804ca029cf22..359101f1f57b2 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json @@ -1,7 +1,7 @@ -{ - "IsEncrypted": false, - "Values": { - "AzureWebJobsStorage": "", - "FUNCTIONS_WORKER_RUNTIME": "java" - } -} +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/base/README.tpl.qute.md b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/base/README.tpl.qute.md old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/codestart.yml old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/base/src/main/resources/application.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/base/src/main/resources/application.yml old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/kotlin/src/main/kotlin/org/acme/GreetingConfig.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/kotlin/src/main/kotlin/org/acme/GreetingConfig.kt old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/smallrye-health-codestart/kotlin/src/main/kotlin/org/acme/MyLivenessCheck.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/smallrye-health-codestart/kotlin/src/main/kotlin/org/acme/MyLivenessCheck.kt old mode 100755 new mode 100644 diff --git a/docs/sync-web-site.sh b/docs/sync-web-site.sh old mode 100755 new mode 100644 diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json index a8fe8c4c8e513..d2059a46b515b 100644 --- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json +++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json @@ -1,3 +1,3 @@ -{ - "version": "2.0" -} +{ + "version": "2.0" +} diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json index 8804ca029cf22..359101f1f57b2 100644 --- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json +++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json @@ -1,7 +1,7 @@ -{ - "IsEncrypted": false, - "Values": { - "AzureWebJobsStorage": "", - "FUNCTIONS_WORKER_RUNTIME": "java" - } -} +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/deployment/pom.xml b/extensions/google-cloud-functions/deployment/pom.xml old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java b/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/pom.xml b/extensions/google-cloud-functions/pom.xml old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/runtime/pom.xml b/extensions/google-cloud-functions/runtime/pom.xml old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-import-multiple-load-scripts-test.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-import-multiple-load-scripts-test.properties old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-1.sql b/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-1.sql old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-2.sql b/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-2.sql old mode 100755 new mode 100644 diff --git a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java b/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir deleted file mode 120000 index bc3e42406cdad..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir +++ /dev/null @@ -1 +0,0 @@ -.hidden-dir/ \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir new file mode 100644 index 0000000000000..bc3e42406cdad --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir @@ -0,0 +1 @@ +.hidden-dir/ \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider deleted file mode 120000 index d093f1987eb5c..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider +++ /dev/null @@ -1 +0,0 @@ -.hidden-symlink-dir/provider \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider new file mode 100644 index 0000000000000..d093f1987eb5c --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider @@ -0,0 +1 @@ +.hidden-symlink-dir/provider \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key deleted file mode 120000 index 49eda851c572d..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key +++ /dev/null @@ -1 +0,0 @@ -.hidden-symlink-dir/test-secret-key \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key new file mode 100644 index 0000000000000..49eda851c572d --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key @@ -0,0 +1 @@ +.hidden-symlink-dir/test-secret-key \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type deleted file mode 120000 index 2df1652a93900..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type +++ /dev/null @@ -1 +0,0 @@ -.hidden-symlink-dir/type \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type new file mode 100644 index 0000000000000..2df1652a93900 --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type @@ -0,0 +1 @@ +.hidden-symlink-dir/type \ No newline at end of file diff --git a/extensions/mailer/runtime/src/test/resources/certs/generate-certs.sh b/extensions/mailer/runtime/src/test/resources/certs/generate-certs.sh old mode 100755 new mode 100644 diff --git a/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem b/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem index e69e9fe5bd1d1..a969fc12a8fd1 100644 --- a/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem +++ b/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEHbJ+JjANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3du -MB4XDTIwMTIyNDE0MTMxOFoXDTIxMDMyNDE0MTMxOFowbDEQMA4GA1UEBhMHVW5r -bm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UE -ChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjCC -ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJej16pv4CcIyE4QiHxe2F7F -AJjfofnBzyx/woZ0wUpsALjW2JiMjPMtZbLWHqRfCJpvVg2lZ9Hza5wAU3xpNa0E -pPCR54W4Ulf49G/X/Al9rPCqJJEtDJaD9FrAFPh+GiST4uXbhKwX2bITzkdDoQNG -P1jEsif49m0FgU3Il0UEzr4jvXyTCQ02QM9ZWbQ7Og1pGXSqb0hC5PnzmPeQBhZq -KuHQkrrjdvzziPmqnJoPMKdMRg3xjLV/tXZ+rgWpXCvUy+jl++QeBMVQm/wCyDVm -ZkXqqrB8b3cvOoxlmbcS3OrNf2RAMNUN+GRBz/LCLk+n2u3lTVDM+7N0seiaMe8C -AwEAAaMhMB8wHQYDVR0OBBYEFDt0Ip4Vtn/wqfhDvj4nYwTurpuPMA0GCSqGSIb3 -DQEBCwUAA4IBAQCSNhs0oaTQjGQbIVURamXE8YSnuWJQEqFnCWh2jcji0S4kvD+M -VRNIiX5TGTeAoc9Yv6CltRAR5h8PRAhPzWCWKweCRibUqZF640TB2E7iE2YMFYbB -tTH0MOkMoS0Yhoo/tSQsFmTQsFbU/d43nOoBWUDRuYclJv7lisHqc4nhe97dL/na -IIJeD5XTTC82kn7hS2uZGdzMDpgQjwA9FYXR4nOt+gpx2TjWIi63zCWS92nyyLCd -+zb7LTgPuyX4o5q4yi+acztDitROA7b+2dcq+IAwZf8vliwbgT7VPcpEMJMnAYxo +MIIDdzCCAl+gAwIBAgIEHbJ+JjANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdV +bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD +VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3du +MB4XDTIwMTIyNDE0MTMxOFoXDTIxMDMyNDE0MTMxOFowbDEQMA4GA1UEBhMHVW5r +bm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UE +ChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJej16pv4CcIyE4QiHxe2F7F +AJjfofnBzyx/woZ0wUpsALjW2JiMjPMtZbLWHqRfCJpvVg2lZ9Hza5wAU3xpNa0E +pPCR54W4Ulf49G/X/Al9rPCqJJEtDJaD9FrAFPh+GiST4uXbhKwX2bITzkdDoQNG +P1jEsif49m0FgU3Il0UEzr4jvXyTCQ02QM9ZWbQ7Og1pGXSqb0hC5PnzmPeQBhZq +KuHQkrrjdvzziPmqnJoPMKdMRg3xjLV/tXZ+rgWpXCvUy+jl++QeBMVQm/wCyDVm +ZkXqqrB8b3cvOoxlmbcS3OrNf2RAMNUN+GRBz/LCLk+n2u3lTVDM+7N0seiaMe8C +AwEAAaMhMB8wHQYDVR0OBBYEFDt0Ip4Vtn/wqfhDvj4nYwTurpuPMA0GCSqGSIb3 +DQEBCwUAA4IBAQCSNhs0oaTQjGQbIVURamXE8YSnuWJQEqFnCWh2jcji0S4kvD+M +VRNIiX5TGTeAoc9Yv6CltRAR5h8PRAhPzWCWKweCRibUqZF640TB2E7iE2YMFYbB +tTH0MOkMoS0Yhoo/tSQsFmTQsFbU/d43nOoBWUDRuYclJv7lisHqc4nhe97dL/na +IIJeD5XTTC82kn7hS2uZGdzMDpgQjwA9FYXR4nOt+gpx2TjWIi63zCWS92nyyLCd ++zb7LTgPuyX4o5q4yi+acztDitROA7b+2dcq+IAwZf8vliwbgT7VPcpEMJMnAYxo d5T2ko9LWvozen0sN9+L5OLVE82q3NHwJNm3 -----END CERTIFICATE----- diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntity.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntity.java old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepository.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepository.java old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/main/java/io/quarkus/restclient/jaxb/deployment/RestClientJaxbProcessor.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/main/java/io/quarkus/restclient/jaxb/deployment/RestClientJaxbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java old mode 100755 new mode 100644 diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java old mode 100755 new mode 100644 diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java old mode 100755 new mode 100644 diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java deleted file mode 100644 index d331a251a1666..0000000000000 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java +++ /dev/null @@ -1,7 +0,0 @@ -package {package-name}.it; - -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -public class Native{class-name-base}ResourceIT extends {class-name-base}ResourceTest { -} diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang old mode 100755 new mode 100644 diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat old mode 100755 new mode 100644 index a9f778a7a964b..5093609d512a9 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat @@ -1,104 +1,104 @@ -@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 init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -: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 +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/base/mvnw.tpl.qute b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/base/mvnw.tpl.qute old mode 100755 new mode 100644 diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java index 33e670544c398..5f0edc334d866 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java @@ -76,18 +76,18 @@ public static SourceType determineSourceType(Set extensions) { return sourceType.orElse(SourceType.JAVA); } - public static void setJavaVersion(Map values, String javaTarget) { + public static void setJavaVersion(Map values, String javaVersion) { requireNonNull(values, "Must provide values"); Matcher matcher = JAVA_VERSION_PATTERN - .matcher(javaTarget != null ? javaTarget : System.getProperty("java.version", "")); + .matcher(javaVersion != null ? javaVersion : System.getProperty("java.version", "")); if (matcher.matches()) { String versionExtracted = matcher.group(1); String version = JAVA_VERSIONS_LTS.contains(versionExtracted) ? versionExtracted : DEFAULT_JAVA_VERSION; - values.put(ProjectGenerator.JAVA_TARGET, version); + values.put(ProjectGenerator.JAVA_VERSION, version); } else { - values.put(ProjectGenerator.JAVA_TARGET, DEFAULT_JAVA_VERSION); + values.put(ProjectGenerator.JAVA_VERSION, DEFAULT_JAVA_VERSION); } } diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java index 3fa899fcf0432..e871b83edbd2d 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java @@ -24,7 +24,7 @@ public interface ProjectGenerator { String EXTENSIONS = "extensions"; String IS_SPRING = "is_spring"; String RESOURCE_PATH = "path"; - String JAVA_TARGET = "java_target"; + String JAVA_VERSION = "java_version"; String APP_CONFIG = "app-config"; // codestart uses dashes String getName(); diff --git a/integration-tests/gradle/gradlew b/integration-tests/gradle/gradlew old mode 100755 new mode 100644 diff --git a/integration-tests/gradle/gradlew.bat b/integration-tests/gradle/gradlew.bat index ac1b06f93825d..107acd32c4e68 100644 --- a/integration-tests/gradle/gradlew.bat +++ b/integration-tests/gradle/gradlew.bat @@ -1,89 +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 +@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/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java index 55fdacfa21b9c..6f72b747c73d1 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java @@ -1,35 +1,35 @@ -package org.acme.gradle.multi.dao; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; - -@Entity -@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name") -public class Product { - @Id - private Integer id; - - @Column - private String name; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - - -} +package org.acme.gradle.multi.dao; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.NamedQuery; + +@Entity +@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name") +public class Product { + @Id + private Integer id; + + @Column + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + +} diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java index bdc27e414f890..2526dcbded5ca 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java @@ -1,18 +1,18 @@ -package org.acme.gradle.multi.dao; - -import java.util.List; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; - -@ApplicationScoped -public class ProductService { - - @Inject - EntityManager em; - - public List getProducts() { - return em.createNamedQuery("Product.findAll", Product.class).getResultList(); - } -} +package org.acme.gradle.multi.dao; + +import java.util.List; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.persistence.EntityManager; + +@ApplicationScoped +public class ProductService { + + @Inject + EntityManager em; + + public List getProducts() { + return em.createNamedQuery("Product.findAll", Product.class).getResultList(); + } +} diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties index 2baaa7afab00d..e9ac29e0c1a09 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties @@ -1,5 +1,5 @@ -quarkus.datasource.db-kind = h2 -quarkus.datasource.username = hibernate -quarkus.datasource.password = hibernate -quarkus.datasource.jdbc.url = jdbc:h2:mem:myDB +quarkus.datasource.db-kind = h2 +quarkus.datasource.username = hibernate +quarkus.datasource.password = hibernate +quarkus.datasource.jdbc.url = jdbc:h2:mem:myDB quarkus.hibernate-orm.database.generation=drop-and-create \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java b/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java deleted file mode 100644 index 5f872ecd6a32f..0000000000000 --- a/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.acme.lib; - -import javax.inject.Singleton; - -@Singleton -public class LibService { - public String bar() { - return "bar"; - } -} diff --git a/integration-tests/gradle/update-dependencies.sh b/integration-tests/gradle/update-dependencies.sh old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java old mode 100755 new mode 100644 diff --git a/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-ca.sh b/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-ca.sh old mode 100755 new mode 100644 diff --git a/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-keycloak-certs.sh b/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-keycloak-certs.sh old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/AbstractCustomUserType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/AbstractCustomUserType.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/AnimalType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/AnimalType.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/BigIntType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/BigIntType.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomEnum.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomEnum.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/LowerCaseCustomEnumType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/LowerCaseCustomEnumType.java old mode 100755 new mode 100644 diff --git a/integration-tests/mongodb-panache-kotlin/pom.xml b/integration-tests/mongodb-panache-kotlin/pom.xml old mode 100755 new mode 100644 diff --git a/integration-tests/mongodb-panache/pom.xml b/integration-tests/mongodb-panache/pom.xml old mode 100755 new mode 100644 diff --git a/integration-tests/rest-client/generate-trust-store-for-bad-ssl.sh b/integration-tests/rest-client/generate-trust-store-for-bad-ssl.sh old mode 100755 new mode 100644 diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory old mode 100755 new mode 100644 diff --git a/mvnw b/mvnw old mode 100755 new mode 100644 diff --git a/tcks/resteasy-reactive/update-dependencies.sh b/tcks/resteasy-reactive/update-dependencies.sh old mode 100755 new mode 100644 diff --git a/tcks/resteasy-reactive/update-ref.sh b/tcks/resteasy-reactive/update-ref.sh old mode 100755 new mode 100644 diff --git a/update-extension-dependencies.sh b/update-extension-dependencies.sh old mode 100755 new mode 100644 From 36ef753784b865dc5da3659b13f4097c79d056c9 Mon Sep 17 00:00:00 2001 From: abmushfiq Date: Sun, 28 Nov 2021 19:18:17 +0530 Subject: [PATCH 5/7] Renamed java_target to java_version --- .../main/java/io/quarkus/devtools/commands/CreateProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java index 8c8f2601ef5f9..35378317d65a5 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java @@ -199,7 +199,7 @@ public boolean doCreateProject(final Map context) throws Quarkus } public QuarkusCommandOutcome execute() throws QuarkusCommandException { - CreateProjectHelper.setJavaVersion(values, javaTarget); + CreateProjectHelper.setJavaVersion(values, javaVersion); CreateProjectHelper.handleSpringConfiguration(values, extensions); // TODO: sanitize? handle language extensions? From 24b32a1a88c96adce3a8edecc95cbe6650a1aec7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 10:20:17 +0000 Subject: [PATCH 6/7] Bump aws-alexa-sdk.version from 2.41.0 to 2.42.0 Bumps `aws-alexa-sdk.version` from 2.41.0 to 2.42.0. Updates `ask-sdk` from 2.41.0 to 2.42.0 - [Release notes](https://github.com/amzn/alexa-skills-kit-java/releases) - [Commits](https://github.com/amzn/alexa-skills-kit-java/commits) Updates `ask-sdk-apache-client` from 2.41.0 to 2.42.0 - [Release notes](https://github.com/amzn/alexa-skills-kit-java/releases) - [Commits](https://github.com/amzn/alexa-skills-kit-java/commits) --- updated-dependencies: - dependency-name: com.amazon.alexa:ask-sdk dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.amazon.alexa:ask-sdk-apache-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 87293cd5decbd..050a71c6c1a5e 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -145,7 +145,7 @@ 1.6 2.10.0 2.17.89 - 2.41.0 + 2.42.0 1.4.2 1.6.0 1.5.2 From 27e1e2cfd5d268e8cd5c2b3351a415bb61907b84 Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Thu, 25 Nov 2021 16:54:17 +0100 Subject: [PATCH 7/7] Qute Dev UI - fix the preview page Renamed javaTarget to javaVersion in create project.java file renamed instanse variable javaTarget to javaVersion Sqaushing all rename commits java_target to java_version Renamed java_target to java_version Rename to JAVA_TARGET to JAVA_VERSION instance variable name chaged Rename javaTarget to javaVersion chaging name javaTarget to javaVersion --- .github/ci-prerequisites.sh | 0 .github/docker-prune.sh | 0 .github/filter-native-tests-json.sh | 0 .github/quarkusbuilditemdoc.java | 0 coverage-report/prepare.sh | 0 devtools/gradle/gradlew | 0 devtools/gradle/gradlew.bat | 178 +++++++-------- .../base/azure-config/host.json | 6 +- .../base/azure-config/local.settings.json | 14 +- .../base/README.tpl.qute.md | 0 .../codestart.yml | 0 .../HelloWorldBackgroundFunction.java | 0 .../HelloWorldHttpFunction.java | 0 .../base/src/main/resources/application.yml | 0 .../main/kotlin/org/acme/GreetingConfig.kt | 0 .../main/kotlin/org/acme/MyLivenessCheck.kt | 0 docs/sync-web-site.sh | 0 .../azure-config/host.json | 6 +- .../azure-config/local.settings.json | 14 +- .../image/jib/deployment/PlatformHelper.java | 0 .../google-cloud-functions/deployment/pom.xml | 0 .../GoogleCloudFunctionsProcessor.java | 0 extensions/google-cloud-functions/pom.xml | 0 .../google-cloud-functions/runtime/pom.xml | 0 .../gcp/functions/QuarkusHttpFunction.java | 0 ...tipleSqlLoadScriptsFileAbsentTestCase.java | 0 .../ImportMultipleSqlLoadScriptsTestCase.java | 0 ...port-multiple-load-scripts-test.properties | 0 .../import-multiple-load-scripts-1.sql | 0 .../import-multiple-load-scripts-2.sql | 0 .../jackson/deployment/JacksonProcessor.java | 0 .../jsonb/deployment/JsonbProcessor.java | 0 .../jsonp/deployment/JsonpProcessor.java | 0 .../k8s/test-k8s/.hidden-symlink-dir | 0 .../src/test/resources/k8s/test-k8s/provider | 0 .../resources/k8s/test-k8s/test-secret-key | 0 .../src/test/resources/k8s/test-k8s/type | 0 .../test/resources/certs/generate-certs.sh | 0 .../test/resources/exportedCertificate.pem | 36 +-- .../panache/kotlin/PanacheMongoEntity.kt | 0 .../panache/kotlin/PanacheMongoEntityBase.kt | 0 .../panache/kotlin/PanacheMongoRepository.kt | 0 .../kotlin/PanacheMongoRepositoryBase.kt | 0 .../mongodb/panache/PanacheMongoEntity.java | 0 .../panache/PanacheMongoEntityBase.java | 0 .../panache/PanacheMongoRepository.java | 0 .../panache/PanacheMongoRepositoryBase.java | 0 .../qute/deployment/QuteProcessor.java | 2 +- .../main/resources/dev-templates/preview.html | 24 +- .../deployment/RestClientJaxbProcessor.java | 0 .../deployment/RestClientJsonbProcessor.java | 0 .../deployment/ResteasyJaxbProcessor.java | 0 .../deployment/ResteasyJsonbProcessor.java | 0 .../ResteasyServerCommonProcessor.java | 0 .../vertx/test/matching/GeneralResource.java | 0 .../vertx/test/matching/SpecificResource.java | 0 ...e{class-name-base}ResourceIT.tpl.qute.java | 7 - .../tooling/jbang-wrapper/base/jbang | 0 .../tooling/gradle-wrapper/base/gradlew.bat | 208 +++++++++--------- .../tooling/maven-wrapper/base/mvnw.tpl.qute | 0 .../devtools/commands/CreateProject.java | 8 +- .../project/codegen/CreateProjectHelper.java | 8 +- .../project/codegen/ProjectGenerator.java | 2 +- .../devconsole/DevConsoleQuteSmokeTest.java | 3 + integration-tests/gradle/gradlew | 0 integration-tests/gradle/gradlew.bat | 178 +++++++-------- .../org/acme/gradle/multi/dao/Product.java | 70 +++--- .../acme/gradle/multi/dao/ProductService.java | 36 +-- .../src/main/resources/application.properties | 8 +- .../main/java/org/acme/lib/LibService.java | 10 - .../gradle/update-dependencies.sh | 0 .../panache/NamedQueryWith2QueriesEntity.java | 0 .../NamedQueryWith2QueriesRepository.java | 0 .../it/panache/ObjectWithCompositeId.java | 0 .../it/panache/ObjectWithEmbeddableId.java | 0 .../NamedQueryWith2QueriesEntity.java | 0 .../NamedQueryWith2QueriesRepository.java | 0 .../reactive/ObjectWithCompositeId.java | 0 .../reactive/ObjectWithEmbeddableId.java | 0 .../src/test/resources/certificates/gen-ca.sh | 0 .../certificates/gen-keycloak-certs.sh | 0 .../it/jpa/AbstractCustomUserType.java | 0 .../java/io/quarkus/it/jpa/AnimalType.java | 0 .../java/io/quarkus/it/jpa/BigIntType.java | 0 .../java/io/quarkus/it/jpa/CustomEnum.java | 0 .../io/quarkus/it/jpa/CustomTypeEntity.java | 0 .../it/jpa/LowerCaseCustomEnumType.java | 0 .../mongodb-panache-kotlin/pom.xml | 0 integration-tests/mongodb-panache/pom.xml | 0 .../generate-trust-store-for-bad-ssl.sh | 0 ...lrye.config.ConfigSourceInterceptorFactory | 0 mvnw | 0 tcks/resteasy-reactive/update-dependencies.sh | 0 tcks/resteasy-reactive/update-ref.sh | 0 update-extension-dependencies.sh | 0 95 files changed, 400 insertions(+), 418 deletions(-) mode change 100755 => 100644 .github/ci-prerequisites.sh mode change 100755 => 100644 .github/docker-prune.sh mode change 100755 => 100644 .github/filter-native-tests-json.sh mode change 100755 => 100644 .github/quarkusbuilditemdoc.java mode change 100755 => 100644 coverage-report/prepare.sh mode change 100755 => 100644 devtools/gradle/gradlew mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/base/README.tpl.qute.md mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/codestart.yml mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/base/src/main/resources/application.yml mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/kotlin/src/main/kotlin/org/acme/GreetingConfig.kt mode change 100755 => 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/smallrye-health-codestart/kotlin/src/main/kotlin/org/acme/MyLivenessCheck.kt mode change 100755 => 100644 docs/sync-web-site.sh mode change 100755 => 100644 extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java mode change 100755 => 100644 extensions/google-cloud-functions/deployment/pom.xml mode change 100755 => 100644 extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java mode change 100755 => 100644 extensions/google-cloud-functions/pom.xml mode change 100755 => 100644 extensions/google-cloud-functions/runtime/pom.xml mode change 100755 => 100644 extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/resources/application-import-multiple-load-scripts-test.properties mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-1.sql mode change 100755 => 100644 extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-2.sql mode change 100755 => 100644 extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java mode change 100755 => 100644 extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java mode change 100755 => 100644 extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key mode change 120000 => 100644 extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type mode change 100755 => 100644 extensions/mailer/runtime/src/test/resources/certs/generate-certs.sh mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt mode change 100755 => 100644 extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntity.java mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepository.java mode change 100755 => 100644 extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java mode change 100755 => 100644 extensions/resteasy-classic/rest-client-jaxb/deployment/src/main/java/io/quarkus/restclient/jaxb/deployment/RestClientJaxbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java mode change 100755 => 100644 extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java mode change 100755 => 100644 independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java mode change 100755 => 100644 independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java delete mode 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java mode change 100755 => 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang mode change 100755 => 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat mode change 100755 => 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/base/mvnw.tpl.qute mode change 100755 => 100644 integration-tests/gradle/gradlew delete mode 100644 integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java mode change 100755 => 100644 integration-tests/gradle/update-dependencies.sh mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java mode change 100755 => 100644 integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java mode change 100755 => 100644 integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java mode change 100755 => 100644 integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-ca.sh mode change 100755 => 100644 integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-keycloak-certs.sh mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/AbstractCustomUserType.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/AnimalType.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/BigIntType.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomEnum.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java mode change 100755 => 100644 integration-tests/main/src/main/java/io/quarkus/it/jpa/LowerCaseCustomEnumType.java mode change 100755 => 100644 integration-tests/mongodb-panache-kotlin/pom.xml mode change 100755 => 100644 integration-tests/mongodb-panache/pom.xml mode change 100755 => 100644 integration-tests/rest-client/generate-trust-store-for-bad-ssl.sh mode change 100755 => 100644 integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory mode change 100755 => 100644 mvnw mode change 100755 => 100644 tcks/resteasy-reactive/update-dependencies.sh mode change 100755 => 100644 tcks/resteasy-reactive/update-ref.sh mode change 100755 => 100644 update-extension-dependencies.sh diff --git a/.github/ci-prerequisites.sh b/.github/ci-prerequisites.sh old mode 100755 new mode 100644 diff --git a/.github/docker-prune.sh b/.github/docker-prune.sh old mode 100755 new mode 100644 diff --git a/.github/filter-native-tests-json.sh b/.github/filter-native-tests-json.sh old mode 100755 new mode 100644 diff --git a/.github/quarkusbuilditemdoc.java b/.github/quarkusbuilditemdoc.java old mode 100755 new mode 100644 diff --git a/coverage-report/prepare.sh b/coverage-report/prepare.sh old mode 100755 new mode 100644 diff --git a/devtools/gradle/gradlew b/devtools/gradle/gradlew old mode 100755 new mode 100644 diff --git a/devtools/gradle/gradlew.bat b/devtools/gradle/gradlew.bat index ac1b06f93825d..107acd32c4e68 100644 --- a/devtools/gradle/gradlew.bat +++ b/devtools/gradle/gradlew.bat @@ -1,89 +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 +@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/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json index a8fe8c4c8e513..d2059a46b515b 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/host.json @@ -1,3 +1,3 @@ -{ - "version": "2.0" -} +{ + "version": "2.0" +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json index 8804ca029cf22..359101f1f57b2 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/base/azure-config/local.settings.json @@ -1,7 +1,7 @@ -{ - "IsEncrypted": false, - "Values": { - "AzureWebJobsStorage": "", - "FUNCTIONS_WORKER_RUNTIME": "java" - } -} +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/base/README.tpl.qute.md b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/base/README.tpl.qute.md old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/codestart.yml old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/base/src/main/resources/application.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/base/src/main/resources/application.yml old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/kotlin/src/main/kotlin/org/acme/GreetingConfig.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/config-yaml-codestart/kotlin/src/main/kotlin/org/acme/GreetingConfig.kt old mode 100755 new mode 100644 diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/smallrye-health-codestart/kotlin/src/main/kotlin/org/acme/MyLivenessCheck.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/smallrye-health-codestart/kotlin/src/main/kotlin/org/acme/MyLivenessCheck.kt old mode 100755 new mode 100644 diff --git a/docs/sync-web-site.sh b/docs/sync-web-site.sh old mode 100755 new mode 100644 diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json index a8fe8c4c8e513..d2059a46b515b 100644 --- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json +++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/host.json @@ -1,3 +1,3 @@ -{ - "version": "2.0" -} +{ + "version": "2.0" +} diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json index 8804ca029cf22..359101f1f57b2 100644 --- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json +++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/local.settings.json @@ -1,7 +1,7 @@ -{ - "IsEncrypted": false, - "Values": { - "AzureWebJobsStorage": "", - "FUNCTIONS_WORKER_RUNTIME": "java" - } -} +{ + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "", + "FUNCTIONS_WORKER_RUNTIME": "java" + } +} diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/deployment/pom.xml b/extensions/google-cloud-functions/deployment/pom.xml old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java b/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/pom.xml b/extensions/google-cloud-functions/pom.xml old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/runtime/pom.xml b/extensions/google-cloud-functions/runtime/pom.xml old mode 100755 new mode 100644 diff --git a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsFileAbsentTestCase.java old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/ImportMultipleSqlLoadScriptsTestCase.java old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-import-multiple-load-scripts-test.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-import-multiple-load-scripts-test.properties old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-1.sql b/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-1.sql old mode 100755 new mode 100644 diff --git a/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-2.sql b/extensions/hibernate-orm/deployment/src/test/resources/import-multiple-load-scripts-2.sql old mode 100755 new mode 100644 diff --git a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java b/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir deleted file mode 120000 index bc3e42406cdad..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir +++ /dev/null @@ -1 +0,0 @@ -.hidden-dir/ \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir new file mode 100644 index 0000000000000..bc3e42406cdad --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir @@ -0,0 +1 @@ +.hidden-dir/ \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider deleted file mode 120000 index d093f1987eb5c..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider +++ /dev/null @@ -1 +0,0 @@ -.hidden-symlink-dir/provider \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider new file mode 100644 index 0000000000000..d093f1987eb5c --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider @@ -0,0 +1 @@ +.hidden-symlink-dir/provider \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key deleted file mode 120000 index 49eda851c572d..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key +++ /dev/null @@ -1 +0,0 @@ -.hidden-symlink-dir/test-secret-key \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key new file mode 100644 index 0000000000000..49eda851c572d --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key @@ -0,0 +1 @@ +.hidden-symlink-dir/test-secret-key \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type deleted file mode 120000 index 2df1652a93900..0000000000000 --- a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type +++ /dev/null @@ -1 +0,0 @@ -.hidden-symlink-dir/type \ No newline at end of file diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type new file mode 100644 index 0000000000000..2df1652a93900 --- /dev/null +++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type @@ -0,0 +1 @@ +.hidden-symlink-dir/type \ No newline at end of file diff --git a/extensions/mailer/runtime/src/test/resources/certs/generate-certs.sh b/extensions/mailer/runtime/src/test/resources/certs/generate-certs.sh old mode 100755 new mode 100644 diff --git a/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem b/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem index e69e9fe5bd1d1..a969fc12a8fd1 100644 --- a/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem +++ b/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEHbJ+JjANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3du -MB4XDTIwMTIyNDE0MTMxOFoXDTIxMDMyNDE0MTMxOFowbDEQMA4GA1UEBhMHVW5r -bm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UE -ChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjCC -ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJej16pv4CcIyE4QiHxe2F7F -AJjfofnBzyx/woZ0wUpsALjW2JiMjPMtZbLWHqRfCJpvVg2lZ9Hza5wAU3xpNa0E -pPCR54W4Ulf49G/X/Al9rPCqJJEtDJaD9FrAFPh+GiST4uXbhKwX2bITzkdDoQNG -P1jEsif49m0FgU3Il0UEzr4jvXyTCQ02QM9ZWbQ7Og1pGXSqb0hC5PnzmPeQBhZq -KuHQkrrjdvzziPmqnJoPMKdMRg3xjLV/tXZ+rgWpXCvUy+jl++QeBMVQm/wCyDVm -ZkXqqrB8b3cvOoxlmbcS3OrNf2RAMNUN+GRBz/LCLk+n2u3lTVDM+7N0seiaMe8C -AwEAAaMhMB8wHQYDVR0OBBYEFDt0Ip4Vtn/wqfhDvj4nYwTurpuPMA0GCSqGSIb3 -DQEBCwUAA4IBAQCSNhs0oaTQjGQbIVURamXE8YSnuWJQEqFnCWh2jcji0S4kvD+M -VRNIiX5TGTeAoc9Yv6CltRAR5h8PRAhPzWCWKweCRibUqZF640TB2E7iE2YMFYbB -tTH0MOkMoS0Yhoo/tSQsFmTQsFbU/d43nOoBWUDRuYclJv7lisHqc4nhe97dL/na -IIJeD5XTTC82kn7hS2uZGdzMDpgQjwA9FYXR4nOt+gpx2TjWIi63zCWS92nyyLCd -+zb7LTgPuyX4o5q4yi+acztDitROA7b+2dcq+IAwZf8vliwbgT7VPcpEMJMnAYxo +MIIDdzCCAl+gAwIBAgIEHbJ+JjANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdV +bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD +VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3du +MB4XDTIwMTIyNDE0MTMxOFoXDTIxMDMyNDE0MTMxOFowbDEQMA4GA1UEBhMHVW5r +bm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UE +ChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJej16pv4CcIyE4QiHxe2F7F +AJjfofnBzyx/woZ0wUpsALjW2JiMjPMtZbLWHqRfCJpvVg2lZ9Hza5wAU3xpNa0E +pPCR54W4Ulf49G/X/Al9rPCqJJEtDJaD9FrAFPh+GiST4uXbhKwX2bITzkdDoQNG +P1jEsif49m0FgU3Il0UEzr4jvXyTCQ02QM9ZWbQ7Og1pGXSqb0hC5PnzmPeQBhZq +KuHQkrrjdvzziPmqnJoPMKdMRg3xjLV/tXZ+rgWpXCvUy+jl++QeBMVQm/wCyDVm +ZkXqqrB8b3cvOoxlmbcS3OrNf2RAMNUN+GRBz/LCLk+n2u3lTVDM+7N0seiaMe8C +AwEAAaMhMB8wHQYDVR0OBBYEFDt0Ip4Vtn/wqfhDvj4nYwTurpuPMA0GCSqGSIb3 +DQEBCwUAA4IBAQCSNhs0oaTQjGQbIVURamXE8YSnuWJQEqFnCWh2jcji0S4kvD+M +VRNIiX5TGTeAoc9Yv6CltRAR5h8PRAhPzWCWKweCRibUqZF640TB2E7iE2YMFYbB +tTH0MOkMoS0Yhoo/tSQsFmTQsFbU/d43nOoBWUDRuYclJv7lisHqc4nhe97dL/na +IIJeD5XTTC82kn7hS2uZGdzMDpgQjwA9FYXR4nOt+gpx2TjWIi63zCWS92nyyLCd ++zb7LTgPuyX4o5q4yi+acztDitROA7b+2dcq+IAwZf8vliwbgT7VPcpEMJMnAYxo d5T2ko9LWvozen0sN9+L5OLVE82q3NHwJNm3 -----END CERTIFICATE----- diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntity.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntity.java old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepository.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepository.java old mode 100755 new mode 100644 diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java old mode 100755 new mode 100644 diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java index 35707ebab16e3..00873e95b7fda 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java @@ -1320,7 +1320,7 @@ TemplateVariantsBuildItem collectTemplateVariants(List te // ItemResource/item -> -> [ItemResource/item.html, ItemResource/item.xml] Map> baseToVariants = new HashMap<>(); for (String path : allPaths) { - int idx = path.lastIndexOf('.'); + int idx = path.indexOf('.'); if (idx != -1) { String base = path.substring(0, idx); List variants = baseToVariants.get(base); diff --git a/extensions/qute/deployment/src/main/resources/dev-templates/preview.html b/extensions/qute/deployment/src/main/resources/dev-templates/preview.html index 47c59d988aa04..b563f52692486 100644 --- a/extensions/qute/deployment/src/main/resources/dev-templates/preview.html +++ b/extensions/qute/deployment/src/main/resources/dev-templates/preview.html @@ -15,11 +15,9 @@ @@ -56,26 +54,24 @@ {! Init the template path -> initial data map !} {#for template in info:devQuteInfos.templates} - {#let dataCount=count} - var testData{dataCount}; + var testData{template_count}; {#if template.parameters} - testData{dataCount} = '{'; + testData{template_count} = '{'; {#each template.parameters} - testData{dataCount} += '\n // Template parameter {template_count}: {it.value.raw}\n'; - testData{dataCount} += ' "{it.key}" : null'; - {#if hasNext} - testData{dataCount} += ','; + testData{template_count} += '\n // Template parameter {it_count}: {it.value.raw}\n'; + testData{template_count} += ' "{it.key}" : null'; + {#if it_hasNext} + testData{template_count} += ','; {/if} {/each} - testData{dataCount} += '\n}'; + testData{template_count} += '\n}'; {#else} - testData{dataCount} = '{}'; + testData{template_count} = '{}'; {/if} {#each template.variants} - templateDataMap['{it.key}'] = testData{dataCount}; + templateDataMap['{it.key}'] = testData{template_count}; templateSourceMap['{it.key}'] = '{it.value}'; {/each} - {/let} {/for} const editor = CodeMirror.fromTextArea(document.querySelector('#template-data'), { diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/main/java/io/quarkus/restclient/jaxb/deployment/RestClientJaxbProcessor.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/main/java/io/quarkus/restclient/jaxb/deployment/RestClientJaxbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java old mode 100755 new mode 100644 diff --git a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java old mode 100755 new mode 100644 diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java old mode 100755 new mode 100644 diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java old mode 100755 new mode 100644 diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java deleted file mode 100644 index d331a251a1666..0000000000000 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java +++ /dev/null @@ -1,7 +0,0 @@ -package {package-name}.it; - -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -public class Native{class-name-base}ResourceIT extends {class-name-base}ResourceTest { -} diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang old mode 100755 new mode 100644 diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat old mode 100755 new mode 100644 index a9f778a7a964b..5093609d512a9 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/gradle-wrapper/base/gradlew.bat @@ -1,104 +1,104 @@ -@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 init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -: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 +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/base/mvnw.tpl.qute b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/maven-wrapper/base/mvnw.tpl.qute old mode 100755 new mode 100644 diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java index 87b383ec65b82..35378317d65a5 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java @@ -43,7 +43,7 @@ public class CreateProject { public static final String EXTRA_CODESTARTS = "quarkus.create-project.extra-codestarts"; private QuarkusProject quarkusProject; - private String javaTarget; + private String javaVersion; private Set extensions = new HashSet<>(); private Map values = new HashMap<>(); @@ -98,8 +98,8 @@ public CreateProject extraCodestarts(Set extraCodestarts) { return this; } - public CreateProject javaTarget(String javaTarget) { - this.javaTarget = javaTarget; + public CreateProject javaVersion(String javaVersion) { + this.javaVersion = javaVersion; return this; } @@ -199,7 +199,7 @@ public boolean doCreateProject(final Map context) throws Quarkus } public QuarkusCommandOutcome execute() throws QuarkusCommandException { - CreateProjectHelper.setJavaVersion(values, javaTarget); + CreateProjectHelper.setJavaVersion(values, javaVersion); CreateProjectHelper.handleSpringConfiguration(values, extensions); // TODO: sanitize? handle language extensions? diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java index 33e670544c398..5f0edc334d866 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java @@ -76,18 +76,18 @@ public static SourceType determineSourceType(Set extensions) { return sourceType.orElse(SourceType.JAVA); } - public static void setJavaVersion(Map values, String javaTarget) { + public static void setJavaVersion(Map values, String javaVersion) { requireNonNull(values, "Must provide values"); Matcher matcher = JAVA_VERSION_PATTERN - .matcher(javaTarget != null ? javaTarget : System.getProperty("java.version", "")); + .matcher(javaVersion != null ? javaVersion : System.getProperty("java.version", "")); if (matcher.matches()) { String versionExtracted = matcher.group(1); String version = JAVA_VERSIONS_LTS.contains(versionExtracted) ? versionExtracted : DEFAULT_JAVA_VERSION; - values.put(ProjectGenerator.JAVA_TARGET, version); + values.put(ProjectGenerator.JAVA_VERSION, version); } else { - values.put(ProjectGenerator.JAVA_TARGET, DEFAULT_JAVA_VERSION); + values.put(ProjectGenerator.JAVA_VERSION, DEFAULT_JAVA_VERSION); } } diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java index 3fa899fcf0432..e871b83edbd2d 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java @@ -24,7 +24,7 @@ public interface ProjectGenerator { String EXTENSIONS = "extensions"; String IS_SPRING = "is_spring"; String RESOURCE_PATH = "path"; - String JAVA_TARGET = "java_target"; + String JAVA_VERSION = "java_version"; String APP_CONFIG = "app-config"; // codestart uses dashes String getName(); diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java index 95c43e38d21b5..359e4a67a28e6 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleQuteSmokeTest.java @@ -25,6 +25,9 @@ public void testTemplates() { RestAssured.get("q/dev/io.quarkus.quarkus-qute/templates") .then() .statusCode(200).body(Matchers.containsString("hello.txt")); + RestAssured.get("q/dev/io.quarkus.quarkus-qute/preview") + .then() + .statusCode(200).body(Matchers.containsString("Test JSON data")); } } diff --git a/integration-tests/gradle/gradlew b/integration-tests/gradle/gradlew old mode 100755 new mode 100644 diff --git a/integration-tests/gradle/gradlew.bat b/integration-tests/gradle/gradlew.bat index ac1b06f93825d..107acd32c4e68 100644 --- a/integration-tests/gradle/gradlew.bat +++ b/integration-tests/gradle/gradlew.bat @@ -1,89 +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 +@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/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java index 55fdacfa21b9c..6f72b747c73d1 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java @@ -1,35 +1,35 @@ -package org.acme.gradle.multi.dao; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; - -@Entity -@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name") -public class Product { - @Id - private Integer id; - - @Column - private String name; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - - -} +package org.acme.gradle.multi.dao; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.NamedQuery; + +@Entity +@NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name") +public class Product { + @Id + private Integer id; + + @Column + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + +} diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java index bdc27e414f890..2526dcbded5ca 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java @@ -1,18 +1,18 @@ -package org.acme.gradle.multi.dao; - -import java.util.List; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; - -@ApplicationScoped -public class ProductService { - - @Inject - EntityManager em; - - public List getProducts() { - return em.createNamedQuery("Product.findAll", Product.class).getResultList(); - } -} +package org.acme.gradle.multi.dao; + +import java.util.List; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.persistence.EntityManager; + +@ApplicationScoped +public class ProductService { + + @Inject + EntityManager em; + + public List getProducts() { + return em.createNamedQuery("Product.findAll", Product.class).getResultList(); + } +} diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties index 2baaa7afab00d..e9ac29e0c1a09 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/resources/application.properties @@ -1,5 +1,5 @@ -quarkus.datasource.db-kind = h2 -quarkus.datasource.username = hibernate -quarkus.datasource.password = hibernate -quarkus.datasource.jdbc.url = jdbc:h2:mem:myDB +quarkus.datasource.db-kind = h2 +quarkus.datasource.username = hibernate +quarkus.datasource.password = hibernate +quarkus.datasource.jdbc.url = jdbc:h2:mem:myDB quarkus.hibernate-orm.database.generation=drop-and-create \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java b/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java deleted file mode 100644 index 5f872ecd6a32f..0000000000000 --- a/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.acme.lib; - -import javax.inject.Singleton; - -@Singleton -public class LibService { - public String bar() { - return "bar"; - } -} diff --git a/integration-tests/gradle/update-dependencies.sh b/integration-tests/gradle/update-dependencies.sh old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java old mode 100755 new mode 100644 diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java old mode 100755 new mode 100644 diff --git a/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-ca.sh b/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-ca.sh old mode 100755 new mode 100644 diff --git a/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-keycloak-certs.sh b/integration-tests/kafka-oauth-keycloak/src/test/resources/certificates/gen-keycloak-certs.sh old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/AbstractCustomUserType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/AbstractCustomUserType.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/AnimalType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/AnimalType.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/BigIntType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/BigIntType.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomEnum.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomEnum.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java old mode 100755 new mode 100644 diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/LowerCaseCustomEnumType.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/LowerCaseCustomEnumType.java old mode 100755 new mode 100644 diff --git a/integration-tests/mongodb-panache-kotlin/pom.xml b/integration-tests/mongodb-panache-kotlin/pom.xml old mode 100755 new mode 100644 diff --git a/integration-tests/mongodb-panache/pom.xml b/integration-tests/mongodb-panache/pom.xml old mode 100755 new mode 100644 diff --git a/integration-tests/rest-client/generate-trust-store-for-bad-ssl.sh b/integration-tests/rest-client/generate-trust-store-for-bad-ssl.sh old mode 100755 new mode 100644 diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory old mode 100755 new mode 100644 diff --git a/mvnw b/mvnw old mode 100755 new mode 100644 diff --git a/tcks/resteasy-reactive/update-dependencies.sh b/tcks/resteasy-reactive/update-dependencies.sh old mode 100755 new mode 100644 diff --git a/tcks/resteasy-reactive/update-ref.sh b/tcks/resteasy-reactive/update-ref.sh old mode 100755 new mode 100644 diff --git a/update-extension-dependencies.sh b/update-extension-dependencies.sh old mode 100755 new mode 100644