geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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 @@
         <module>gshell-geronimo</module>
         <module>jmx-security</module>
         <!--<module>geronimo-boilerplate</module>-->
-        <module>karaf-framework</module>
+        <module>karaf-framework-aries-blueprint</module>
     </modules>
     
     <build>
@@ -78,10 +78,12 @@
                         <includeVersion>true</includeVersion>
                         <useTransitiveDependencies>true</useTransitiveDependencies>
                     </useMavenDependencies>
-                   <commonInstance>
+                    <warnOnDependencyChange>${warnOnDependencyChange}</warnOnDependencyChange>
+                    <logDependencyChanges>${logDependencyChanges}</logDependencyChanges>
+                    <overwriteChangedDependencies>${overwriteChangedDependencies}</overwriteChangedDependencies>
+                    <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
                             <source-repository>${PluginSrcRepoLocal}</source-repository>

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 @@
                         <includeVersion>true</includeVersion>
                         <useTransitiveDependencies>true</useTransitiveDependencies>
                     </useMavenDependencies>
+                    <warnOnDependencyChange>${warnOnDependencyChange}</warnOnDependencyChange>
+                    <logDependencyChanges>${logDependencyChanges}</logDependencyChanges>
+                    <overwriteChangedDependencies>${overwriteChangedDependencies}</overwriteChangedDependencies>
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
                             <source-repository>${PluginSrcRepoLocal}</source-repository>

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 @@
         <geronimoVersion>${version}</geronimoVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
+        <warnOnDependencyChange>false</warnOnDependencyChange>
+        <logDependencyChanges>false</logDependencyChanges>
+        <overwriteChangedDependencies>false</overwriteChangedDependencies>
 
         <!--
         FIXME: STOP using properties for dependency versions unless you absolutly need them,



Mime
View raw message