Skip to content

Commit 91dc70b

Browse files
PDavidPDavid
committed
HBASE-27802 Copy resources to final place with one step maven-dependency-plugin
this way no need to have a flat copy using maven-antrun-plugin. Only for this we have to use newer maven-dependency-plugin.
1 parent 1827c56 commit 91dc70b

2 files changed

Lines changed: 47 additions & 42 deletions

File tree

‎hbase-server/pom.xml‎

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -524,44 +524,6 @@
524524
<plugin>
525525
<artifactId>maven-antrun-plugin</artifactId>
526526
<executions>
527-
<execution>
528-
<!-- Copy static CSS and JS files for the UI. -->
529-
<id>copy-css-js-to-ui</id>
530-
<goals>
531-
<goal>run</goal>
532-
</goals>
533-
<phase>process-resources</phase>
534-
<configuration>
535-
<target>
536-
<copy flatten="true" todir="${project.build.directory}/hbase-webapps/static/css">
537-
<fileset dir="${webjars-dir}/bootstrap/${bootstrap.version}/css">
538-
<include name="bootstrap.min.css"/>
539-
</fileset>
540-
</copy>
541-
<copy flatten="true" todir="${project.build.directory}/hbase-webapps/static/js">
542-
<fileset dir="${webjars-dir}/bootstrap/${bootstrap.version}/js">
543-
<include name="bootstrap.min.js"/>
544-
</fileset>
545-
<fileset dir="${webjars-dir}/jquery/${jquery.version}">
546-
<include name="jquery.min.js"/>
547-
</fileset>
548-
<fileset dir="${webjars-dir}/tablesorter/${tablesorter.version}/js">
549-
<include name="jquery.tablesorter.min.js"/>
550-
<include name="parsers/parser-date-iso8601.min.js"/>
551-
</fileset>
552-
<fileset dir="${webjars-dir}/vega/${vega.version}/">
553-
<include name="vega.min.js"/>
554-
</fileset>
555-
<fileset dir="${webjars-dir}/vega-embed/${vega-embed.version}/">
556-
<include name="vega-embed.min.js"/>
557-
</fileset>
558-
<fileset dir="${webjars-dir}/vega-lite/${vega-lite.version}/">
559-
<include name="vega-lite.min.js"/>
560-
</fileset>
561-
</copy>
562-
</target>
563-
</configuration>
564-
</execution>
565527
<!-- Generate web app sources -->
566528
<execution>
567529
<id>generate</id>
@@ -790,7 +752,9 @@
790752
<build>
791753
<plugins>
792754
<plugin>
755+
<groupId>org.apache.maven.plugins</groupId>
793756
<artifactId>maven-dependency-plugin</artifactId>
757+
<version>${maven.dependency.version}</version>
794758
<executions>
795759
<execution>
796760
<id>create-mrapp-generated-classpath</id>
@@ -807,7 +771,7 @@
807771
</configuration>
808772
</execution>
809773
<execution>
810-
<id>unpack-ui-resources</id>
774+
<id>unpack-ui-resources-js</id>
811775
<goals>
812776
<goal>unpack</goal>
813777
</goals>
@@ -820,8 +784,10 @@
820784
<version>${bootstrap.version}</version>
821785
<type>jar</type>
822786
<overWrite>true</overWrite>
823-
<includes>**/css/bootstrap.min.css,
824-
**/js/bootstrap.min.js</includes>
787+
<includes>**/js/bootstrap.min.js</includes>
788+
<fileMappers>
789+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
790+
</fileMappers>
825791
</artifactItem>
826792
<artifactItem>
827793
<groupId>org.webjars</groupId>
@@ -830,6 +796,9 @@
830796
<type>jar</type>
831797
<overWrite>true</overWrite>
832798
<includes>**/jquery.min.js</includes>
799+
<fileMappers>
800+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
801+
</fileMappers>
833802
</artifactItem>
834803
<artifactItem>
835804
<groupId>org.webjars</groupId>
@@ -839,6 +808,9 @@
839808
<overWrite>true</overWrite>
840809
<includes>**/jquery.tablesorter.min.js,
841810
**/parsers/parser-date-iso8601.min.js</includes>
811+
<fileMappers>
812+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
813+
</fileMappers>
842814
</artifactItem>
843815
<artifactItem>
844816
<groupId>org.webjars</groupId>
@@ -847,6 +819,9 @@
847819
<type>jar</type>
848820
<overWrite>true</overWrite>
849821
<includes>**/vega.min.js</includes>
822+
<fileMappers>
823+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
824+
</fileMappers>
850825
</artifactItem>
851826
<artifactItem>
852827
<groupId>org.webjars</groupId>
@@ -855,6 +830,9 @@
855830
<type>jar</type>
856831
<overWrite>true</overWrite>
857832
<includes>**/vega-embed.min.js</includes>
833+
<fileMappers>
834+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
835+
</fileMappers>
858836
</artifactItem>
859837
<artifactItem>
860838
<groupId>org.webjars</groupId>
@@ -863,9 +841,35 @@
863841
<type>jar</type>
864842
<overWrite>true</overWrite>
865843
<includes>**/vega-lite.min.js</includes>
844+
<fileMappers>
845+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
846+
</fileMappers>
847+
</artifactItem>
848+
</artifactItems>
849+
<outputDirectory>${project.build.directory}/hbase-webapps/static/js</outputDirectory>
850+
</configuration>
851+
</execution>
852+
<execution>
853+
<id>unpack-ui-resources-css</id>
854+
<goals>
855+
<goal>unpack</goal>
856+
</goals>
857+
<phase>process-resources</phase>
858+
<configuration>
859+
<artifactItems>
860+
<artifactItem>
861+
<groupId>org.webjars</groupId>
862+
<artifactId>bootstrap</artifactId>
863+
<version>${bootstrap.version}</version>
864+
<type>jar</type>
865+
<overWrite>true</overWrite>
866+
<includes>**/css/bootstrap.min.css</includes>
867+
<fileMappers>
868+
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"/>
869+
</fileMappers>
866870
</artifactItem>
867871
</artifactItems>
868-
<outputDirectory>${project.build.directory}</outputDirectory>
872+
<outputDirectory>${project.build.directory}/hbase-webapps/static/css</outputDirectory>
869873
</configuration>
870874
</execution>
871875
</executions>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@
914914
<maven.eclipse.version>2.10</maven.eclipse.version>
915915
<maven.gpg.version>3.0.1</maven.gpg.version>
916916
<maven.javadoc.version>3.4.0</maven.javadoc.version>
917+
<maven.dependency.version>3.8.1</maven.dependency.version>
917918
<maven.warbucks.version>1.1.0</maven.warbucks.version>
918919
<maven.project.info.report.version>3.1.2</maven.project.info.report.version>
919920
<maven-owasp-plugin.version>12.1.0</maven-owasp-plugin.version>

0 commit comments

Comments
 (0)