You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/02/15 13:46:55 UTC

svn commit: r1783103 - in /myfaces/tobago/trunk/tobago-theme: pom.xml rebuild-theme.sh

Author: lofwyr
Date: Wed Feb 15 13:46:54 2017
New Revision: 1783103

URL: http://svn.apache.org/viewvc?rev=1783103&view=rev
Log:
TOBAGO-1700: Re-Add the version of Tobago to the resources URL to avoid caching when updating Tobago

Modified:
    myfaces/tobago/trunk/tobago-theme/pom.xml
    myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh

Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1783103&r1=1783102&r2=1783103&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Wed Feb 15 13:46:54 2017
@@ -147,7 +147,7 @@
                 </goals>
                 <configuration>
                   <outputDirectory>
-                    ${basedir}/src/main/resources/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${tobago.version}-${bootstrap.version}
+                    ${basedir}/src/main/resources/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${tobago.version}
                   </outputDirectory>
                   <resources>
                     <resource>

Modified: myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh?rev=1783103&r1=1783102&r2=1783103&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh (original)
+++ myfaces/tobago/trunk/tobago-theme/rebuild-theme.sh Wed Feb 15 13:46:54 2017
@@ -19,25 +19,13 @@
 
 set -e
 
-TOBAGO_VERSION=3.1.0
-BOOTSTRAP_VERSION=4.0.0-alpha.5
-
 mvn -P all-modules clean
 
 mvn -P rebuild-theme -f tobago-theme-charlotteville/pom.xml
-rm tobago-theme-charlotteville/src/main/resources/META-INF/resources/tobago/charlotteville/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
-
 mvn -P rebuild-theme -f tobago-theme-richmond/pom.xml
-rm tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
-
 mvn -P rebuild-theme -f tobago-theme-scarborough/pom.xml
-rm tobago-theme-scarborough/src/main/resources/META-INF/resources/tobago/scarborough/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
-
 mvn -P rebuild-theme -f tobago-theme-speyside/pom.xml
-rm tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
-
 mvn -P rebuild-theme -f tobago-theme-standard/pom.xml
-rm tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/bootstrap/${BOOTSTRAP_VERSION}-${TOBAGO_VERSION}/css/bootstrap-*
 
 mvn -P all-modules install