Skip to content

Commit

Permalink
SAK-33875 - Move handlebars properties into master (sakaiproject#5270)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ottenhoff
Miguel Pellicer authored and ottenhoff committed Feb 5, 2018
1 parent ce9e3e9 commit b01f9f9
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion commons/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<plugin>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars-maven-plugin</artifactId>
<version>4.0.5</version>
<version>${handlebars4.version}</version>
<executions>
<execution>
<id>templates</id>
Expand Down
4 changes: 2 additions & 2 deletions feedback/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<plugin>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars-maven-plugin</artifactId>
<version>1.3.1</version>
<version>${handlebars1.version}</version>
<executions>
<execution>
<id>precompile</id>
Expand Down Expand Up @@ -156,7 +156,7 @@
<plugin>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars-maven-plugin</artifactId>
<version>1.3.1</version>
<version>${handlebars1.version}</version>
<executions>
<execution>
<id>precompile</id>
Expand Down
2 changes: 1 addition & 1 deletion library/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>handlebars</artifactId>
<version>4.0.5</version>
<version>${handlebars4.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion master/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@
<sakai.genericdao.version>0.11.0</sakai.genericdao.version>
<reflectutils.version>0.9.20</reflectutils.version>
<json.simple.version>1.1.1</json.simple.version>
<handlebars.version>2.1.0</handlebars.version>
<handlebars1.version>1.3.1</handlebars1.version>
<handlebars2.version>2.1.0</handlebars2.version>
<handlebars4.version>4.0.6</handlebars4.version>
<jdom.version>1.0</jdom.version>
<hamcrest.all.version>1.3</hamcrest.all.version>
<junit.version>4.11</junit.version>
Expand Down
2 changes: 1 addition & 1 deletion pasystem/pasystem-impl/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
<version>4.0.6</version>
<version>${handlebars4.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pasystem/pasystem-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
<version>4.0.6</version>
<version>${handlebars4.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

<script>
if (typeof Handlebars == 'undefined') {
document.write('\x3Cscript src="${pageWebjarsPath}handlebars/4.0.5/handlebars.runtime.min.js$!{portalCDNQuery}">\x3C/script>');
document.write('\x3Cscript src="${pageWebjarsPath}handlebars/4.0.6/handlebars.runtime.min.js$!{portalCDNQuery}">\x3C/script>');
}
</script>
<script src="/library/templates.js$!{portalCDNQuery}"></script>
Expand Down
2 changes: 1 addition & 1 deletion roster2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<plugin>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars-maven-plugin</artifactId>
<version>4.0.5</version>
<version>${handlebars4.version}</version>
<executions>
<execution>
<id>precompile</id>
Expand Down
2 changes: 1 addition & 1 deletion roster2/src/webapp/WEB-INF/bootstrap.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<script type="text/javascript" src="/library/webjars/jquery-migrate/1.4.1/jquery-migrate.min.js"></script>
<script type="text/javascript" src="/sakai-roster2-tool/lib/jquery.waitforimages.min.js"></script>
<script type="text/javascript" src="/profile2-tool/javascript/profile2-eb.js"></script>
<script type="text/javascript" src="/library/webjars/handlebars/4.0.5/handlebars.runtime.min.js"></script>
<script type="text/javascript" src="/library/webjars/handlebars/4.0.6/handlebars.runtime.min.js"></script>
<script type="text/javascript" src="/sakai-roster2-tool/templates.js"></script>
<script type="text/javascript" src="/sakai-roster2-tool/lib/sakai_utils.js"></script>
<script type="text/javascript" src="/sakai-roster2-tool/js/roster_permissions.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion tags/tags-impl/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
<version>${handlebars.version}</version>
<version>${handlebars2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion tags/tags-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
<version>${handlebars.version}</version>
<version>${handlebars2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down

0 comments on commit b01f9f9

Please sign in to comment.