From 94c85fea7a25d5ba4144c1739148233575532d7a Mon Sep 17 00:00:00 2001 From: Andres LeonRangel Date: Tue, 10 Oct 2023 13:13:19 +1300 Subject: [PATCH] upgrade gradle 8.3 intelliJ IDE Signed-off-by: Andres LeonRangel --- .idea/.gitignore | 3 + .idea/.name | 1 + .idea/compiler.xml | 6 + .idea/gradle.xml | 16 + .idea/jarRepositories.xml | 30 ++ .idea/misc.xml | 5 + .idea/vcs.xml | 6 + build.gradle.kts | 69 ++-- gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 0 src/main/resources/webServiceSOAPDemo.wsdl | 419 +++++++++++++++++++++ 11 files changed, 513 insertions(+), 45 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml mode change 100644 => 100755 gradlew create mode 100644 src/main/resources/webServiceSOAPDemo.wsdl diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..d0874b5 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +AttendWebApp \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ce1c62c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..6c68d51 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..f99ad97 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index d73548d..1cf65c9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,4 @@ -import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent - /* * This file was generated by the Gradle 'init' task * This project uses @Incubating APIs which are subject to change @@ -11,14 +9,15 @@ plugins { // id ("com.adarshr.test-logger") version "3.0.0" // https://docs.gradle.org/7.3/dsl/org.gradle.api.tasks.bundling.War.html war - //wsdl - id("io.mateo.cxf-codegen") version "1.0.1" + id ("jacoco") + //wsdl + id("com.github.bjornvester.wsdl2java") version "2.0.2" } repositories { - gradlePluginPortal() - google() - mavenCentral() + gradlePluginPortal() + google() + mavenCentral() } dependencies { @@ -35,18 +34,17 @@ dependencies { implementation("javax.servlet:javax.servlet-api:3.1.0") // https://mvnrepository.com/artifact/com.google.zxing/javase implementation("com.google.zxing:javase:3.5.1") - // https://mvnrepository.com/artifact/com.google.zxing/core implementation("com.google.zxing:core:3.5.1") testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") testImplementation("io.jsonwebtoken:jjwt:0.7.0") - implementation("org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5") - + // dependency below only needed if using the Java 8 version of @Generated (through "jdk8") on Java 9 or later + implementation("javax.annotation:javax.annotation-api:1.3.2") } group = "soa.nz.aut" version = "0.0.1" -description = "Class Attendance WebApp" +description = "Student Attendance WebApp" java.sourceCompatibility = JavaVersion.VERSION_1_8 tasks.war { @@ -60,41 +58,24 @@ tasks.war { } tasks { - test { - reports { - html.isEnabled = true - junitXml.isEnabled = true + named("jacocoTestReport") { + reports { + } + } + test { + useJUnitPlatform() + testLogging.events = setOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED) } - useJUnitPlatform() - testLogging.events = setOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED) - } } tasks.register("singleTest") { - group = "Verification" - description = "Runs a test to create a local QR code" - filter { - includeTestsMatching("utilities.TestQRFunctions.createQRCodeLocally") - } + group = "Verification" + description = "Runs a test to create a local QR code" + filter { + includeTestsMatching("utilities.TestQRFunctions.createQRCodeLocally") + } } - -// task{ utilities -// testlogger{ -// setTheme("mocha") -// showExceptions=true -// showStackTraces=true -// } -// } -// afterEvaluate { -// tasks.getByName("run") { -// dependsOn("appRun") -// } -// } -// cxf { -// wsdl2java { -// // wsdl info about countries -// wsdl = "http://webservices.oorsprong.org/websamples.countryinfo/CountryInfoService.wso?WSDL" -// packageName = "org.example.countryinfo" -// outputDir = file("src/main/java") -// } -// } \ No newline at end of file +// https://plugins.gradle.org/plugin/com.github.bjornvester.wsdl2java +wsdl2java { + // Set properties here... +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..a673105 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +#after upgrade run ./gradlew wrapper --gradle-version 8.3 \ No newline at end of file diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/resources/webServiceSOAPDemo.wsdl b/src/main/resources/webServiceSOAPDemo.wsdl new file mode 100644 index 0000000..73d3d46 --- /dev/null +++ b/src/main/resources/webServiceSOAPDemo.wsdl @@ -0,0 +1,419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file