[jboss-cvs] JBossAS SVN: r70324 - in projects/jboss-reflect/trunk: src/tests/org/jboss/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 3 09:05:46 EST 2008
Author: adrian at jboss.org
Date: 2008-03-03 09:05:46 -0500 (Mon, 03 Mar 2008)
New Revision: 70324
Removed:
projects/jboss-reflect/trunk/pom-jdk14.xml
Modified:
projects/jboss-reflect/trunk/pom.xml
projects/jboss-reflect/trunk/src/tests/org/jboss/test/ContainerAllTestSuite.java
Log:
[JBREFLECT-11] - Fixup the jboss reflection build after moving of metadata repository
Deleted: projects/jboss-reflect/trunk/pom-jdk14.xml
===================================================================
--- projects/jboss-reflect/trunk/pom-jdk14.xml 2008-03-03 13:32:23 UTC (rev 70323)
+++ projects/jboss-reflect/trunk/pom-jdk14.xml 2008-03-03 14:05:46 UTC (rev 70324)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Notes for building and running tests.
- - Do to some limitations of the maven surefire plugin, the tests must
- - occur in a separate lifecycle from the build.
- -
- - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
- - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
- -->
-<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">
- <parent>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-microcontainer-jdk14</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-container-jdk14</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Container</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Container</description>
- <build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/**/NoJavassistAnnotationCreatorTestCase.java</exclude>
- </excludes>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-retro-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>weave-classes</id>
- <goals>
- <goal>weave</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>weave-test-classes</id>
- <goals>
- <goal>weave-tests</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <testClassesDirectory>${project.build.directory}/test-classes-jdk14</testClassesDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <!-- Skip the tests here because the jdk14 tests have
- - to be run in a separate profile.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
- - of the lifecycle. In other words it should be called directly from the command
- - line like this
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
- -->
- <profile>
- <id>run-jdk14-tests</id>
- <properties>
- <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-jdk14-property</id>
- <goals>
- <goal>enforce-once</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java14_home</property>
- <message>
- The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
- </message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${java14_home}/bin/java</jvm>
- <forkMode>always</forkMode>
- <skip>false</skip>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>true</testFailureIgnore>
- <useSystemClassLoader>true</useSystemClassLoader>
- <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>**/IsolatedClassLoaderUnitTestCase.java</exclude>
- <exclude>**/DelegateUnitTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- Do not add version information here, use ../build/pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi-jdk14</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- </dependency>
-
- <!-- Runtime dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-backport-concurrent</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.management</groupId>
- <artifactId>jmxri</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-retro</artifactId>
- <classifier>rt</classifier>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
Modified: projects/jboss-reflect/trunk/pom.xml
===================================================================
--- projects/jboss-reflect/trunk/pom.xml 2008-03-03 13:32:23 UTC (rev 70323)
+++ projects/jboss-reflect/trunk/pom.xml 2008-03-03 14:05:46 UTC (rev 70324)
@@ -1,17 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-container</artifactId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Microcontainer Container</name>
+ <name>JBoss Reflection</name>
<url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Container</description>
+ <description>JBoss Reflection</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-reflect/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-reflect/trunk/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-reflect/trunk/</url>
+ </scm>
+
<build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <testSourceDirectory>src/tests</testSourceDirectory>
+ <finalName>${artifactId}</finalName>
<resources>
<resource>
<directory>src/resources/main</directory>
@@ -30,33 +40,9 @@
<includes>
<include>org/jboss/test/**/*TestCase.java</include>
</includes>
- <excludes>
- <exclude>org/jboss/test/**/NoJavassistAnnotationCreatorTestCase.java</exclude>
- </excludes>
<useSystemClassLoader>true</useSystemClassLoader>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/classloading-spi.xml</descriptor>
- <descriptor>src/assembly/metadata-spi.xml</descriptor>
- <descriptor>src/assembly/metadata.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
</plugins>
</build>
<!-- Do not add version information here, use ../build/pom.xml instead -->
@@ -65,10 +51,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>javassist</artifactId>
+ <version>3.6.0.GA</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
+ <version>2.0.0.CR6</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -83,10 +71,12 @@
<dependency>
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
+ <version>2.2.3.GA</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -97,11 +87,13 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.3.GA</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <version>1.0.4.GA</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -116,19 +108,17 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
<dependency>
<groupId>jboss.profiler.jvmti</groupId>
<artifactId>jboss-profiler-jvmti</artifactId>
+ <version>1.0.0.CR5</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <version>2.0</version>
</dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
</dependencies>
</project>
Modified: projects/jboss-reflect/trunk/src/tests/org/jboss/test/ContainerAllTestSuite.java
===================================================================
--- projects/jboss-reflect/trunk/src/tests/org/jboss/test/ContainerAllTestSuite.java 2008-03-03 13:32:23 UTC (rev 70323)
+++ projects/jboss-reflect/trunk/src/tests/org/jboss/test/ContainerAllTestSuite.java 2008-03-03 14:05:46 UTC (rev 70324)
@@ -28,7 +28,6 @@
import org.jboss.test.classinfo.test.ClassInfoTestSuite;
import org.jboss.test.javabean.test.JavaBeanTestSuite;
import org.jboss.test.joinpoint.test.JoinpointTestSuite;
-import org.jboss.test.metadata.MetaDataAllTestSuite;
/**
* All Test Suite.
@@ -50,7 +49,6 @@
suite.addTest(ClassInfoTestSuite.suite());
suite.addTest(JoinpointTestSuite.suite());
suite.addTest(BeanInfoTestSuite.suite());
- suite.addTest(MetaDataAllTestSuite.suite());
suite.addTest(JavaBeanTestSuite.suite());
return suite;
More information about the jboss-cvs-commits
mailing list