diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 190d45ca67d34e55ab33fca7bc2cfbed6e6e09df..eb321f467644ab535e73685da58da77b5954caf7 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -241,7 +241,7 @@ public abstract class AbstractProject,R extends A
* List of all {@link Trigger}s for this project.
*/
protected volatile DescribableList,TriggerDescriptor> triggers = new DescribableList,TriggerDescriptor>(this);
- private AtomicReferenceFieldUpdater triggersUpdater
+ private static final AtomicReferenceFieldUpdater triggersUpdater
= AtomicReferenceFieldUpdater.newUpdater(AbstractProject.class,DescribableList.class,"triggers");
/**
diff --git a/core/src/main/resources/lib/form/textarea/textarea.js b/core/src/main/resources/lib/form/textarea/textarea.js
index fa9d4aef86f6124c2eb110f74d513dc42774be50..b7db7aa38434e6e43b4bd79a67b256879762ddac 100644
--- a/core/src/main/resources/lib/form/textarea/textarea.js
+++ b/core/src/main/resources/lib/form/textarea/textarea.js
@@ -15,7 +15,7 @@ Behaviour.specify("TEXTAREA.codemirror", 'textarea', 0, function(e) {
scroller.style.height = h+"px";
// the form needs to be populated before the "Apply" button
- YAHOO.util.Event.on(e.up('form'), "jenkins:apply", function() {
+ Element.on(e.up('form'),"jenkins:apply", function() {
e.value = codemirror.getValue()
})
});
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 1f0739a3d435084415a9bb7d835750003032dcbe..89d4260afcadc2e54089b7e13ec33bef41b8c562 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.522) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi Sat, 06 Jul 2013 08:57:45 -0700
+
jenkins (1.521) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
diff --git a/pom.xml b/pom.xml
index caf1ff3c7ec212776b02512b88ffc686b26e4403..cb5c06803daf3c073beb6ec831a5d68062293f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@ THE SOFTWARE.
org.jenkins-ci.main
remoting
- 2.26
+ 2.28
diff --git a/test/src/test/java/hudson/triggers/TriggerStartTest.java b/test/src/test/java/hudson/triggers/TriggerStartTest.java
index 54b4bb22a6b5a36898de9048d516091198bb3a89..d5206eb20a288065e3acbef001f765bfaa3e8117 100644
--- a/test/src/test/java/hudson/triggers/TriggerStartTest.java
+++ b/test/src/test/java/hudson/triggers/TriggerStartTest.java
@@ -73,7 +73,7 @@ public class TriggerStartTest {
@Test public void updateByXmlCallsStartTrue() throws Exception {
FreeStyleProject p = j.createFreeStyleProject();
String xml = p.getConfigFile().asString();
- xml = xml.replace(" \n", triggersSection());
+ xml = xml.replace(" \n", triggersSection());
Source newXML = new StreamSource(new StringReader(xml));
p.updateByXml(newXML);
MockTrigger t = p.getTrigger(MockTrigger.class);