jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1495828 [1/3] - in /incubator/jspwiki/trunk: ./ jspwiki-war/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/webapp/scripts/ jspwiki-war/src/main/webapp/templates/default/
Date Sun, 23 Jun 2013 15:15:52 GMT
Author: gmazza
Date: Sun Jun 23 15:15:52 2013
New Revision: 1495828

URL: http://svn.apache.org/r1495828
Log:
Updated prettify version, switched to jslint-maven-plugin.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/jspwiki-war/pom.xml
    incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/scripts/prettify.js
    incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/jspwiki.css
    incubator/jspwiki/trunk/pom.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1495828&r1=1495827&r2=1495828&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jun 23 15:15:52 2013
@@ -1,3 +1,13 @@
+2013-06-11  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.10.0-svn-11
+
+       * Switched jslint checking from yuicompressor-maven-plugin to jslint-maven-plugin

+         (former uses out-of-date jslint version from 2010, and latter allows more customization
+         options)
+
+       * Updated google-code-prettify's JS to latest 2013 version.
+
 2013-06-11  Harry Metske (metskem@apache.org)
 
        * 2.10.0-svn-10

Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1495828&r1=1495827&r2=1495828&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Sun Jun 23 15:15:52 2013
@@ -260,6 +260,50 @@
             </goals>
           </execution>
         </executions> 
+        <configuration>
+          <excludeResources>true</excludeResources>
+          <nosuffix>true</nosuffix>
+          <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
+          <!-- relying on jslint-maven-plugin instead, which allows
+               better customization -->
+          <jswarn>false</jswarn>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jslint-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>checkJSPWikiFiles</id>
+            <goals>
+              <goal>jslint</goal>
+            </goals>
+            <configuration>
+              <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
+              <failOnIssues>false</failOnIssues>
+              <excludes>
+                <exclude>prettify.js</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+          <!-- Some third party JSs have many multiple number of VARs per function
+               block, are outside of our control so suppressing such messages -->
+          <execution>
+            <id>checkThirdParty</id>
+            <goals>
+              <goal>jslint</goal>
+            </goals>
+            <configuration>
+              <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
+              <failOnIssues>false</failOnIssues>
+              <includes>
+                 <include>prettify.js</include>
+              </includes>
+              <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction>
+            </configuration>
+          </execution>
+        </executions> 
       </plugin>
       
       <plugin>

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1495828&r1=1495827&r2=1495828&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun Jun
23 15:15:52 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "10";
+    public static final String     BUILD         = "11";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message