Merge remote-tracking branch 'upstream/master'

Conflicts: modules/distribution/pom.xml
9 years ago · 72fef2a2cc
parent 8b0d0ad8b5
commit 72fef2a2cc
1 changed files with 1 additions and 0 deletions
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -447,6 +447,7 @@
                                <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
                                    <patternset>
                                        <exclude name="**/shindig.properties" />
+d                                        <exclude name="**/shindig.properties" />
                                    </patternset>
                                </unzip>
                                <copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />