diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-02-27 13:27:53 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-02-27 13:27:53 +0000 |
| commit | de49c164ad155f90d3d776372bbc1425afb6431d (patch) | |
| tree | 7b93b06fd77c14a9993a244aab7140219d7ec33c /qpid/java/systests | |
| parent | 793c824fa24cb0c90b205326d4199d6558944eda (diff) | |
| download | qpid-python-de49c164ad155f90d3d776372bbc1425afb6431d.tar.gz | |
QPID-5048: Maven enahancements to restructure POM hierarchy and improve build
Patch supplied by Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1572552 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests')
| -rw-r--r-- | qpid/java/systests/pom.xml | 157 |
1 files changed, 3 insertions, 154 deletions
diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml index a556841240..7107730255 100644 --- a/qpid/java/systests/pom.xml +++ b/qpid/java/systests/pom.xml @@ -20,8 +20,9 @@ <parent> <groupId>org.apache.qpid</groupId> - <artifactId>qpid-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>qpid-systests-parent</artifactId> + <version>0.28-SNAPSHOT</version> + <relativePath>../qpid-systests-parent/pom.xml</relativePath> </parent> <artifactId>qpid-systests</artifactId> @@ -29,28 +30,7 @@ <name>Qpid System Tests</name> <description>System testing configuration, code and tests</description> - <properties> - <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir> - <!-- test properties --> - <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home> - <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-output</qpid.home.qbtc.output> - </properties> - <dependencies> - <!-- general test deps --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit-version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito-version}</version> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.apache.qpid</groupId> @@ -58,16 +38,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <!-- client deps --> <dependency> <groupId>org.apache.qpid</groupId> @@ -215,126 +185,5 @@ </dependency> </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java/</exclude> - </excludes> - </resource> - </resources> - - <testSourceDirectory>src/main/java</testSourceDirectory> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <!--version specified in parent pluginManagement --> - <configuration> - <workingDirectory>${basedir}/..</workingDirectory> - <!-- Skip the default test phase, bind to the - integration-test phase below instead --> - <skip>true</skip> - <systemPropertyVariables> - <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file> - </systemPropertyVariables> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <!--version specified in parent pluginManagement --> - <executions> - <!-- copy the systests config files into the ${qpid.home}/etc - directory where the tests expect them --> - <execution> - <id>copy-systests-etc-resources</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${qpid.home}</outputDirectory> - <resources> - <resource> - <directory>${basedir}</directory> - <includes> - <include>etc/</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <!-- copy the ../test-profiles directory into ${qpid.home}/.. - directory where the tests expect it --> - <execution> - <id>copy-test-profile-resources</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${qpid.home}/..</outputDirectory> - <resources> - <resource> - <directory>${basedir}/..</directory> - <includes> - <include>test-profiles/</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <!--version specified in parent pluginManagement --> - <executions> - <execution> - <id>extract-broker-distribution</id> - <phase>pre-integration-test</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputAbsoluteArtifactFilename>false</outputAbsoluteArtifactFilename> - <outputDirectory>${project.build.directory}</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-broker</artifactId> - <version>${project.version}</version> - <classifier>bin</classifier> - <type>tar.gz</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> |