Merge pull request #1299 from rushmin/release-fix

Release fix
wso2 · Aug 11, 2017 · a59d2c9 · a59d2c9
2 parents be46ce8 + 9eee25c
commit a59d2c9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/...nd/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml b/...nd/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml
@@ -30,11 +30,21 @@
  <property name="properties" location="${basedir}/src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent"/>
 
  <target name="clear-slf4j-libs">
- <delete file="${travelocity.webapp.lib}/jul-to-slf4j-1.6.1.jar"/>
- <delete file="${travelocity.webapp.lib}/log4j-over-slf4j-1.6.1.jar"/>
- <delete file="${travelocity.webapp.lib}/jcl-over-slf4j-1.6.1.jar"/>
- <delete file="${travelocity.webapp.lib}/slf4j-api-1.6.1.jar"/>
- <delete file="${travelocity.webapp.classes}/travelocity.properties"/>
+ <delete file="${travelocity.webapp.lib}/jul-to-slf4j-1.6.1.jar"/>
+ <delete file="${travelocity.webapp.lib}/log4j-over-slf4j-1.6.1.jar"/>
+ <delete file="${travelocity.webapp.lib}/jcl-over-slf4j-1.6.1.jar"/>
+ <delete file="${travelocity.webapp.lib}/slf4j-api-1.6.1.jar"/>
+
+ <!--
+ The release build env make the web apps have a SLF4J jar file with a different version.
+ This is a temp fix to make the release build work
+ -->
+ <delete file="${travelocity.webapp.lib}/jul-to-slf4j-1.7.5.jar"/>
+ <delete file="${travelocity.webapp.lib}/log4j-over-slf4j-1.7.5.jar"/>
+ <delete file="${travelocity.webapp.lib}/jcl-over-slf4j-1.7.5.jar"/>
+ <delete file="${travelocity.webapp.lib}/slf4j-api-1.7.5.jar"/>
+
+ <delete file="${travelocity.webapp.classes}/travelocity.properties"/>
  <copy file="${properties}/travelocity.properties"
  tofile="${travelocity.webapp.classes}/travelocity.properties"/>
  <war destfile="${build}/travelocity.com.war" webxml="${travelocity.webapp}/WEB-INF/web.xml">

diff --git a/...ts-integration/tests-backend/src/test/resources/artifacts/IS/passivests/sts-app-build.xml b/...ts-integration/tests-backend/src/test/resources/artifacts/IS/passivests/sts-app-build.xml
@@ -48,5 +48,14 @@
  <delete file="${sts.webapp.lib}/log4j-over-slf4j-1.6.1.jar"/>
  <delete file="${sts.webapp.lib}/jcl-over-slf4j-1.6.1.jar"/>
  <delete file="${sts.webapp.lib}/slf4j-api-1.6.1.jar"/>
+
+ <!--
+ The release build env make the web apps have a SLF4J jar file with a different version.
+ This is a temp fix to make the release build work
+ -->
+ <delete file="${sts.webapp.lib}/jul-to-slf4j-1.7.5.jar"/>
+ <delete file="${sts.webapp.lib}/log4j-over-slf4j-1.7.5.jar"/>
+ <delete file="${sts.webapp.lib}/jcl-over-slf4j-1.7.5.jar"/>
+ <delete file="${sts.webapp.lib}/slf4j-api-1.7.5.jar"/>
  </target>
 </project>