Skip to content

Commit 609393a

Browse files
marco76marco76
committed
plugin cleaning
1 parent e9b3153 commit 609393a

2 files changed

Lines changed: 12 additions & 35 deletions

File tree

‎backend/pom.xml‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
17-
<failOnMissingWebXml>false</failOnMissingWebXml>
1817
</properties>
1918

2019
<artifactId>backend</artifactId>
@@ -52,7 +51,7 @@
5251
<version>3.1.2</version>
5352
<executions>
5453
<execution>
55-
<id>unpackng</id>
54+
<id>merge</id>
5655
<phase>initialize</phase>
5756
<goals>
5857
<goal>unpack</goal>
@@ -64,37 +63,13 @@
6463
<artifactId>frontend</artifactId>
6564
<type>jar</type>
6665
<overWrite>true</overWrite>
67-
<outputDirectory>${project.build.directory}/angular</outputDirectory>
66+
<outputDirectory>${project.build.directory}/classes/static</outputDirectory>
6867
</artifactItem>
6968
</artifactItems>
7069
</configuration>
7170
</execution>
7271
</executions>
7372
</plugin>
74-
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-antrun-plugin</artifactId>
78-
<version>1.8</version>
79-
<executions>
80-
<execution>
81-
<id>move</id>
82-
<phase>generate-sources</phase>
83-
<goals>
84-
<goal>run</goal>
85-
</goals>
86-
<configuration>
87-
<target>
88-
<copy todir="${project.build.directory}/classes/static" flatten="false">
89-
<fileset dir="${project.build.directory}/angular/frontend">
90-
<include name="**/*.*"/>
91-
</fileset>
92-
</copy>
93-
</target>
94-
</configuration>
95-
</execution>
96-
</executions>
97-
</plugin>
9873
</plugins>
9974
</build>
10075
</project>

‎frontend/pom.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,37 @@
5151
</goals>
5252
</execution>
5353

54-
<!-- build app -->
54+
<!-- code validation -->
5555
<execution>
56-
<id>npm run build</id>
56+
<id>npm run lint</id>
5757
<goals>
5858
<goal>npm</goal>
5959
</goals>
60+
<phase>test</phase>
6061
<configuration>
61-
<arguments>run build --prod</arguments>
62+
<arguments>run lint</arguments>
6263
</configuration>
6364
</execution>
6465

65-
<!-- code validation -->
66+
<!-- build app -->
6667
<execution>
67-
<id>npm run lint</id>
68+
<id>npm run build</id>
6869
<goals>
6970
<goal>npm</goal>
7071
</goals>
71-
<phase>test</phase>
7272
<configuration>
73-
<arguments>run lint</arguments>
73+
<arguments>run build --prod</arguments>
7474
</configuration>
7575
</execution>
76+
7677
</executions>
7778
</plugin>
79+
7880
</plugins>
7981

8082
<resources>
8183
<resource>
82-
<directory>dist</directory>
84+
<directory>dist/frontend</directory>
8385
</resource>
8486
</resources>
8587
</build>

0 commit comments

Comments
 (0)