diff --git a/README.md b/README.md index 4c8a506de04b3010fcba594b6ad9dbaacdf5ae4d..deb0c4c8a21e3f4da054bcc74294bf515bf1e472 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# gradle-project +# Test Gradle @@ -15,14 +15,14 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea ``` cd existing_repo -git remote add origin https://gitlab.niveussolutions.com/prajwal.amin/gradle-project.git +git remote add origin https://gitlab.niveussolutions.com/deeksha.m/test-gradle.git git branch -M master git push -uf origin master ``` ## Integrate with your tools -- [ ] [Set up project integrations](https://gitlab.niveussolutions.com/prajwal.amin/gradle-project/-/settings/integrations) +- [ ] [Set up project integrations](https://gitlab.niveussolutions.com/deeksha.m/test-gradle/-/settings/integrations) ## Collaborate with your team diff --git a/build.gradle b/build.gradle index f49a17b2ff85b77b80b97f01c3d5541a1e854dca..014b63a2129f21e6b7ba21dc8984201d6d1852ee 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.1.5' + id 'org.springframework.boot' version '2.7.16' id 'io.spring.dependency-management' version '1.1.3' } @@ -8,7 +8,7 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' java { - sourceCompatibility = '17' + sourceCompatibility = '11' } repositories { @@ -16,15 +16,10 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' testImplementation 'org.springframework.boot:spring-boot-starter-test' } -tasks.named('bootBuildImage') { - builder = 'paketobuildpacks/builder-jammy-base:latest' -} - tasks.named('test') { useJUnitPlatform() } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..033e24c4cdf41af1ab109bc7f253b2b887023340 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f753336d4fabfd607678a7a2317e8a06..52336b0395cd9e27b7d1f3a170c63a50a87354a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 \ No newline at end of file diff --git a/gradlew b/gradlew index 1aa94a4269074199e6ed2c37e8db3e0826030965..fcb6fca147c0cd248611f3d67b8d74b470402795 100755 --- a/gradlew +++ b/gradlew @@ -83,8 +83,7 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -145,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +201,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/settings.gradle b/settings.gradle index af039058bda2fc6fec57fc42919d3dc41c32d840..423af745c0bd9a3bfe32dc63cb8c9d4787a58231 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'gradle-project' +rootProject.name = 'test-gradle' diff --git a/src/main/java/com/example/demo/TestGradleApplication.java b/src/main/java/com/example/demo/TestGradleApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..857e9fd87b5f27959ab210c285e31a3a062e7f73 --- /dev/null +++ b/src/main/java/com/example/demo/TestGradleApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestGradleApplication { + + public static void main(String[] args) { + SpringApplication.run(TestGradleApplication.class, args); + } + +} diff --git a/src/main/java/com/example/demo/controller/TestGradleController.java b/src/main/java/com/example/demo/controller/TestGradleController.java new file mode 100644 index 0000000000000000000000000000000000000000..1e4aab5393f388c63fcc2fe7421f88e7e448e4d1 --- /dev/null +++ b/src/main/java/com/example/demo/controller/TestGradleController.java @@ -0,0 +1,12 @@ +package com.example.demo.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestGradleController { + @GetMapping("/") + public String sendGreetings() { + return "Hello, World!"; + } +} diff --git a/src/main/java/com/example/gradleproject/GradleProjectApplication.java b/src/main/java/com/example/gradleproject/GradleProjectApplication.java deleted file mode 100644 index fac11053d79a27dd02a67621bd0ee66963c596ee..0000000000000000000000000000000000000000 --- a/src/main/java/com/example/gradleproject/GradleProjectApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.gradleproject; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@SpringBootApplication -public class GradleProjectApplication { - - public static void main(String[] args) { - SpringApplication.run(GradleProjectApplication.class, args); - } - -} -@RestController -@RequestMapping("/") -class HelloController { - @GetMapping("/hello") - public String hello() { - return "Hello, World!"; - } -} - diff --git a/src/test/java/com/example/demo/TestGradleApplicationTests.java b/src/test/java/com/example/demo/TestGradleApplicationTests.java new file mode 100644 index 0000000000000000000000000000000000000000..e3616e31b1a1bca4ed04e0c17924c8b90dd88fb2 --- /dev/null +++ b/src/test/java/com/example/demo/TestGradleApplicationTests.java @@ -0,0 +1,21 @@ +package com.example.demo; + +import com.example.demo.controller.TestGradleController; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +@SpringBootTest +class TestGradleApplicationTests { + @Autowired + private TestGradleController testGradleController; + + @Test + void contextLoads() { + // to ensure that controller is getting created inside the application context + assertNotNull(testGradleController); + } + +} diff --git a/src/test/java/com/example/demo/controller/TestGradleControllerTests.java b/src/test/java/com/example/demo/controller/TestGradleControllerTests.java new file mode 100644 index 0000000000000000000000000000000000000000..51a30e1a10591e756e670b9450e16c24e01c0bf4 --- /dev/null +++ b/src/test/java/com/example/demo/controller/TestGradleControllerTests.java @@ -0,0 +1,27 @@ +package com.example.demo.controller; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@SpringBootTest +@AutoConfigureMockMvc +public class TestGradleControllerTests { + @Autowired + private MockMvc mockMvc; + + @Test + public void shouldReturnExpectedMessage() throws Exception { + + mockMvc.perform(get("/")) + .andExpect(status().isOk()) + .andExpect(content().string("Hello, World!")); + } + +} diff --git a/src/test/java/com/example/gradleproject/GradleProjectApplicationTests.java b/src/test/java/com/example/gradleproject/GradleProjectApplicationTests.java deleted file mode 100644 index 135baae0cb33fe21369a195871a1059c2c636a89..0000000000000000000000000000000000000000 --- a/src/test/java/com/example/gradleproject/GradleProjectApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.gradleproject; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class GradleProjectApplicationTests { - - @Test - void contextLoads() { - } - -}