ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	modules/distribution/pom.xml
application-manager-new
NuwanSameera 9 years ago
parent 8b0d0ad8b5
commit 72fef2a2cc
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
modules/distribution/pom.xml
Unescape View File

@ -447,6 +447,7 @@
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}"> <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
<patternset> <patternset>
<exclude name="**/shindig.properties" /> <exclude name="**/shindig.properties" />
d <exclude name="**/shindig.properties" />
</patternset> </patternset>
</unzip> </unzip>
<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" /> <copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />

Write Preview
Loading…
Cancel
Save