You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/07/12 18:50:26 UTC

[1/2] wicket git commit: Update Node.js and NPM.js

Repository: wicket
Updated Branches:
  refs/heads/master 812bf99b4 -> b2f715421


Update Node.js and NPM.js


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b2f71542
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b2f71542
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b2f71542

Branch: refs/heads/master
Commit: b2f71542120eb1f84cec3a64aa3bab8595342fa3
Parents: 0ebaad0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jul 12 20:49:29 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jul 12 20:50:19 2016 +0200

----------------------------------------------------------------------
 testing/wicket-js-tests/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/b2f71542/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 779d99f..6224a91 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -72,8 +72,8 @@
 								</goals>
 								<phase>generate-resources</phase>
 								<configuration>
-									<npmVersion>3.9.6</npmVersion>
-									<nodeVersion>v6.2.2</nodeVersion>
+									<npmVersion>3.10.5</npmVersion>
+									<nodeVersion>v6.3.0</nodeVersion>
 								</configuration>
 							</execution>
 							<execution>


[2/2] wicket git commit: Make NestedStringResourceLoader's member fields final

Posted by mg...@apache.org.
Make NestedStringResourceLoader's member fields final


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0ebaad05
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0ebaad05
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0ebaad05

Branch: refs/heads/master
Commit: 0ebaad05fc9d28bde50e7839a3d642c195dda91b
Parents: 812bf99
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jul 12 20:37:28 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jul 12 20:50:19 2016 +0200

----------------------------------------------------------------------
 .../wicket/resource/loader/NestedStringResourceLoader.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/0ebaad05/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java
index e47a8be..d32ebad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java
@@ -50,11 +50,11 @@ import org.apache.wicket.util.string.AppendingStringBuffer;
  */
 public class NestedStringResourceLoader implements IStringResourceLoader
 {
-	private Pattern pattern;
+	private final Pattern pattern;
 
-	private List<IStringResourceLoader> loaders;
+	private final List<IStringResourceLoader> loaders;
 
-	private ResourceSettings resourceSettings;
+	private final ResourceSettings resourceSettings;
 
 	/**
 	 * Creates a nested string resource loader