Skip to content

Commit

Permalink
Upgraded the library versions
Browse files Browse the repository at this point in the history
  • Loading branch information
dilipkrish committed Jun 19, 2020
1 parent de09df1 commit 1c54fe2
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 68 deletions.
9 changes: 6 additions & 3 deletions boot-static-docs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@

buildscript {
repositories {
jcenter()
}

dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE")
classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.3"
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11'
}
}

apply plugin: 'spring-boot'
plugins {
id 'org.springframework.boot' version '2.3.1.RELEASE'
}

apply plugin: 'idea'
apply plugin: 'groovy'
apply plugin: "org.asciidoctor.convert"
Expand All @@ -22,7 +25,7 @@ dependencies {
compile libs.springfoxSwaggerUi
testCompile libs.test
testCompile libs.springfoxStaticDocs
testCompile 'io.swagger:swagger-parser:1.0.26'
testCompile 'io.swagger:swagger-parser:2.0.0-rc1'
}

def targetDocDir = "${project.buildDir}/asciidoc/generated/swagger_adoc"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,43 @@ package springfoxdemo.staticdocs

import groovy.io.FileType
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.SpringApplicationContextLoader
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
import org.springframework.http.MediaType
import org.springframework.test.context.ContextConfiguration
import org.springframework.test.context.TestExecutionListeners
import org.springframework.test.context.support.DependencyInjectionTestExecutionListener
import org.springframework.test.context.support.DirtiesContextTestExecutionListener
import org.springframework.test.context.web.WebAppConfiguration
import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.setup.MockMvcBuilders
import org.springframework.web.context.WebApplicationContext
import spock.lang.Ignore
import spock.lang.Specification
import springfox.documentation.staticdocs.Swagger2MarkupResultHandler

import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*

@ContextConfiguration(
loader = SpringApplicationContextLoader,
classes = Application)
@WebAppConfiguration
@TestExecutionListeners([DependencyInjectionTestExecutionListener, DirtiesContextTestExecutionListener])
class StaticDocsTest extends spock.lang.Specification {
@AutoConfigureMockMvc
@WebMvcTest
class StaticDocsTest extends Specification {

@Autowired
WebApplicationContext context;

MockMvc mockMvc;

def setup() {
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context).build()
}

@Ignore
def "generates the petstore api asciidoc"() {
setup:
String outDir = System.getProperty('asciiDocOutputDir', 'build/aciidoc')
Swagger2MarkupResultHandler resultHandler = Swagger2MarkupResultHandler
.outputDirectory(outDir)
.build()
String outDir = System.getProperty('asciiDocOutputDir', 'build/aciidoc')
Swagger2MarkupResultHandler resultHandler = Swagger2MarkupResultHandler
.outputDirectory(outDir)
.build()

when:
this.mockMvc.perform(get("/v2/api-docs").accept(MediaType.APPLICATION_JSON))
.andDo(resultHandler)
.andExpect(status().isOk())
this.mockMvc.perform(get("/v2/api-docs").accept(MediaType.APPLICATION_JSON))
.andDo(resultHandler)
.andExpect(status().isOk())

then:
def list = []
def dir = new File(resultHandler.outputDir)
dir.eachFileRecurse(FileType.FILES) { file ->
list << file.name
}
list.sort() == ['definitions.adoc', 'overview.adoc', 'paths.adoc']
def list = []
def dir = new File(resultHandler.outputDir)
dir.eachFileRecurse(FileType.FILES) { file ->
list << file.name
}
list.sort() == ['definitions.adoc', 'overview.adoc', 'paths.adoc']
}
}
11 changes: 2 additions & 9 deletions boot-swagger/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
buildscript {
repositories {
jcenter()
}

dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE")
}
plugins {
id 'org.springframework.boot' version '2.3.1.RELEASE'
}

apply plugin: 'spring-boot'
apply plugin: 'idea'

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {

dependencies {
classpath "com.github.adrianbk:gradle-jvmsrc-plugin:0.6.1"
classpath 'com.ofg:uptodate-gradle-plugin:1.6.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
classpath 'com.ofg:uptodate-gradle-plugin:1.6.3'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0'
}
}

Expand All @@ -31,8 +31,8 @@ subprojects {
}


sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8

configurations.all {
//Dont cache snapshots
Expand Down
14 changes: 6 additions & 8 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ext {
springVersion = "4.3.8.RELEASE"
springBootVersion = "1.5.9.RELEASE"
springfoxVersion = '2.8.0'
jacksonVersion = '2.9.3'
groovy = "2.4.8"
spock = "1.0-groovy-2.4"
springVersion = "5.2.7.RELEASE"
springBootVersion = "2.3.1.RELEASE"
springfoxVersion = '2.9.2'
jacksonVersion = '2.11.0'
groovy = "3.0.4"
spock = "2.0-M3-groovy-3.0"

libs = [

Expand Down Expand Up @@ -37,8 +37,6 @@ ext {
"org.spockframework:spock-spring:${spock}",
"org.spockframework:spock-core:${spock}",
"org.springframework:spring-test:${springVersion}",
"cglib:cglib-nodep:3.2.4",
"org.objenesis:objenesis:2.4",
"org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
],
springfoxStaticDocs: [
Expand Down
10 changes: 5 additions & 5 deletions springfox-integration-webflux/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ repositories {
mavenCentral()
}
dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:'2.0.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-integration', version:'2.0.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version:'2.0.6.RELEASE'
compile group: 'org.springframework.integration', name: 'spring-integration-webflux', version:'5.0.9.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:'2.3.1.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-integration', version:'2.3.1.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version:'2.3.1.RELEASE'
compile group: 'org.springframework.integration', name: 'spring-integration-webflux', version:'2.3.1.RELEASE'
compile group: 'io.springfox', name: 'springfox-swagger2', version:'3.0.0-SNAPSHOT'
compile group: 'io.springfox', name: 'springfox-spring-webflux', version:'3.0.0-SNAPSHOT'
compile group: 'io.springfox', name: 'springfox-spring-integration-webflux', version:'3.0.0-SNAPSHOT'
compile group: 'io.springfox', name: 'springfox-swagger-ui', version:'3.0.0-SNAPSHOT'
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'2.0.6.RELEASE'
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'2.3.1.RELEASE'
}
2 changes: 1 addition & 1 deletion springfox-integration-webflux/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.6.RELEASE</version>
<version>2.3.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
8 changes: 4 additions & 4 deletions springfox-integration-webmvc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ repositories {
mavenCentral()
}
dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:'2.0.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-integration', version:'2.0.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'2.0.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:'2.3.1.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-integration', version:'2.3.1.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'2.3.1.RELEASE'
compile(group: 'org.springframework.integration', name: 'spring-integration-http', version:'5.0.9.RELEASE') {
exclude(module: 'commons-logging')
exclude(module: 'commons-logging-api')
Expand All @@ -47,6 +47,6 @@ exclude(module: 'commons-logging-api')
compile group: 'io.springfox', name: 'springfox-spring-webmvc', version:'3.0.0-SNAPSHOT'
compile group: 'io.springfox', name: 'springfox-spring-integration-webmvc', version:'3.0.0-SNAPSHOT'
compile group: 'io.springfox', name: 'springfox-swagger-ui', version:'3.0.0-SNAPSHOT'
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'2.0.6.RELEASE'
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'2.3.1.RELEASE'
testCompile group: 'org.springframework.restdocs', name: 'spring-restdocs-mockmvc', version:'2.0.2.RELEASE'
}
2 changes: 1 addition & 1 deletion springfox-integration-webmvc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.6.RELEASE</version>
<version>2.3.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down

0 comments on commit 1c54fe2

Please sign in to comment.