[picocontainer-scm] [5835] java/2.x/trunk: PICO-395 fix - flip from ArrayList to LinkedHashSet

paul-yCVjj/[email protected] Tue, 7 Oct 2014 21:27:32 -0500 (CDT)
Newsgroups gmane.comp.java.picocontainer.cvs
Message-ID <[email protected]>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[5835] java/2.x/trunk: PICO-395 fix - flip from ArrayList to LinkedHashSet</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.codehaus.org/changelog/picocontainer/?cs=5835">5835</a></dd>
<dt>Author</dt> <dd>paul</dd>
<dt>Date</dt> <dd>2014-10-07 21:27:31 -0500 (Tue, 07 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>PICO-395 fix - flip from ArrayList to LinkedHashSet</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#java2xtrunkbooterpomxml">java/2.x/trunk/booter/pom.xml</a></li>
<li><a href="#java2xtrunkjettycorepomxml">java/2.x/trunk/jetty/core/pom.xml</a></li>
<li><a href="#java2xtrunkjettygroovypomxml">java/2.x/trunk/jetty/groovy/pom.xml</a></li>
<li><a href="#java2xtrunkjettypomxml">java/2.x/trunk/jetty/pom.xml</a></li>
<li><a href="#java2xtrunkloggingpomxml">java/2.x/trunk/logging/pom.xml</a></li>
<li><a href="#java2xtrunkpersistencepomxml">java/2.x/trunk/persistence/pom.xml</a></li>
<li><a href="#java2xtrunkpicocontainerpomxml">java/2.x/trunk/pico/container/pom.xml</a></li>
<li><a href="#java2xtrunkpicocontainersrcjavaorgpicocontainerDefaultPicoContainerjava">java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java</a></li>
<li><a href="#java2xtrunkpicocontainersrctestorgpicocontainerinjectorsSetterInjectorTestCasejava">java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java</a></li>
<li><a href="#java2xtrunkpicopomxml">java/2.x/trunk/pico/pom.xml</a></li>
<li><a href="#java2xtrunkpomxml">java/2.x/trunk/pom.xml</a></li>
<li><a href="#java2xtrunkscriptpomxml">java/2.x/trunk/script/pom.xml</a></li>
<li><a href="#java2xtrunkwebpomxml">java/2.x/trunk/web/pom.xml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="java2xtrunkbooterpomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/booter/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/booter/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/booter/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">       &lt;plugin&gt;
</span><span class="cx">         &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">         &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-        &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+        &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">         &lt;configuration&gt;
</span><span class="cx">           &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">           &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkjettycorepomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/jetty/core/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/jetty/core/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/jetty/core/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">         &lt;plugin&gt;
</span><span class="cx">           &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-          &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+          &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">           &lt;configuration&gt;
</span><span class="cx">             &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">             &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkjettygroovypomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/jetty/groovy/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/jetty/groovy/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/jetty/groovy/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">     &lt;dependency&gt;
</span><span class="cx">       &lt;groupId&gt;org.picocontainer.jetty&lt;/groupId&gt;
</span><span class="cx">       &lt;artifactId&gt;picocontainer-jetty-core&lt;/artifactId&gt;
</span><del>-      &lt;version&gt;${project.version}&lt;/version&gt;
</del><ins>+      &lt;version&gt;${pom.version}&lt;/version&gt;
</ins><span class="cx">     &lt;/dependency&gt;
</span><span class="cx">     &lt;dependency&gt;
</span><span class="cx">       &lt;groupId&gt;org.picocontainer.script&lt;/groupId&gt;
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">         &lt;plugin&gt;
</span><span class="cx">           &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-          &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+          &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">           &lt;configuration&gt;
</span><span class="cx">             &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">             &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkjettypomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/jetty/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/jetty/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/jetty/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">         &lt;plugin&gt;
</span><span class="cx">           &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-          &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+          &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">           &lt;configuration&gt;
</span><span class="cx">             &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">             &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkloggingpomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/logging/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/logging/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/logging/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">         &lt;plugin&gt;
</span><span class="cx">           &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-          &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+          &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">           &lt;configuration&gt;
</span><span class="cx">             &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">             &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkpersistencepomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/persistence/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/persistence/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/persistence/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">         &lt;plugin&gt;
</span><span class="cx">           &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-          &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+          &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">           &lt;configuration&gt;
</span><span class="cx">             &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">             &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkpicocontainerpomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/pico/container/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/pico/container/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/pico/container/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">             &lt;plugin&gt;
</span><span class="cx">                 &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">                 &lt;artifactId&gt;maven-shade-plugin&lt;/artifactId&gt;
</span><del>-                &lt;version&gt;2.0&lt;/version&gt;
</del><ins>+                &lt;version&gt;2.1&lt;/version&gt;
</ins><span class="cx">                 &lt;executions&gt;
</span><span class="cx">                     &lt;execution&gt;
</span><span class="cx">                         &lt;phase&gt;package&lt;/phase&gt;
</span></span></pre></div>
<a id="java2xtrunkpicocontainersrcjavaorgpicocontainerDefaultPicoContainerjava"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> import java.util.Enumeration;
</span><span class="cx"> import java.util.HashMap;
</span><span class="cx"> import java.util.HashSet;
</span><ins>+import java.util.LinkedHashSet;
</ins><span class="cx"> import java.util.List;
</span><span class="cx"> import java.util.Map;
</span><span class="cx"> import java.util.Properties;
</span><span class="lines">@@ -130,7 +131,7 @@
</span><span class="cx"> 	private final Map&lt;Object, ComponentAdapter&lt;?&gt;&gt; componentKeyToAdapterCache = new HashMap&lt;Object, ComponentAdapter&lt;?&gt; &gt;();
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-	private final List&lt;ComponentAdapter&lt;?&gt;&gt; componentAdapters = new ArrayList&lt;ComponentAdapter&lt;?&gt;&gt;();
</del><ins>+	private final Set&lt;ComponentAdapter&lt;?&gt;&gt; componentAdapters = new LinkedHashSet&lt;ComponentAdapter&lt;?&gt;&gt;();
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 	protected final List&lt;ComponentAdapter&lt;?&gt;&gt; orderedComponentAdapters = new ArrayList&lt;ComponentAdapter&lt;?&gt;&gt;();
</span><span class="lines">@@ -269,7 +270,7 @@
</span><span class="cx"> 
</span><span class="cx">     /** {@inheritDoc} **/
</span><span class="cx">     public Collection&lt;ComponentAdapter&lt;?&gt;&gt; getComponentAdapters() {
</span><del>-        return Collections.unmodifiableList(getModifiableComponentAdapterList());
</del><ins>+        return Collections.unmodifiableSet(getModifiableComponentAdapterList());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -1083,7 +1084,7 @@
</span><span class="cx"> 	/**
</span><span class="cx"> 	 * @return the componentAdapters
</span><span class="cx"> 	 */
</span><del>-	protected List&lt;ComponentAdapter&lt;?&gt;&gt; getModifiableComponentAdapterList() {
</del><ins>+	protected Set&lt;ComponentAdapter&lt;?&gt;&gt; getModifiableComponentAdapterList() {
</ins><span class="cx"> 		return componentAdapters;
</span><span class="cx"> 	}
</span><span class="cx"> 
</span></span></pre></div>
<a id="java2xtrunkpicocontainersrctestorgpicocontainerinjectorsSetterInjectorTestCasejava"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -9,15 +9,6 @@
</span><span class="cx">  *****************************************************************************/
</span><span class="cx"> package org.picocontainer.injectors;
</span><span class="cx"> 
</span><del>-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.picocontainer.parameters.ComponentParameter.DEFAULT;
-
-import java.util.ArrayList;
-import java.util.List;
-
</del><span class="cx"> import org.jmock.Expectations;
</span><span class="cx"> import org.jmock.Mockery;
</span><span class="cx"> import org.jmock.api.Invocation;
</span><span class="lines">@@ -40,7 +31,17 @@
</span><span class="cx"> import org.picocontainer.testmodel.PersonBean;
</span><span class="cx"> import org.picocontainer.testmodel.PurseBean;
</span><span class="cx"> 
</span><ins>+import java.util.ArrayList;
+import java.util.List;
</ins><span class="cx"> 
</span><ins>+import static org.hamcrest.text.StringContains.containsString;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.picocontainer.parameters.ComponentParameter.DEFAULT;
+
+
</ins><span class="cx"> @SuppressWarnings(&quot;serial&quot;)
</span><span class="cx"> public class SetterInjectorTestCase
</span><span class="cx">     extends AbstractComponentAdapterTest {
</span><span class="lines">@@ -275,9 +276,9 @@
</span><span class="cx">             aAdapter.getComponentInstance(pico, ComponentAdapter.NOTHING.class);
</span><span class="cx">         } catch (AbstractInjector.UnsatisfiableDependenciesException e) {
</span><span class="cx">             String message = e.getMessage().replace(&quot;org.picocontainer.injectors.SetterInjectorTestCase$&quot;, &quot;&quot;);
</span><del>-            message = message.replace(&quot;interface java.util.List, class java.lang.String&quot;, &quot;class java.lang.String, interface java.util.List&quot;);
-            assertEquals(&quot;A has unsatisfied dependencies [class java.lang.String, interface java.util.List] for members [public void A.setString(java.lang.String), public void A.setList(java.util.List)] from parent:2&lt;|&quot;,
-                    message);
</del><ins>+            assertThat(message, containsString(&quot;A has unsatisfied dependencies [class java.lang.String, interface java.util.List] for members [&quot;));
+            assertThat(message, containsString(&quot;public void A.setList(java.util.List)&quot;));
+            assertThat(message, containsString(&quot;public void A.setString(java.lang.String)&quot;));
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="java2xtrunkpicopomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/pico/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/pico/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/pico/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> 			&lt;dependency&gt;
</span><span class="cx"> 				&lt;groupId&gt;${project.groupId}&lt;/groupId&gt;
</span><span class="cx"> 				&lt;artifactId&gt;picocontainer&lt;/artifactId&gt;
</span><del>-				&lt;version&gt;${project.version}&lt;/version&gt;
</del><ins>+				&lt;version&gt;${pom.version}&lt;/version&gt;
</ins><span class="cx"> 			&lt;/dependency&gt;
</span><span class="cx"> 			&lt;dependency&gt;
</span><span class="cx"> 				&lt;groupId&gt;${project.groupId}&lt;/groupId&gt;
</span><span class="cx"> 				&lt;artifactId&gt;picocontainer-tck&lt;/artifactId&gt;
</span><del>-				&lt;version&gt;${project.version}&lt;/version&gt;
</del><ins>+				&lt;version&gt;${pom.version}&lt;/version&gt;
</ins><span class="cx"> 				&lt;scope&gt;test&lt;/scope&gt;
</span><span class="cx"> 			&lt;/dependency&gt;
</span><span class="cx"> 			&lt;!-- For JavaEE5 annotations --&gt;
</span><span class="lines">@@ -205,14 +205,14 @@
</span><span class="cx"> 				&lt;plugin&gt;
</span><span class="cx"> 					&lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx"> 					&lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-					&lt;version&gt;2.3.1&lt;/version&gt;
</del><ins>+					&lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx"> 					&lt;configuration&gt;
</span><span class="cx"> 						&lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx"> 						&lt;target&gt;1.5&lt;/target&gt;
</span><span class="cx"> 						&lt;encoding&gt;UTF-8&lt;/encoding&gt;
</span><span class="cx"> 						&lt;optimize&gt;false&lt;/optimize&gt;
</span><span class="cx"> 						&lt;debug&gt;true&lt;/debug&gt;
</span><del>-						&lt;showDeprecation&gt;true&lt;/showDeprecation&gt;
</del><ins>+						&lt;showDeprecation&gt;false&lt;/showDeprecation&gt;
</ins><span class="cx"> 					&lt;/configuration&gt;
</span><span class="cx"> 				&lt;/plugin&gt;
</span><span class="cx"> 				&lt;plugin&gt;
</span></span></pre></div>
<a id="java2xtrunkpomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">         &lt;module&gt;site-resources&lt;/module&gt;
</span><span class="cx"> 	&lt;module&gt;logging&lt;/module&gt;
</span><span class="cx"> 	&lt;module&gt;pico&lt;/module&gt;
</span><del>-        &lt;module&gt;persistence&lt;/module&gt;
</del><ins>+        &lt;!--module&gt;persistence&lt;/module--&gt;
</ins><span class="cx">         &lt;module&gt;script&lt;/module&gt;
</span><span class="cx">         &lt;module&gt;web&lt;/module&gt;
</span><span class="cx"> 	&lt;module&gt;jetty&lt;/module&gt;
</span></span></pre></div>
<a id="java2xtrunkscriptpomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/script/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/script/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/script/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> 				&lt;plugin&gt;
</span><span class="cx"> 					&lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx"> 					&lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-					&lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+					&lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx"> 					&lt;configuration&gt;
</span><span class="cx"> 						&lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx"> 						&lt;target&gt;1.5&lt;/target&gt;
</span></span></pre></div>
<a id="java2xtrunkwebpomxml"></a>
<div class="modfile"><h4>Modified: java/2.x/trunk/web/pom.xml (5834 => 5835)</h4>
<pre class="diff"><span>
<span class="info">--- java/2.x/trunk/web/pom.xml	2012-10-18 15:34:01 UTC (rev 5834)
+++ java/2.x/trunk/web/pom.xml	2014-10-08 02:27:31 UTC (rev 5835)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">         &lt;plugin&gt;
</span><span class="cx">           &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
</span><span class="cx">           &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;
</span><del>-          &lt;version&gt;2.0.2&lt;/version&gt;
</del><ins>+          &lt;version&gt;2.5.1&lt;/version&gt;
</ins><span class="cx">           &lt;configuration&gt;
</span><span class="cx">             &lt;source&gt;1.5&lt;/source&gt;
</span><span class="cx">             &lt;target&gt;1.5&lt;/target&gt;
</span></span></pre>
</div>
</div>

</body>
</html>

<hr/>
<p>
To unsubscribe from this list please visit:
</p>
<p>
    <a href="http://xircles.codehaus.org/manage_email">http://xircles.codehaus.org/manage_email</a>
</p>