diff options
Diffstat (limited to 'ms/gra/gra-app/pom.xml')
| -rw-r--r-- | ms/gra/gra-app/pom.xml | 63 |
1 files changed, 48 insertions, 15 deletions
diff --git a/ms/gra/gra-app/pom.xml b/ms/gra/gra-app/pom.xml index bc95064..2069af2 100644 --- a/ms/gra/gra-app/pom.xml +++ b/ms/gra/gra-app/pom.xml @@ -47,6 +47,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-log4j2</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> @@ -72,6 +78,12 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-misc-env</artifactId> <version>${aaf.cadi.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.aaf.authz</groupId> @@ -95,9 +107,10 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> + <dependency> <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> + <artifactId>springfox-boot-starter</artifactId> <version>3.0.0</version> </dependency> <dependency> @@ -105,6 +118,7 @@ <artifactId>springfox-swagger-ui</artifactId> <version>3.0.0</version> </dependency> + <dependency> <groupId>org.onap.ccsdk.apps</groupId> <artifactId>services</artifactId> @@ -170,12 +184,6 @@ <version>${ccsdk.sli.plugins.version}</version> </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>4.3.0</version> - </dependency> - <!-- this jersey jar is needed for rest api call node to function properly --> <dependency> <groupId>org.glassfish.jersey.inject</groupId> @@ -225,9 +233,9 @@ <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-model-swagger</artifactId> <version>${sdnc.northbound.version}</version> - <type>yaml</type> - <outputDirectory>${project.build.directory}/yaml</outputDirectory> - <destFileName>generic-resource.yaml</destFileName> + <type>json</type> + <outputDirectory>${project.build.directory}/json</outputDirectory> + <destFileName>gra-swagger.json</destFileName> </artifactItem> </artifactItems> </configuration> @@ -254,9 +262,31 @@ </executions> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <configuration> + <executable>sh</executable> + <arguments> + <argument>${basedir}/src/main/resources/fixModuleUri.sh</argument> + <argument>GENERIC-RESOURCE-API</argument> + <argument>${project.build.directory}/json/gra-swagger.json</argument> + </arguments> + </configuration> + <id>fix-swagger-json</id> + <phase>generate-resources</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.swagger</groupId> <artifactId>swagger-codegen-maven-plugin</artifactId> - <version>2.3.1</version> + <version>2.4.41</version> <executions> <execution> <phase>generate-sources</phase> @@ -265,7 +295,8 @@ </goals> <configuration> <output>target/generated-sources</output> - <inputSpec>${project.build.directory}/yaml/generic-resource.yaml</inputSpec> + <!-- <inputSpec>${project.build.directory}/json/generic-resource.json</inputSpec> --> + <inputSpec>${project.basedir}/src/main/json/gra-swagger.json</inputSpec> <language>spring</language> <apiPackage>org.onap.sdnc.apps.ms.gra.swagger</apiPackage> <modelPackage>org.onap.sdnc.apps.ms.gra.swagger.model</modelPackage> @@ -276,8 +307,10 @@ <withXml>true</withXml> <templateDirectory>${project.basedir}/src/main/templates</templateDirectory> <configOptions> - <java8>true</java8> - <springBootVersion>2.2.4-RELEASE</springBootVersion> + <java11>true</java11> + <springBootVersion>3.0.3</springBootVersion> + <jakarta>true</jakarta> + <dateLibrary>java11</dateLibrary> </configOptions> </configuration> </execution> @@ -307,7 +340,7 @@ </goals> <configuration> <sources> - <source>${basedir}/target/generated-sources/src/main/java</source> + <source>target/generated-sources/src/main/java</source> </sources> </configuration> </execution> |