Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-09 00:27:27 +02:00
Code Issues Packages Projects Releases Activity

update enunciate to version 2.9.1

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-05-09 15:18:14 +02:00
parent de5e1084e9
commit 9ffb07acee
16 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
scm-webapp/pom.xml
View File

@@ -275,10 +275,9 @@
<!-- rest documentation -->
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-jersey-rt</artifactId>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-jaxrs</artifactId>
<version>${enunciate.version}</version>
<!-- fix conflict with jersey-json -->
<exclusions>
<exclusion>
<artifactId>jackson-jaxrs</artifactId>
@@ -546,7 +545,7 @@
<scm.home>target/scm-it</scm.home>
<environment.profile>default</environment.profile>
<selenium.version>2.53.1</selenium.version>
<enunciate.version>1.31</enunciate.version>
<enunciate.version>2.9.1</enunciate.version>
<aether.version>1.13.1</aether.version>
<wagon.version>1.0</wagon.version>
<maven.version>3.0.5</maven.version>
@@ -825,8 +824,35 @@
<plugins>
<plugin>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>maven-enunciate-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-enunciate-configuration</id>
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<resources>
<resource>
<directory>src/main/doc</directory>
<filtering>true</filtering>
<includes>
<include>**/enunciate.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId>
<version>${enunciate.version}</version>
<executions>
<execution>
@@ -837,14 +863,20 @@
</execution>
</executions>
<configuration>
<configFile>src/main/doc/enunciate.xml</configFile>
<configFile>${project.build.directory}/enunciate.xml</configFile>
<docsDir>${project.build.directory}/restdocs</docsDir>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-jersey</artifactId>
<version>${enunciate.version}</version>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-top</artifactId>
<version>2.9.1</version>
<exclusions>
<exclusion>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-swagger</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>