Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
adam-cattermole committed Oct 3, 2019
1 parent fc9643b commit e563368
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
19 changes: 13 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<!-- You can reference property in pom.xml or filtered resources (must enable third-party plugin if using Maven < 2.1) -->

<!-- JBoss dependency versions -->
<version.wildfly.maven.plugin>1.0.2.Final</version.wildfly.maven.plugin>
<version.wildfly.maven.plugin>2.0.1.Final</version.wildfly.maven.plugin>

<!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
<version.jboss.bom.eap>7.0.0.GA</version.jboss.bom.eap>
Expand All @@ -89,8 +89,8 @@
<version.ro.isdc.wro4j>1.8.0</version.ro.isdc.wro4j>

<!-- other plugin versions -->
<version.surefire.plugin>2.19</version.surefire.plugin>
<version.war.plugin>2.6</version.war.plugin>
<version.surefire.plugin>2.22.2</version.surefire.plugin>
<version.war.plugin>3.2.3</version.war.plugin>

<!-- maven-compiler-plugin -->
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down Expand Up @@ -178,6 +178,13 @@
<scope>provided</scope>
</dependency>

<!-- The xml bind libraries are no longer included in new Java JDK -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>

<!-- JSR-303 (Bean Validation) Implementation -->
<!-- Provides portable constraints such as @Email -->
<!-- Hibernate Validator is shipped in JBoss -->
Expand Down Expand Up @@ -221,19 +228,19 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>1.5.15</version>
<version>1.5.16</version>
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
<version>3.0.17</version>
<version>3.23.8</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
<version>28.1-jre</version>
</dependency>


Expand Down
10 changes: 5 additions & 5 deletions src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<head>
<meta charset="UTF-8">
<title>Contacts API</title>
<link rel="stylesheet" type="text/css" href="webjars/swagger-ui/3.0.17/swagger-ui.css" >
<link rel="stylesheet" type="text/css" href="webjars/swagger-ui/3.23.8/swagger-ui.css" >
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
<link rel="icon" type="image/png" href="webjars/swagger-ui/3.0.17/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="webjars/swagger-ui/3.0.17/favicon-16x16.png" sizes="16x16" />
<link rel="icon" type="image/png" href="webjars/swagger-ui/3.23.8/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="webjars/swagger-ui/3.23.8/favicon-16x16.png" sizes="16x16" />
<style>
html
{
Expand Down Expand Up @@ -72,8 +72,8 @@
<!--</div>-->
<!--</section>-->
</div>
<script src='webjars/swagger-ui/3.0.17/swagger-ui-bundle.js' type='text/javascript'></script>
<script src='webjars/swagger-ui/3.0.17/swagger-ui-standalone-preset.js' type='text/javascript'></script>
<script src='webjars/swagger-ui/3.23.8/swagger-ui-bundle.js' type='text/javascript'></script>
<script src='webjars/swagger-ui/3.23.8/swagger-ui-standalone-preset.js' type='text/javascript'></script>
<script>
window.onload = function() {
// Build a system
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static Archive<?> createTestArchive() {
File[] libs = Maven.resolver().loadPomFromFile("pom.xml")
// .importRuntimeAndTestDependencies()
.resolve(
"io.swagger:swagger-jaxrs:1.5.15"
"io.swagger:swagger-jaxrs:1.5.16"
).withTransitivity().asFile();

return ShrinkWrap
Expand Down

0 comments on commit e563368

Please sign in to comment.