hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r411886 - in /jakarta/hivemind/trunk: examples/pom.xml framework/pom.xml jmx/pom.xml library/pom.xml pom-common/pom.xml
Date Mon, 05 Jun 2006 18:37:57 GMT
Author: hlship
Date: Mon Jun  5 11:37:56 2006
New Revision: 411886

URL: http://svn.apache.org/viewvc?rev=411886&view=rev
Log:
Consolidate more plugin and dependency management information into the common POM

Modified:
    jakarta/hivemind/trunk/examples/pom.xml
    jakarta/hivemind/trunk/framework/pom.xml
    jakarta/hivemind/trunk/jmx/pom.xml
    jakarta/hivemind/trunk/library/pom.xml
    jakarta/hivemind/trunk/pom-common/pom.xml

Modified: jakarta/hivemind/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/hivemind/trunk/examples/pom.xml?rev=411886&r1=411885&r2=411886&view=diff
==============================================================================
--- jakarta/hivemind/trunk/examples/pom.xml (original)
+++ jakarta/hivemind/trunk/examples/pom.xml Mon Jun  5 11:37:56 2006
@@ -17,38 +17,18 @@
         <dependency>
             <groupId>hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.3</source>
-                            <target>1.5</target>
-                            <optimize>true</optimize>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.5</source>
-                            <target>1.5</target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: jakarta/hivemind/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/hivemind/trunk/framework/pom.xml?rev=411886&r1=411885&r2=411886&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/pom.xml (original)
+++ jakarta/hivemind/trunk/framework/pom.xml Mon Jun  5 11:37:56 2006
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>hivemind</groupId>
@@ -17,17 +18,14 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>jboss</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.0</version>
         </dependency>
         <dependency>
             <groupId>oro</groupId>
             <artifactId>oro</artifactId>
-            <version>2.0.6</version>
         </dependency>
         <!-- PROVIDED -->
         <dependency>
@@ -37,99 +35,44 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Because the core framework includes some JUnit base classes that
-             use easymock (and easymockclassextension), those dependencies
-             are marked as "provided". Normally, that means "provided by the container",
-             meaning a runtime dependency provided by a servlet container or
-             application server, but we're retrocanonicalizing :-) that to
-             mean "provided by the using project, if needed" -->
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.6.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <!-- TEST -->
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-full</artifactId>
-            <version>2.0.1</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
-            <version>1.3.02</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.3</source>
-                            <target>1.5</target>
-                            <optimize>true</optimize>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.5</source>
-                            <target>1.5</target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-surefire-plugin</artifactId>
-							<configuration>
-								<includes>
-									<include>**/Test*.java</include>
-								</includes>
-								<excludes>
-									<exclude>**/FrameworkTestCase.java</exclude>
-									<exclude>**/AbstractMethodTestCase.java</exclude>
-								</excludes>
-							</configuration>
-						</plugin>
-			  </plugins>
-    </build>
     <reporting>
         <plugins>
             <plugin>

Modified: jakarta/hivemind/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/hivemind/trunk/jmx/pom.xml?rev=411886&r1=411885&r2=411886&view=diff
==============================================================================
--- jakarta/hivemind/trunk/jmx/pom.xml (original)
+++ jakarta/hivemind/trunk/jmx/pom.xml Mon Jun  5 11:37:56 2006
@@ -17,12 +17,18 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
         </dependency>
         <!-- Here, again, we're using a scope of provided to mean
             "optional at runtime" -->
@@ -44,45 +50,5 @@
             <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.3</source>
-                            <target>1.5</target>
-                            <optimize>true</optimize>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.5</source>
-                            <target>1.5</target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-surefire-plugin</artifactId>
-							<configuration>
-								<includes>
-									<include>**/Test*.java</include>
-								</includes>
-							</configuration>
-						</plugin>
-        </plugins>
-    </build>
+    </dependencies>
 </project>

Modified: jakarta/hivemind/trunk/library/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/hivemind/trunk/library/pom.xml?rev=411886&r1=411885&r2=411886&view=diff
==============================================================================
--- jakarta/hivemind/trunk/library/pom.xml (original)
+++ jakarta/hivemind/trunk/library/pom.xml Mon Jun  5 11:37:56 2006
@@ -17,11 +17,23 @@
         <dependency>
             <groupId>hivemind</groupId>
             <artifactId>hivemind</artifactId>
-            <version>1.2.1</version>
         </dependency>
         <!-- Here, again, we're using a scope of provided to mean
              "optional at runtime" -->
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>           
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
             <groupId>groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>1.0-jsr-03</version>
@@ -46,44 +58,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.3</source>
-                            <target>1.5</target>
-                            <optimize>true</optimize>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                        <configuration>
-                            <source>1.5</source>
-                            <target>1.5</target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-surefire-plugin</artifactId>
-							<configuration>
-								<includes>
-									<include>**/Test*.java</include>
-								</includes>
-							</configuration>
-						</plugin>
-        </plugins>
-    </build>
 </project>

Modified: jakarta/hivemind/trunk/pom-common/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/hivemind/trunk/pom-common/pom.xml?rev=411886&r1=411885&r2=411886&view=diff
==============================================================================
--- jakarta/hivemind/trunk/pom-common/pom.xml (original)
+++ jakarta/hivemind/trunk/pom-common/pom.xml Mon Jun  5 11:37:56 2006
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>hivemind</groupId>
@@ -26,26 +27,77 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
-    <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.8</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>1.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>easymock</groupId>
+                <artifactId>easymockclassextension</artifactId>
+                <version>1.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.6.2</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-full</artifactId>
+                <version>2.0.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>1.3.02</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>jboss</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>oro</groupId>
+                <artifactId>oro</artifactId>
+                <version>2.0.6</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>hivemind</groupId>
+                <artifactId>hivemind</artifactId>
+                <version>1.2.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <sourceDirectory>src/java</sourceDirectory>
         <resources>
@@ -73,50 +125,84 @@
             </testResource>
         </testResources>
         <plugins>
-
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
                     <locales>en</locales>
                 </configuration>
             </plugin>
-            <!-- This should cause the assembly:assembly goal to be triggered
-                to create a source distro whenever we package the jar file. -->
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-                            <descriptorId>src</descriptorId>
-                        </configuration>
-                        <goals>
-                            <goal>assembly</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-            <!-- Here, we want to package a source jar so that it can eventually be
-                packaged into the remote repository with the binary jar. -->
-            <!--
-            <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
-        -->
-        </plugins>
+        <!-- Set defaults across other modules. -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>compile</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <source>1.3</source>
+                                <target>1.5</target>
+                                <optimize>true</optimize>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>test-compile</id>
+                            <goals>
+                                <goal>testCompile</goal>
+                            </goals>
+                            <configuration>
+                                <source>1.5</source>
+                                <target>1.5</target>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <includes>
+                            <include>**/Test*.java</include>
+                        </includes>
+                        <excludes>
+                            <exclude>**/**$*</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <configuration>
+                                <descriptorId>src</descriptorId>
+                            </configuration>
+                            <goals>
+                                <goal>assembly</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <extensions>
             <!-- Needed to support FTP deployment. -->
             <extension>
@@ -157,7 +243,7 @@
     </distributionManagement>
     <organization>
         <name>Apache Software Foundation</name>
-        <url>http://jakarta.apache.org/</url>
+        <url>http://www.apache.org/</url>
     </organization>
     <scm>
         <connection>svn:http://svn.apache.org/repos/asf/jakarta/hivemind/${pom.artifactId}/trunk</connection>



---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message