Merge pull request allure-framework#487 from just-boris/master

add missing resource
MaxMoto1702 · Feb 13, 2015 · 2237161 · 2237161
2 parents 10647ec + 5c25360
commit 2237161
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/allure-e2e/pom.xml b/allure-e2e/pom.xml
@@ -97,28 +97,10 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${project.basedir}/../allure-report-face/target/webjars/META-INF/resources
+                                        ${project.basedir}/../allure-report-face/target/allure-report-face-${project.version}
                                     </directory>
                                     <filtering>false</filtering>
                                 </resource>
-                                <resource>
-                                    <directory>
-                                        ${project.basedir}/../allure-report-face/src/main/webapp
-                                    </directory>
-                                    <excludes>
-                                        <exclude>index.html</exclude>
-                                    </excludes>
-                                    <filtering>false</filtering>
-                                </resource>
-                                <resource>
-                                    <directory>
-                                        ${project.basedir}/../allure-report-face/src/main/webapp
-                                    </directory>
-                                    <includes>
-                                        <include>index.html</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
                             </resources>
                         </configuration>
                     </execution>

diff --git a/allure-report-face/pom.xml b/allure-report-face/pom.xml
@@ -165,6 +165,7 @@
                                 <include>webjars/messageformat.js/0.1.4/messageformat.js</include>
                                 <include>webjars/angular-translate-interpolation-messageformat/0.1.2/angular-translate-interpolation-messageformat.js</include>
                                 <include>webjars/highlightjs/8.2-1/highlight.min.js</include>
+                                <include>webjars/font-awesome/4.2.0/fonts/**</include>
                             </includes>
                             <directory>${project.build.directory}/webjars/META-INF/resources</directory>
                             <filtering>false</filtering>