Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 7574 invoked from network); 18 Feb 2010 23:58:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2010 23:58:05 -0000 Received: (qmail 9848 invoked by uid 500); 18 Feb 2010 23:58:05 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 9782 invoked by uid 500); 18 Feb 2010 23:58:05 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 9773 invoked by uid 99); 18 Feb 2010 23:58:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 23:58:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 23:57:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E26E238897A; Thu, 18 Feb 2010 23:57:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r911654 - in /geronimo/server/trunk: framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java framework/configs/pom.xml plugins/pom.xml pom.xml Date: Thu, 18 Feb 2010 23:57:35 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100218235736.0E26E238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Feb 18 23:57:35 2010 New Revision: 911654 URL: http://svn.apache.org/viewvc?rev=911654&view=rev Log: GERONIMO-5149 more options for dependency change checking Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java geronimo/server/trunk/framework/configs/pom.xml geronimo/server/trunk/plugins/pom.xml geronimo/server/trunk/pom.xml Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=911654&r1=911653&r2=911654&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original) +++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Thu Feb 18 23:57:35 2010 @@ -68,6 +68,18 @@ private boolean warnOnDependencyChange; /** + * Whether to show changed dependencies in log + * @parameter + */ + private boolean logDependencyChanges; + + /** + * Whether to overwrite dependencies.xml if it has changed + * @parameter + */ + private boolean overwriteChangedDependencies; + + /** * Location of existing dependency file. * * @parameter expression="${basedir}/src/main/history/dependencies.xml" @@ -127,6 +139,9 @@ } if (!dependencies.isEmpty() || !removed.getDependency().isEmpty()) { saveDependencyChanges(dependencies, removed); + if (overwriteChangedDependencies) { + writeDependencies(toPluginArtifactType(dependencies), dependencyFile); + } } } finally { in.close(); @@ -156,9 +171,15 @@ out.write("Dependencies have changed:\n"); if (!added.getDependency().isEmpty()) { out.write("\tAdded dependencies are saved here: " + addedFile.getAbsolutePath() + "\n"); + if (logDependencyChanges) { + PluginXmlUtil.writePluginArtifact(added, out); + } } if (!removed.getDependency().isEmpty()) { out.write("\tRemoved dependencies are saved here: " + removedFile.getAbsolutePath() + "\n"); + if (logDependencyChanges) { + PluginXmlUtil.writePluginArtifact(removed, out); + } } out.write("\tTree listing is saved here: " + treeListing.getAbsolutePath() + "\n"); out.write("Delete " + dependencyFile.getAbsolutePath() Modified: geronimo/server/trunk/framework/configs/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=911654&r1=911653&r2=911654&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/pom.xml (original) +++ geronimo/server/trunk/framework/configs/pom.xml Thu Feb 18 23:57:35 2010 @@ -54,7 +54,7 @@ gshell-geronimo jmx-security - karaf-framework + karaf-framework-aries-blueprint @@ -78,10 +78,12 @@ true true - + ${warnOnDependencyChange} + ${logDependencyChanges} + ${overwriteChangedDependencies} + ${geronimoVersion} - 1.5 1.6 ${PluginSrcRepoLocal} Modified: geronimo/server/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=911654&r1=911653&r2=911654&view=diff ============================================================================== --- geronimo/server/trunk/plugins/pom.xml (original) +++ geronimo/server/trunk/plugins/pom.xml Thu Feb 18 23:57:35 2010 @@ -78,10 +78,12 @@ true true + ${warnOnDependencyChange} + ${logDependencyChanges} + ${overwriteChangedDependencies} ${geronimoVersion} - 1.5 1.6 ${PluginSrcRepoLocal} Modified: geronimo/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=911654&r1=911653&r2=911654&view=diff ============================================================================== --- geronimo/server/trunk/pom.xml (original) +++ geronimo/server/trunk/pom.xml Thu Feb 18 23:57:35 2010 @@ -58,6 +58,9 @@ ${version} 1.2 + false + false + false