diff options
| author |   xg353y <xg353y@intl.att.com> | 2018-07-23 16:02:28 +0200 |
|---|---|---|
| committer | xg353y <xg353y@intl.att.com> | 2018-07-26 16:06:10 +0200 |
| commit | 054f1d1e13b4a7f0dc3a84d4c282019a3c528043 (patch) | |
| tree | c20b0cb0915f678653288487c6ad8f4d5497144b /pom.xml | |
| parent | b0ff445fb7b53db882997ec0fd0e843b5c92a413 (diff) | |
Upgrade spring/camel versions
Upgrade the spring/camel dependency versions in order to solve the
security issue
Issue-ID: CLAMP-188
Change-Id: I80c28a4d9c142b89463ad3a6a00761e5495adda8
Signed-off-by: xg353y <xg353y@intl.att.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 164 |
1 files changed, 22 insertions, 142 deletions
@@ -69,8 +69,8 @@ <swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version> <eelf.core.version>1.0.0</eelf.core.version> - <camel.version>2.20.1</camel.version> - <springboot.version>1.5.14.RELEASE</springboot.version> + <camel.version>2.22.0</camel.version> + <springboot.version>2.0.2.RELEASE</springboot.version> <sonar.language>java</sonar.language> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> @@ -87,7 +87,7 @@ <docker.skip.tag>true</docker.skip.tag> <skip.staging.artifacts>false</skip.staging.artifacts> <python.http.proxy.param></python.http.proxy.param> - <tomcat.version>8.5.28</tomcat.version> + <tomcat.version>8.5.32</tomcat.version> </properties> <profiles> @@ -267,10 +267,19 @@ <artifactId>camel-servlet-starter</artifactId> </dependency> <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jackson</artifactId> + </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.3.0</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + <version>2.27</version> + </dependency> <!-- Spring famework --> <dependency> <groupId>org.springframework.boot</groupId> @@ -281,11 +290,6 @@ <artifactId>spring-boot-starter-tomcat</artifactId> </dependency> <dependency> - <groupId>com.paypal.springboot</groupId> - <artifactId>resteasy-spring-boot-starter</artifactId> - <version>2.3.4-RELEASE</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> </dependency> @@ -299,6 +303,10 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-autoconfigure</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> <exclusions> @@ -550,25 +558,6 @@ <artifactId>sdc-tosca</artifactId> <version>1.3.0</version> </dependency> - <!-- To generate Swagger.json, swagger.html and swagger.pdf --> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.github.robwin</groupId> - <artifactId>assertj-swagger</artifactId> - <version>0.2.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.github.swagger2markup</groupId> - <artifactId>swagger2markup-spring-restdocs-ext</artifactId> - <version>1.2.0</version> - <scope>test</scope> - </dependency> <!-- TESTING --> <dependency> <groupId>org.assertj</groupId> @@ -576,6 +565,12 @@ <version>3.10.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> </dependencies> <pluginRepositories> <pluginRepository> @@ -631,121 +626,6 @@ </resources> <plugins> - <!-- Scan Clamp code and generate the swagger.json file with all the - APIs --> - <plugin> - <groupId>com.sebastian-daschner</groupId> - <artifactId>jaxrs-analyzer-maven-plugin</artifactId> - <version>0.14</version> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>analyze-jaxrs</goal> - </goals> - <configuration> - <backend>swagger</backend> - <resourcesDir>../docs/swagger/</resourcesDir> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Read the swagger.json file and the definition from SwaggerConfig.java; - generate a list of .adoc files containing the APIs info in more structured - way --> - <plugin> - <groupId>io.github.swagger2markup</groupId> - <artifactId>swagger2markup-maven-plugin</artifactId> - <version>1.3.1</version> - <dependencies> - <dependency> - <groupId>io.github.swagger2markup</groupId> - <artifactId>swagger2markup-import-files-ext</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>io.github.swagger2markup</groupId> - <artifactId>swagger2markup-spring-restdocs-ext</artifactId> - <version>1.3.1</version> - </dependency> - </dependencies> - <configuration> - <swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput> - <outputDir>${project.build.directory}/asciidoc/generated</outputDir> - <config> - <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage> - </config> - </configuration> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>convertSwagger2markup</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- Run the generated asciidoc through Asciidoctor to generate other - documentation types, such as PDFs or HTML5 --> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>1.5.3</version> - <dependencies> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj-pdf</artifactId> - <version>1.5.0-alpha.10.1</version> - </dependency> - <dependency> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - <version>1.7.21</version> - </dependency> - </dependencies> - <configuration> - <sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory> - <sourceDocumentName>swagger.adoc</sourceDocumentName> - <attributes> - <doctype>book</doctype> - <toc>left</toc> - <toclevels>3</toclevels> - <numbered></numbered> - <hardbreaks></hardbreaks> - <sectlinks></sectlinks> - <sectanchors></sectanchors> - <generated>${project.build.directory}/asciidoc/generated</generated> - </attributes> - </configuration> - - <executions> - <execution> - <id>output-html</id> - <phase>test</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - <configuration> - <backend>html5</backend> - <outputDirectory>${project.basedir}/docs/swagger</outputDirectory> - <outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory> - </configuration> - </execution> - <execution> - <id>output-pdf</id> - <phase>test</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - <configuration> - <backend>pdf</backend> - <outputDirectory>${project.basedir}/docs/swagger</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> |