You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2010/10/04 22:09:20 UTC
svn commit: r1004385 - in /commons/proper/exec/trunk: pom.xml
src/assembly/test.xml src/test/bin/testme.bat src/test/bin/testme.dcl
src/test/bin/testme.sh
Author: niallp
Date: Mon Oct 4 20:09:20 2010
New Revision: 1004385
URL: http://svn.apache.org/viewvc?rev=1004385&view=rev
Log:
EXEC-48 Add assembly to create the Exec test distribution to the Maven build
Added:
commons/proper/exec/trunk/src/assembly/test.xml (with props)
Modified:
commons/proper/exec/trunk/pom.xml
commons/proper/exec/trunk/src/test/bin/testme.bat
commons/proper/exec/trunk/src/test/bin/testme.dcl
commons/proper/exec/trunk/src/test/bin/testme.sh
Modified: commons/proper/exec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=1004385&r1=1004384&r2=1004385&view=diff
==============================================================================
--- commons/proper/exec/trunk/pom.xml (original)
+++ commons/proper/exec/trunk/pom.xml Mon Oct 4 20:09:20 2010
@@ -39,7 +39,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<!-- Must agree with the version in build.xml -->
- <version>3.8.2</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -203,6 +203,50 @@
</site>
</distributionManagement>
</profile>
+ <profile>
+ <id>tests</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/test.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<properties>
Added: commons/proper/exec/trunk/src/assembly/test.xml
URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/assembly/test.xml?rev=1004385&view=auto
==============================================================================
--- commons/proper/exec/trunk/src/assembly/test.xml (added)
+++ commons/proper/exec/trunk/src/assembly/test.xml Mon Oct 4 20:09:20 2010
@@ -0,0 +1,68 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+ <id>test</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory></baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/bin</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>testme.bat</include>
+ <include>testme.dcl</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>src/test/scripts</directory>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>${artifact.artifactId}-${artifact.version}.jar</include>
+ <include>${artifact.artifactId}-${artifact.version}-tests.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>src/test/bin/testme.sh</source>
+ <fileMode>775</fileMode>
+ <filtered>true</filtered>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>junit:junit</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: commons/proper/exec/trunk/src/assembly/test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/exec/trunk/src/assembly/test.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/proper/exec/trunk/src/test/bin/testme.bat
URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/bin/testme.bat?rev=1004385&r1=1004384&r2=1004385&view=diff
==============================================================================
--- commons/proper/exec/trunk/src/test/bin/testme.bat (original)
+++ commons/proper/exec/trunk/src/test/bin/testme.bat Mon Oct 4 20:09:20 2010
@@ -17,4 +17,4 @@ REM limitations under the License.
REM
mkdir target
-%JAVA_HOME%\bin\java -cp .\lib\junit-3.8.1.jar;.\lib\commons-exec-test-@VERSION@.jar;.\lib\commons-exec-@VERSION@.jar org.apache.commons.exec.TestRunner
\ No newline at end of file
+"%JAVA_HOME%\bin\java" -cp .\lib\junit-3.8.1.jar;.\lib\commons-exec-${project.version}-tests.jar;.\lib\commons-exec-${project.version}.jar org.apache.commons.exec.TestRunner
\ No newline at end of file
Modified: commons/proper/exec/trunk/src/test/bin/testme.dcl
URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/bin/testme.dcl?rev=1004385&r1=1004384&r2=1004385&view=diff
==============================================================================
--- commons/proper/exec/trunk/src/test/bin/testme.dcl (original)
+++ commons/proper/exec/trunk/src/test/bin/testme.dcl Mon Oct 4 20:09:20 2010
@@ -21,5 +21,5 @@ $! Run the test suite
$!
$ create/directory [.target]
$ java "-Dorg.apache.commons.exec.lenient=false" "-Dorg.apache.commons.exec.debug=false" -
- -cp "./lib/junit-3.8.1.jar:./lib/commons-exec-test-@VERSION@.jar:./lib/commons-exec-@VERSION@.jar" -
+ -cp "./lib/junit-3.8.1.jar:./lib/commons-exec-${project.version}-tests.jar:./lib/commons-exec-${project.version}.jar" -
"org.apache.commons.exec.TestRunner"
\ No newline at end of file
Modified: commons/proper/exec/trunk/src/test/bin/testme.sh
URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/bin/testme.sh?rev=1004385&r1=1004384&r2=1004385&view=diff
==============================================================================
--- commons/proper/exec/trunk/src/test/bin/testme.sh (original)
+++ commons/proper/exec/trunk/src/test/bin/testme.sh Mon Oct 4 20:09:20 2010
@@ -19,4 +19,4 @@
chmod ug+x ./src/test/scripts/*.sh
mkdir target
-$JAVA_HOME/bin/java -Dorg.apache.commons.exec.lenient=false -Dorg.apache.commons.exec.debug=false -cp ./lib/junit-3.8.1.jar:./lib/commons-exec-test-@VERSION@.jar:./lib/commons-exec-@VERSION@.jar org.apache.commons.exec.TestRunner
\ No newline at end of file
+$JAVA_HOME/bin/java -Dorg.apache.commons.exec.lenient=false -Dorg.apache.commons.exec.debug=false -cp ./lib/junit-3.8.1.jar:./lib/commons-exec-${project.version}-tests.jar:./lib/commons-exec-${project.version}.jar org.apache.commons.exec.TestRunner
\ No newline at end of file