diff options
| author |   danielhanrahan <daniel.hanrahan@est.tech> | 2022-01-28 11:41:38 +0000 |
|---|---|---|
| committer | danielhanrahan <daniel.hanrahan@est.tech> | 2022-02-23 09:50:14 +0000 |
| commit | 4a50604b767176aa323acae366fa762015a7f9f6 (patch) | |
| tree | 065f6be626573df3da5df23b3b2d2533cb9ed819 /gui-editors/gui-editor-apex/pom.xml | |
| parent | 6e3d850c1b6efda12a70a111c8734972c99e3db5 (diff) | |
Apex Editor using Spring Boot
Changed Apex Editor to use Spring Boot (MVC)
Changed all tests to use JUnit 5
Added more tests for policy upload feature
Updated JS files to reflect JSON encoding change
Added Apex Editor README
Changed rest path to /policy/gui/v1/apex/editor
Issue-ID: POLICY-3896
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I10f1ee3c40244a822a7032b4b24cb02060698fc3
Diffstat (limited to 'gui-editors/gui-editor-apex/pom.xml')
| -rw-r--r-- | gui-editors/gui-editor-apex/pom.xml | 112 |
1 files changed, 30 insertions, 82 deletions
diff --git a/gui-editors/gui-editor-apex/pom.xml b/gui-editors/gui-editor-apex/pom.xml index 760cd8d..6e9920d 100644 --- a/gui-editors/gui-editor-apex/pom.xml +++ b/gui-editors/gui-editor-apex/pom.xml @@ -59,6 +59,12 @@ <groupId>org.onap.policy.models</groupId> <artifactId>policy-models-tosca</artifactId> <version>${policy.models.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> @@ -66,37 +72,29 @@ <version>${policy.apex-pdp.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-grizzly2-http</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-moxy</artifactId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> <exclusions> <exclusion> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.moxy</artifactId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-json</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-grizzly2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-inline</artifactId> - <version>3.10.0</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> @@ -161,7 +159,7 @@ <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory> + <outputDirectory>${project.build.directory}/classes/static</outputDirectory> <resources> <resource> <directory>${webapp.dir}/dist</directory> @@ -202,70 +200,20 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>build-uber-jar</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <finalName>${project.artifactId}-uber-${project.version}</finalName> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>full</shadedClassifierName> - <artifactSet> - <includes> - <include>*:*</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.onap.policy.gui.editors.apex.rest.ApexEditorMain</mainClass> - </transformer> - </transformers> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> <executions> <execution> - <id>attach-artifacts</id> - <phase>package</phase> + <id>repackage</id> <goals> - <goal>attach-artifact</goal> + <goal>repackage</goal> </goals> <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.artifactId}-uber-${project.version}.jar</file> - <type>uber.jar</type> - </artifact> - </artifacts> + <!-- By default, the repackage goal replaces the original artifact with the repackaged one. + By specifying a classifier here, we can retain both the original and repackaged jars. + Thus two jars are produced: a regular jar that we can include in other modules, and an + executable Spring Boot jar with the suffix 'exec'. --> + <classifier>exec</classifier> </configuration> </execution> </executions> |