Author: pferraro Date: 2009-04-27 14:23:13 -0400 (Mon, 27 Apr 2009) New Revision: 2412 Modified: trunk/mod_cluster/pom.xml Log: Refreshed dependencies. Misc pom cleanup. Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-27 16:18:42 UTC (rev 2411) +++ trunk/mod_cluster/pom.xml 2009-04-27 18:23:13 UTC (rev 2412) @@ -16,155 +16,19 @@ <scm> <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_c... - <developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbos... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tr... </scm> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <includes> - <include>**/*TestCase.java</include> - </includes> - <!-- Integration tests are in the "test" package; don't - run those during the normal surefire run --> - <excludes> - <exclude>**/test/**/*.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>sar</id> - <goals> - <goal>directory-inline</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>${project.artifactId}.sar</finalName> - <appendAssemblyId>false</appendAssemblyId> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <descriptors> - <descriptor>src/assembly/sar.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/jbossnative/tags/mod_cluster</t... - </configuration> - </plugin> - <!-- Dependency Plugin Configuration --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <!-- Unpack requisite build scripts --> - <execution> - <id>unpack-build-scripts</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - <!-- Copy jboss-test JAR --> - <execution> - <id>copy-jboss-test</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </artifactItem> - <artifactItem> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - </artifactItem> - <artifactItem> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - <stripVersion>true</stripVersion> - </configuration> - </execution> - </executions> - </plugin> - - <!-- JAR the Tests --> - <!-- TODO: Instead of passing of the build directory, this jar is passed to junit. Why? --> - <!-- BES: I copied this from ejb3/testsuite/pom.xml but am commenting it - out until I see a requirement for it - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - --> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - </plugin> - </plugins> - </pluginManagement> - </build> - <dependencies> <dependency> <groupId>org.jboss.cluster</groupId> <artifactId>jboss-ha-server-api</artifactId> - <version>1.1.0.GA</version> + <version>1.1.1.GA</version> </dependency> <dependency> <groupId>jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>2.1.2.GA</version> + <version>2.1.3.GA</version> </dependency> <dependency> <groupId>net.jcip</groupId> @@ -174,7 +38,7 @@ <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> - <version>2.0.4.GA</version> + <version>2.0.5.GA</version> </dependency> <!-- For installation in standalone JBoss Web or Tomcat --> @@ -201,35 +65,13 @@ <dependency> <groupId>org.jboss.test</groupId> <artifactId>jboss-test</artifactId> - <version>1.1.3.GA</version> + <version>1.1.4.GA</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <!-- Latest release still uses jboss-server-manager 1.0.0.GA, which still uses AS 5.0.0.CR2 --> - <exclusion> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - </exclusion> - </exclusions> </dependency> + <!-- jboss-as-server is optional dependency within jboss-server-manager, which is transitive dependency of jboss-test --> <dependency> <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - <version>1.0.1.GA</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> + <artifactId>jboss-as-server</artifactId> <version>5.0.1.GA</version> <scope>test</scope> </dependency> @@ -261,19 +103,126 @@ <scope>provided</scope> </dependency> </dependencies> - + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/*TestCase.java</include> + </includes> + <!-- Integration tests are in the "test" package; don't + run those during the normal surefire run --> + <excludes> + <exclude>**/test/**/*.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>sar</id> + <goals> + <goal>directory-inline</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>${project.artifactId}.sar</finalName> + <appendAssemblyId>false</appendAssemblyId> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>src/assembly/sar.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/jbossnative/tags/mod_cluster</t... + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> <profile> <id>integration-test</id> <activation> <activeByDefault>false</activeByDefault> - <property> - <name>maven.run.integration.tests</name> - <value>true</value> - </property> </activation> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <!-- Unpack requisite build scripts --> + <execution> + <id>unpack-build-scripts</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + <!-- Copy jboss-test JAR --> + <execution> + <id>copy-jboss-test</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + <stripVersion>true</stripVersion> + <excludeTransitive>false</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> + <!-- The individual integration tests are built and run using Ant --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -317,10 +266,6 @@ <id>dist</id> <activation> <activeByDefault>false</activeByDefault> - <property> - <name>maven.demo</name> - <value>true</value> - </property> </activation> <build> <plugins> @@ -344,7 +289,6 @@ <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> <overWriteIfNewer>true</overWriteIfNewer> <stripVersion>true</stripVersion> - <!-- <excludeTransitive>true</excludeTransitive> --> </configuration> </execution> </executions>