Code Review
/
sdc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update version to 1.13.6-SNAPSHOT
[sdc.git]
/
openecomp-be
/
tools
/
swagger-ui
/
pom.xml
diff --git
a/openecomp-be/tools/swagger-ui/pom.xml
b/openecomp-be/tools/swagger-ui/pom.xml
index
8bacc05
..
e77ccdb
100644
(file)
--- a/
openecomp-be/tools/swagger-ui/pom.xml
+++ b/
openecomp-be/tools/swagger-ui/pom.xml
@@
-8,7
+8,7
@@
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc</artifactId>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc</artifactId>
- <version>1.
9.0
-SNAPSHOT</version>
+ <version>1.
13.6
-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<dependencies>
<relativePath>../../</relativePath>
</parent>
<dependencies>
@@
-26,6
+26,14
@@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
</exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@
-34,6
+42,10
@@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
</exclusions>
</dependency>
</dependencies>
@@
-56,7
+68,6
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${mvn.jar.version}</version>
<executions>
<execution>
<id>default-jar</id>
<executions>
<execution>
<id>default-jar</id>
@@
-78,11
+89,13
@@
<copy todir="${basedir}/target/${plugin.name}/">
<fileset dir="${rest.api.dir}/target/generated/swagger-ui/">
<include name="*.json"/>
<copy todir="${basedir}/target/${plugin.name}/">
<fileset dir="${rest.api.dir}/target/generated/swagger-ui/">
<include name="*.json"/>
+ <include name="*.yaml"/>
</fileset>
</copy>
<copy todir="${basedir}/target/${plugin.name}/">
</fileset>
</copy>
<copy todir="${basedir}/target/${plugin.name}/">
- <fileset dir="${catalog-be.api.dir}/target/generated/
swagger
/">
+ <fileset dir="${catalog-be.api.dir}/target/generated/
openapi
/">
<include name="*.json"/>
<include name="*.json"/>
+ <include name="*.yaml"/>
</fileset>
</copy>
</target>
</fileset>
</copy>
</target>
@@
-96,7
+109,7
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>
${mvn.assembly.version}
</version>
+ <version>
2.6
</version>
<configuration>
<descriptor>assembly/swagger.xml</descriptor>
<finalName>${plugin.name}</finalName>
<configuration>
<descriptor>assembly/swagger.xml</descriptor>
<finalName>${plugin.name}</finalName>