Merge pull request TechEmpower#1816 from jochenberger/patch-1

Update Tapestry to the latest version

Author: msmith-techempower

frameworks/Java/tapestry/hello/pom.xml

@@ -20,15 +20,18 @@
         <dependency>
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
-          <version>5.1.23</version>
+          <version>5.1.38</version>
         </dependency>
 
         <!-- This adds automatic compression of JavaScript and CSS when in production mode. -->
+        <!-- This currently breaks the resin deployment
+             (see https://github.com/TechEmpower/FrameworkBenchmarks/pull/1816#issuecomment-167749791)
         <dependency>
             <groupId>org.apache.tapestry</groupId>
-            <artifactId>tapestry-yuicompressor</artifactId>
+            <artifactId>tapestry-webresources</artifactId>
             <version>${tapestry-release-version}</version>
         </dependency>
+        -->
 
         <!-- Uncomment this to add support for file uploads:
 
@@ -83,7 +86,7 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.3.0</version>
+            <version>2.6.4</version>
         </dependency>
 
     </dependencies>
@@ -133,16 +136,23 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
 
     <repositories>
 
-        <!-- This repository is only needed when the Tapestry version is a preview release, rather
-             than a final release. -->
         <repository>
-            <id>apache-staging</id>
-            <url>https://repository.apache.org/content/groups/staging/</url>
+            <id>maven-central</id>
+            <url>https://repo1.maven.org/maven2</url>
+            <snapshots>
+              <enabled>false</enabled>
+            </snapshots>
         </repository>
+        <!-- This repository is only needed when the Tapestry version is a preview release, rather
+             than a final release. -->
+<!--         <repository> -->
+<!--             <id>apache-staging</id> -->
+<!--             <url>https://repository.apache.org/content/groups/staging/</url> -->
+<!--         </repository> -->
     </repositories>
 
     <properties>
-        <tapestry-release-version>5.3.6</tapestry-release-version>
+        <tapestry-release-version>5.4.0</tapestry-release-version>
         <servlet-api-release-version>2.5</servlet-api-release-version>
         <testng-release-version>5.14.10</testng-release-version>
         <easymock-release-version>3.0</easymock-release-version>

frameworks/Java/tapestry/hello/src/main/java/hello/services/AppModule.java

@@ -46,17 +46,7 @@ public static void contributeApplicationDefaults(
         // the first locale name is the default when there's no reasonable match).
         configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en");
         configuration.add(SymbolConstants.OMIT_GENERATOR_META, true);
+        configuration.add(SymbolConstants.INCLUDE_CORE_STACK, false);
 
     }
-    
-    public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter> configuration){
-      // prevent addition of the default stylesheet. There will be a symbol to toggle this behavior in Tapestry 5.4.
-      configuration.override("InjectDefaultStylesheet", new MarkupRendererFilter() {
-        
-        @Override
-        public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer) {
-          renderer.renderMarkup(writer);
-        }
-      });
-    }
 }