Author: sgoeschl
Date: Fri Jan 8 22:10:09 2016
New Revision: 1723807
URL: http://svn.apache.org/viewvc?rev=1723807&view=rev
Log:
[EXEC-98] Fix broken site build and sync the pom and directory layout with
commons-email
Added:
commons/proper/exec/trunk/conf/
commons/proper/exec/trunk/conf/HEADER.txt
commons/proper/exec/trunk/conf/checkstyle.xml
commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml
commons/proper/exec/trunk/src/assembly/
commons/proper/exec/trunk/src/assembly/bin.xml
commons/proper/exec/trunk/src/assembly/src.xml
Removed:
commons/proper/exec/trunk/STATUS
commons/proper/exec/trunk/findbugs-exclude-filter.xml
commons/proper/exec/trunk/src/main/assembly/
Modified:
commons/proper/exec/trunk/build.xml
commons/proper/exec/trunk/pom.xml
commons/proper/exec/trunk/src/test/bin/testme.bat
Modified: commons/proper/exec/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/build.xml?rev=1723807&r1=1723806&r2=1723807&view=diff
==============================================================================
--- commons/proper/exec/trunk/build.xml (original)
+++ commons/proper/exec/trunk/build.xml Fri Jan 8 22:10:09 2016
@@ -23,7 +23,7 @@
<property file="user.properties" />
<property file="build.properties" />
- <property name="maven.build.version" value="1.2"/>
+ <property name="maven.build.version" value="1.4"/>
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name"
value="commons-exec-${maven.build.version}"/>
@@ -33,8 +33,8 @@
<!-- JUnit version should agree with the version in pom.xml -->
<property name="maven.junit.jar"
value="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
<!-- These must agree with the versions in pom.xml -->
- <property name="maven.compiler.source" value="1.3"/>
- <property name="maven.compiler.target" value="1.3"/>
+ <property name="maven.compiler.source" value="1.5"/>
+ <property name="maven.compiler.target" value="1.5"/>
<path id="junit">
<pathelement location="${maven.junit.jar}"/>
Added: commons/proper/exec/trunk/conf/HEADER.txt
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/HEADER.txt?rev=1723807&view=auto
==============================================================================
--- commons/proper/exec/trunk/conf/HEADER.txt (added)
+++ commons/proper/exec/trunk/conf/HEADER.txt Fri Jan 8 22:10:09 2016
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
Added: commons/proper/exec/trunk/conf/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/checkstyle.xml?rev=1723807&view=auto
==============================================================================
--- commons/proper/exec/trunk/conf/checkstyle.xml (added)
+++ commons/proper/exec/trunk/conf/checkstyle.xml Fri Jan 8 22:10:09 2016
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+
+<!-- Checkstyle configuration that checks the commons-configuration coding
conventions -->
+
+<module name="Checker">
+ <property name="localeLanguage" value="en"/>
+ <property name="severity" value="warning"/>
+
+ <!-- Checks that a package.html file exists for each package. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+ <module name="JavadocPackage">
+ <property name="allowLegacy" value="true"/>
+ </module>
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <module name="NewlineAtEndOfFile"/>
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="fileExtensions" value="java"/>
+ </module>
+ <module name="FileLength"/>
+ <module name="FileTabCharacter"/>
+
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <module name="JavadocMethod">
+ <property name="allowUndeclaredRTE" value="true"/>
+ </module>
+ <module name="JavadocType">
+ </module>
+ <module name="JavadocVariable"/>
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Following interprets the header file as regular expressions. -->
+ <!-- <module name="RegexpHeader"/> -->
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ <property name="tokens" value="LITERAL_CATCH"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <module name="CovariantEquals"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <!-- <module name="MagicNumber"/> -->
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows"/>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <module name="IllegalType"/>
+ <module name="DeclarationOrder"/>
+ <module name="ExplicitInitialization"/>
+ <module name="DefaultComesLast"/>
+ <module name="FallThrough"/>
+ <module name="MultipleVariableDeclarations"/>
+ <module name="UnnecessaryParentheses"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
+
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>
Added: commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml?rev=1723807&view=auto
==============================================================================
--- commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml (added)
+++ commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml Fri Jan 8
22:10:09 2016
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<!--
+ This file contains some false positive bugs detected by findbugs. Their
+ false positive nature has been analyzed individually and they have been
+ put here to instruct findbugs it must ignore them.
+-->
+<FindBugsFilter>
+
+</FindBugsFilter>
Modified: commons/proper/exec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=1723807&r1=1723806&r2=1723807&view=diff
==============================================================================
--- commons/proper/exec/trunk/pom.xml (original)
+++ commons/proper/exec/trunk/pom.xml Fri Jan 8 22:10:09 2016
@@ -19,36 +19,32 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>35</version>
+ <version>38</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Apache Commons Exec</name>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <description>Apache Commons Exec is a library to reliably execute external
processes from within the JVM.</description>
- <prerequisites>
- <maven>2.2.1</maven>
- </prerequisites>
+ <version>1.4.0-SNAPSHOT</version>
+
+ <inceptionYear>2005</inceptionYear>
+ <description>
+ Apache Commons Exec is a library to reliably execute external
processes from within the JVM.
+ </description>
+
<url>http://commons.apache.org/proper/commons-exec/</url>
+
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/EXEC</url>
</issueManagement>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/commons/proper/exec/trunk</url>
</scm>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <!-- Must agree with the version in build.xml -->
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+
<developers>
<developer>
<id>brett</id>
@@ -106,6 +102,16 @@
<name>Niall Pemberton</name>
</contributor>
</contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -121,8 +127,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -142,117 +148,115 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <ignorePathsToDelete>
+ <ignorePathToDelete>javadocs</ignorePathToDelete>
+ </ignorePathsToDelete>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
<distributionManagement>
- <site>
- <id>stagingSite</id>
- <name>Apache Staging Website</name>
-
<url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}/</url>
- </site>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Website</name>
+
<url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/exec/</url>
+ </site>
</distributionManagement>
+
<reporting>
<plugins>
+ <!-- generate the changes report from changes.xml -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.13</version>
+ <configuration>
+
<configLocation>${basedir}/conf/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <headerFile>${basedir}/conf/HEADER.txt</headerFile>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.3</version>
+ <version>2.7.1</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
- <linkXref>true</linkXref>
- <rulesets>
- <ruleset>${basedir}/pmd.xml</ruleset>
- </rulesets>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.5</version>
+ <version>${findbugs.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
-
<excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
+
<excludeFilterFile>${basedir}/conf/findbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.sonar-plugins</groupId>
- <artifactId>maven-report</artifactId>
- <version>0.1</version>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/eml/*.eml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
+
<profiles>
- <!--
- enable this profile if you like to create cobertura report not being
part of the official website
- -->
- <profile>
- <id>coverage</id>
- <reporting>
- <plugins>
- <!-- Avoid broken Cobertura 2.1 plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- </plugins>
- </reporting>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Commons Release Candidate Staging Site</name>
+
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
+ </site>
+ </distributionManagement>
</profile>
- <profile>
- <id>setup-checkout</id>
- <activation>
- <file>
- <missing>site-content</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>prepare-checkout</id>
- <phase>pre-site</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <exec executable="svn">
- <arg line="checkout ${commons.scmPubUrl}
${commons.scmPubCheckoutDirectory}" />
- </exec>
- <!-- in case of paths to ignore (added manually) -->
-
- <exec executable="svn">
- <arg line="update --set-depth exclude
${commons.scmPubCheckoutDirectory}/javadocs" />
- </exec>
-
- <pathconvert pathsep=" " property="dirs">
- <dirset dir="${commons.scmPubCheckoutDirectory}"
includes="*" />
- </pathconvert>
- <exec executable="svn">
- <arg line="update --set-depth infinity ${dirs}" />
- </exec>
-
- <exec executable="svn">
- <arg line="update" />
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+
+ <profile>
+ <!-- Use a profile to detect if we are running in a Java 1.8
environment.
+ Use different versions of easymock/powermock, otherwise the
test execution will fail -->
+ <id>test_java_8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <properties>
+ <findbugs.version>3.0.0</findbugs.version>
+ </properties>
+ </profile>
</profiles>
<properties>
<!-- Compiler source and target JVM (see parent pom). Must agree with
versions in build.xml -->
Added: commons/proper/exec/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/assembly/bin.xml?rev=1723807&view=auto
==============================================================================
--- commons/proper/exec/trunk/src/assembly/bin.xml (added)
+++ commons/proper/exec/trunk/src/assembly/bin.xml Fri Jan 8 22:10:09 2016
@@ -0,0 +1,44 @@
+<!--
+ 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>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>RELEASE-NOTES.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: commons/proper/exec/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/assembly/src.xml?rev=1723807&view=auto
==============================================================================
--- commons/proper/exec/trunk/src/assembly/src.xml (added)
+++ commons/proper/exec/trunk/src/assembly/src.xml Fri Jan 8 22:10:09 2016
@@ -0,0 +1,54 @@
+<!--
+ 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>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${commons.release.version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>build.xml</include>
+ <include>findbugs-exclude-filter.xml</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>pmd.xml</include>
+ <include>pom.xml</include>
+ <include>RELEASE-NOTES.txt</include>
+ <include>STATUS</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ <excludes>
+ <!-- relative to directory -->
+ <exclude>test/scripts/*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ <!-- Ensure that shell scripts are executable -->
+ <fileMode>775</fileMode>
+ <includes>
+ <!-- relative to directory -->
+ <include>test/scripts/*.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
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=1723807&r1=1723806&r2=1723807&view=diff
==============================================================================
--- commons/proper/exec/trunk/src/test/bin/testme.bat (original)
+++ commons/proper/exec/trunk/src/test/bin/testme.bat Fri Jan 8 22:10:09 2016
@@ -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-${project.version}-tests.jar;.\lib\commons-exec-${project.version}.jar
org.apache.commons.exec.TestRunner
\ No newline at end of file
+"%JAVA_HOME%\bin\java" -cp
.\lib\junit-4.11.jar;.\lib\commons-exec-@vers...@-tests.jar;.\lib\commons-exec-@VERSION@.jar
org.apache.commons.exec.TestRunner
\ No newline at end of file
