Get 'mvn clean site' to work. Project: http://git-wip-us.apache.org/repos/asf/commons-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-testing/commit/e22cc4fe Tree: http://git-wip-us.apache.org/repos/asf/commons-testing/tree/e22cc4fe Diff: http://git-wip-us.apache.org/repos/asf/commons-testing/diff/e22cc4fe
Branch: refs/heads/master Commit: e22cc4fe8e2eb7788ff650cb50130ee7cdf5cee4 Parents: fd164a6 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Feb 4 13:40:06 2018 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Feb 4 13:40:06 2018 -0700 ---------------------------------------------------------------------- checkstyle-header.txt | 16 + commons-testing-generic/pom.xml | 170 ++-- commons-testing-junit4/pom.xml | 192 ++-- pom.xml | 666 ++++++------- src/changes/changes.xml | 2 +- src/changes/release-notes.vm | 268 +++--- src/site/site.xml | 94 +- src/site/xdoc/developerguide.xml | 120 +-- src/site/xdoc/index.xml | 198 ++-- target/antrun/build-main.xml | 14 +- target/apidocs/META-INF/LICENSE.txt | 404 ++++---- target/apidocs/META-INF/NOTICE.txt | 10 +- ...mmons-testing-parent-1.0.0-SNAPSHOT-site.xml | 94 +- target/maven-archiver/pom.properties | 5 - target/site/building.html | 284 ++++++ target/site/changes-report.html | 290 ++++++ target/site/css/bootstrap-1.3.0.min.css | 330 +++++++ target/site/css/bootstrap.min.css | 9 + target/site/css/commons-maven.css | 129 +++ target/site/css/commons-trade.css | 41 + target/site/css/maven-base.css | 164 ++++ target/site/css/maven-theme.css | 926 +++++++++++++++++++ target/site/css/prettify.css | 111 +++ target/site/css/print.css | 23 + target/site/css/site.css | 82 ++ target/site/dependency-convergence.html | 324 +++++++ target/site/dependency-info.html | 337 +++++++ target/site/dependency-management.html | 322 +++++++ target/site/developerguide.html | 306 ++++++ target/site/distribution-management.html | 308 ++++++ target/site/download_lang.cgi | 4 + target/site/images/add.gif | Bin 0 -> 207 bytes target/site/images/collapsed.gif | Bin 0 -> 820 bytes target/site/images/commons-logo.png | Bin 0 -> 6067 bytes target/site/images/expanded.gif | Bin 0 -> 52 bytes target/site/images/external-classic.png | Bin 0 -> 956 bytes target/site/images/fix.gif | Bin 0 -> 181 bytes target/site/images/help_logo.gif | Bin 0 -> 2113 bytes .../site/images/icon_arrowfolderclosed1_sml.gif | Bin 0 -> 441 bytes .../site/images/icon_arrowfolderopen2_sml.gif | Bin 0 -> 664 bytes target/site/images/icon_arrowwaste1_sml.gif | Bin 0 -> 606 bytes target/site/images/icon_arrowwaste2_sml.gif | Bin 0 -> 609 bytes target/site/images/icon_doc_lrg.gif | Bin 0 -> 1335 bytes target/site/images/icon_doc_sml.gif | Bin 0 -> 355 bytes target/site/images/icon_error_lrg.gif | Bin 0 -> 1531 bytes target/site/images/icon_error_sml.gif | Bin 0 -> 633 bytes target/site/images/icon_folder_lrg.gif | Bin 0 -> 1548 bytes target/site/images/icon_folder_sml.gif | Bin 0 -> 634 bytes target/site/images/icon_help_sml.gif | Bin 0 -> 1019 bytes target/site/images/icon_info_lrg.gif | Bin 0 -> 1383 bytes target/site/images/icon_info_sml.gif | Bin 0 -> 638 bytes target/site/images/icon_members_lrg.gif | Bin 0 -> 1570 bytes target/site/images/icon_sortdown.gif | Bin 0 -> 117 bytes target/site/images/icon_sortup.gif | Bin 0 -> 117 bytes target/site/images/icon_success_lrg.gif | Bin 0 -> 1492 bytes target/site/images/icon_success_sml.gif | Bin 0 -> 604 bytes target/site/images/icon_usergroups_lrg.gif | Bin 0 -> 1520 bytes target/site/images/icon_warning_lrg.gif | Bin 0 -> 1491 bytes target/site/images/icon_warning_sml.gif | Bin 0 -> 625 bytes target/site/images/logo.png | Bin 0 -> 32813 bytes .../site/images/logos/build-by-maven-black.png | Bin 0 -> 2294 bytes .../site/images/logos/build-by-maven-white.png | Bin 0 -> 2260 bytes target/site/images/logos/maven-feather.png | Bin 0 -> 3330 bytes target/site/images/newwindow-classic.png | Bin 0 -> 951 bytes target/site/images/nw_maj_rond.gif | Bin 0 -> 51 bytes target/site/images/remove.gif | Bin 0 -> 227 bytes target/site/images/rss.png | Bin 0 -> 249 bytes target/site/images/strich.gif | Bin 0 -> 43 bytes target/site/images/sw_maj_rond.gif | Bin 0 -> 51 bytes target/site/images/sw_med_rond.gif | Bin 0 -> 46 bytes target/site/images/update.gif | Bin 0 -> 192 bytes target/site/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes target/site/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes target/site/index.html | 409 ++++++++ target/site/integration.html | 309 +++++++ target/site/issue-tracking.html | 374 ++++++++ target/site/javancss.html | 310 +++++++ target/site/jira-report.html | 277 ++++++ target/site/js/bootstrap.min.js | 6 + target/site/js/jquery.min.js | 4 + target/site/js/prettify.js | 640 +++++++++++++ target/site/js/prettify.min.js | 41 + target/site/js/site.js | 106 +++ target/site/mail-lists.html | 519 +++++++++++ target/site/modules.html | 311 +++++++ target/site/profile.clirr | 0 target/site/profile.cobertura | 0 target/site/project-info.html | 343 +++++++ target/site/project-reports.html | 301 ++++++ target/site/project-summary.html | 345 +++++++ target/site/proposal.html | 355 +++++++ target/site/rat-report.html | 327 +++++++ target/site/source-repository.html | 319 +++++++ target/site/surefire-report.html | 311 +++++++ target/site/team-list.html | 323 +++++++ target/site/xref/allclasses-frame.html | 26 + target/site/xref/index.html | 25 + .../junit4/AbstractAvailableLocalesTest.html | 108 +++ .../junit4/ObjectToStringComparator.html | 53 ++ .../junit4/SetDefaultLocaleTestRule.html | 71 ++ .../commons/testing/junit4/package-frame.html | 30 + .../commons/testing/junit4/package-summary.html | 79 ++ target/site/xref/overview-frame.html | 25 + target/site/xref/overview-summary.html | 66 ++ target/site/xref/stylesheet.css | 114 +++ 105 files changed, 11629 insertions(+), 1141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/checkstyle-header.txt ---------------------------------------------------------------------- diff --git a/checkstyle-header.txt b/checkstyle-header.txt new file mode 100644 index 0000000..cfa96b8 --- /dev/null +++ b/checkstyle-header.txt @@ -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. + */ http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/commons-testing-generic/pom.xml ---------------------------------------------------------------------- diff --git a/commons-testing-generic/pom.xml b/commons-testing-generic/pom.xml index 2e25fcd..b70c253 100644 --- a/commons-testing-generic/pom.xml +++ b/commons-testing-generic/pom.xml @@ -1,76 +1,94 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.commons</groupId> - <artifactId>commons-testing-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <artifactId>commons-testing-generic</artifactId> - <packaging>jar</packaging> - - <name>Apache Commons Testing for Generic test code</name> - <description>Apache Commons Testing for Generic test code</description> - - <properties> - <commons.osgi.symbolicName>org.apache.commons.testing.generic</commons.osgi.symbolicName> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>test-jar</id> - <!-- Also expose abstract test classes --> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.commons.testing.generic</Bundle-SymbolicName> - <Automatic-Module-Name>org.apache.commons.testing.generic</Automatic-Module-Name> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <distributionManagement> - <site> - <id>commonstesting-generic-site</id> - <url>scm:svn:${commons.scmPubUrl}/generic/</url> - </site> - </distributionManagement> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-testing-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../</relativePath> + </parent> + + <artifactId>commons-testing-generic</artifactId> + <packaging>jar</packaging> + + <name>Apache Commons Testing Generic</name> + <description>Apache Commons Testing for Generic Test Code</description> + + <properties> + <testingParentDir>${basedir}/..</testingParentDir> + <commons.osgi.symbolicName>org.apache.commons.testing.generic</commons.osgi.symbolicName> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.commons.testing.generic</Bundle-SymbolicName> + <Automatic-Module-Name>org.apache.commons.testing.generic</Automatic-Module-Name> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <distributionManagement> + <site> + <id>commonstesting-generic-site</id> + <url>scm:svn:${commons.scmPubUrl}/generic/</url> + </site> + </distributionManagement> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <configuration> + <configLocation>${testingParentDir}/checkstyle.xml</configLocation> + <suppressionsLocation>${testingParentDir}/checkstyle-suppressions.xml</suppressionsLocation> + <enableRulesSummary>false</enableRulesSummary> + <propertyExpansion>basedir=${basedir}</propertyExpansion> + <propertyExpansion>licensedir=${testingParentDir}/checkstyle-header.txt</propertyExpansion> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugs.plugin.version}</version> + <configuration> + <fork>true</fork> + <jvmArgs>-Duser.language=en</jvmArgs> + <threshold>Normal</threshold> + <effort>Default</effort> + <excludeFilterFile>${testingParentDir}/findbugs-exclude-filter.xml</excludeFilterFile> + </configuration> + </plugin> + </plugins> + </reporting> + +</project> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/commons-testing-junit4/pom.xml ---------------------------------------------------------------------- diff --git a/commons-testing-junit4/pom.xml b/commons-testing-junit4/pom.xml index 948e73c..c12d50f 100644 --- a/commons-testing-junit4/pom.xml +++ b/commons-testing-junit4/pom.xml @@ -1,88 +1,104 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.commons</groupId> - <artifactId>commons-testing-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <artifactId>commons-testing-junit4</artifactId> - <packaging>jar</packaging> - - <name>Apache Commons Testing for JUnit4</name> - <description>Apache Commons Testing for JUnit4</description> - - <properties> - <commons.osgi.symbolicName>org.apache.commons.testing.junit4</commons.osgi.symbolicName> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>test-jar</id> - <!-- Also expose abstract test classes --> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.commons.testing.junit4</Bundle-SymbolicName> - <Automatic-Module-Name>org.apache.commons.testing.junit4</Automatic-Module-Name> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <distributionManagement> - <site> - <id>commonstesting-junit4-site</id> - <url>scm:svn:${commons.scmPubUrl}/junit4/</url> - </site> - </distributionManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - </dependencies> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-testing-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../</relativePath> + </parent> + + <artifactId>commons-testing-junit4</artifactId> + <packaging>jar</packaging> + + <name>Apache Commons Testing for JUnit4</name> + <description>Apache Commons Testing for JUnit4</description> + + <properties> + <testingParentDir>${basedir}/..</testingParentDir> + <commons.osgi.symbolicName>org.apache.commons.testing.junit4</commons.osgi.symbolicName> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.commons.testing.junit4</Bundle-SymbolicName> + <Automatic-Module-Name>org.apache.commons.testing.junit4</Automatic-Module-Name> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <distributionManagement> + <site> + <id>commonstesting-junit4-site</id> + <url>scm:svn:${commons.scmPubUrl}/junit4/</url> + </site> + </distributionManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <configuration> + <configLocation>${testingParentDir}/checkstyle.xml</configLocation> + <suppressionsLocation>${testingParentDir}/checkstyle-suppressions.xml</suppressionsLocation> + <enableRulesSummary>false</enableRulesSummary> + <propertyExpansion>basedir=${basedir}</propertyExpansion> + <propertyExpansion>licensedir=${testingParentDir}/checkstyle-header.txt</propertyExpansion> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugs.plugin.version}</version> + <configuration> + <fork>true</fork> + <jvmArgs>-Duser.language=en</jvmArgs> + <threshold>Normal</threshold> + <effort>Default</effort> + <excludeFilterFile>${testingParentDir}/findbugs-exclude-filter.xml</excludeFilterFile> + </configuration> + </plugin> + </plugins> + </reporting> +</project> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bf63d25..d3f50ee 100644 --- a/pom.xml +++ b/pom.xml @@ -1,376 +1,290 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<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.apache.commons</groupId> - <artifactId>commons-parent</artifactId> - <version>43</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>commons-testing-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Apache Commons Testing</name> - - <inceptionYear>2017</inceptionYear> - <description> - Apache Commons Testing, a package of Java utility classes for testing. - </description> - - <url>http://commons.apache.org/proper/commons-testing/</url> - - <issueManagement> - <system>jira</system> - <!-- WIP --> - <url>http://issues.apache.org/jira/browse/TEST</url> - </issueManagement> - - <scm> - <connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-testing.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-testing.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf?p=commons-testing.git</url> - <tag>TESTING-1.0.0</tag> - </scm> - - <developers> - <developer> - <name>Gary D. Gregory</name> - <id>ggregory</id> - <email>ggreg...@apache.org</email> - <timezone>-5</timezone> - <roles> - <role>Java Developer</role> - </roles> - </developer> - </developers> - - <contributors> - </contributors> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.6</version> - </dependency> - </dependencies> - </dependencyManagement> - - <distributionManagement> - <site> - <id>apache.website</id> - <name>Apache Commons Testing Site</name> - <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-testing/</url> - </site> - </distributionManagement> - - <properties> - <argLine>-Xmx512m</argLine> - <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - <!-- - This is also used to generate download_xxx file name. - To override this when generating the download page: - - mvn commons:download-page -Dcommons.componentid=testing - - The above seems to change the download page name but not any other - properties that depend on the componentid. - --> - <commons.componentid>testing</commons.componentid> - <commons.module.name>org.apache.commons.testing</commons.module.name> - <!-- Current 1.x release series --> - <commons.release.version>1.0.0</commons.release.version> - <commons.release.desc>(Java 8)</commons.release.desc> - <commons.jira.id>TESTING</commons.jira.id> - <commons.jira.pid>????</commons.jira.pid> - - <commons.site.path>testing</commons.site.path> - <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-testing</commons.scmPubUrl> - <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory> - <commons.encoding>utf-8</commons.encoding> - - <!-- Override clirr version to be able to build the site on Java 8 --> - <commons.clirr.version>2.8</commons.clirr.version> - <checkstyle.plugin.version>2.17</checkstyle.plugin.version> - - </properties> - - - <build> - <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check findbugs:check javadoc:javadoc</defaultGoal> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>site-content/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>plain</id> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <runOrder>random</runOrder> - </configuration> - </execution> - <!-- <execution> <id>security-manager-test</id> <phase>integration-test</phase> <goals> <goal>test</goal> </goals> - <configuration> - <includes> <include>**/*Test.java</include> </includes> <argLine>-Djava.security.manager -Djava.security.policy=${basedir}/src/test/resources/java.policy</argLine> - </configuration> </execution> --> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - <descriptor>src/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - <!-- Temporary fix for LANG-1338, remove this after this has implemented in parent pom --> - <configuration> - <archive combine.children="append"> - <manifestEntries> - <Automatic-Module-Name>org.apache.commons.testing</Automatic-Module-Name> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <configuration> - <ignorePathsToDelete> - <ignorePathToDelete>javadocs</ignorePathToDelete> - </ignorePathsToDelete> - </configuration> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <configuration> - <configLocation>${basedir}/checkstyle.xml</configLocation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <enableRulesSummary>false</enableRulesSummary> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <!-- Use version from parent pom as that is adjusted according to the Java version used to run Maven --> - <version>${commons.findbugs.version}</version> - <configuration> - <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - </plugins> - - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <configuration> - <configLocation>${basedir}/checkstyle.xml</configLocation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <enableRulesSummary>false</enableRulesSummary> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>checkstyle</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <!-- Requires setting 'export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" ' --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <!-- Use version from parent pom as that is adjusted according to the Java version used to run Maven --> - <version>${commons.findbugs.version}</version> - <configuration> - <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.8</version> - <configuration> - <targetJdk>${maven.compiler.target}</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> - <configuration> - <tagListOptions> - <tagClasses> - <tagClass> - <displayName>Needs Work</displayName> - <tags> - <tag> - <matchString>TODO</matchString> - <matchType>exact</matchType> - </tag> - <tag> - <matchString>FIXME</matchString> - <matchType>exact</matchType> - </tag> - <tag> - <matchString>XXX</matchString> - <matchType>exact</matchType> - </tag> - </tags> - </tagClass> - <tagClass> - <displayName>Noteable Markers</displayName> - <tags> - <tag> - <matchString>NOTE</matchString> - <matchType>exact</matchType> - </tag> - <tag> - <matchString>NOPMD</matchString> - <matchType>exact</matchType> - </tag> - <tag> - <matchString>NOSONAR</matchString> - <matchType>exact</matchType> - </tag> - </tags> - </tagClass> - </tagClasses> - </tagListOptions> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javancss-maven-plugin</artifactId> - <version>2.1</version> - </plugin> - </plugins> - </reporting> - - <modules> - <module>commons-testing-generic</module> - <module>commons-testing-junit4</module> - <!--<module>commons-testing-junit5</module> --> - </modules> - - <profiles> - <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> - <executions> - <execution> - <id>prepare-checkout</id> - <phase>pre-site</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <exec executable="svn"> - <arg line="checkout --depth immediates ${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}" /> - </exec> - - <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> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>java9</id> - <activation> - <jdk>9</jdk> - </activation> - <properties> - <!-- LANG-1265: allow tests to access private fields/methods of java.base classes via reflection --> - <argLine>-Xmx512m --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens - java.base/java.lang=ALL-UNNAMED</argLine> - <!-- versions below 3.0.0 do not work with java 9 --> - <commons.javadoc.version>3.0.0-M1</commons.javadoc.version> - <!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 --> - <coveralls.skip>true</coveralls.skip> - </properties> - </profile> - - </profiles> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<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.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + <version>43</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>commons-testing-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Apache Commons Testing Parent POM</name> + + <inceptionYear>2017</inceptionYear> + <description> + Apache Commons Testing, a package of Java utility classes for testing. + </description> + + <url>http://commons.apache.org/proper/commons-testing/</url> + + <issueManagement> + <system>jira</system> + <!-- WIP --> + <url>http://issues.apache.org/jira/browse/TESTING</url> + </issueManagement> + + <scm> + <connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-testing.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-testing.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=commons-testing.git</url> + <tag>TESTING-1.0.0</tag> + </scm> + + <developers> + <developer> + <name>Gary Gregory</name> + <id>ggregory</id> + <email>ggreg...@apache.org</email> + <timezone>-5</timezone> + <roles> + <role>Java Developer</role> + </roles> + </developer> + </developers> + + <contributors> + </contributors> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.7</version> + </dependency> + </dependencies> + </dependencyManagement> + + <distributionManagement> + <site> + <id>apache.website</id> + <name>Apache Commons Testing Site</name> + <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-testing/</url> + </site> + </distributionManagement> + + <properties> + <argLine>-Xmx512m</argLine> + <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <!-- + This is also used to generate download_xxx file name. + To override this when generating the download page: + + mvn commons:download-page -Dcommons.componentid=testing + + The above seems to change the download page name but not any other + properties that depend on the componentid. + --> + <commons.componentid>testing</commons.componentid> + <commons.module.name>org.apache.commons.testing</commons.module.name> + <!-- Current 1.x release series --> + <commons.release.version>1.0.0</commons.release.version> + <commons.release.desc>(Java 7)</commons.release.desc> + <commons.jira.id>TESTING</commons.jira.id> + <commons.jira.pid>????</commons.jira.pid> + + <commons.site.path>testing</commons.site.path> + <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-testing</commons.scmPubUrl> + <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory> + <commons.encoding>utf-8</commons.encoding> + + <!-- Override clirr version to be able to build the site on Java 7 --> + <commons.clirr.version>2.8</commons.clirr.version> + <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version> + <findbugs.plugin.version>3.0.5</findbugs.plugin.version> + + </properties> + + + <build> + <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check findbugs:check javadoc:javadoc</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>site-content/**</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>plain</id> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <runOrder>random</runOrder> + </configuration> + </execution> + <!-- <execution> <id>security-manager-test</id> <phase>integration-test</phase> <goals> <goal>test</goal> </goals> + <configuration> + <includes> <include>**/*Test.java</include> </includes> <argLine>-Djava.security.manager -Djava.security.policy=${basedir}/src/test/resources/java.policy</argLine> + </configuration> </execution> --> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + <descriptor>src/assembly/src.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <ignorePathsToDelete> + <ignorePathToDelete>javadocs</ignorePathToDelete> + </ignorePathsToDelete> + </configuration> + </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <configuration> + <configLocation>${basedir}/checkstyle.xml</configLocation> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <enableRulesSummary>false</enableRulesSummary> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <!-- Use version from parent pom as that is adjusted according to the Java version used to run Maven --> + <version>${commons.findbugs.version}</version> + <configuration> + <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + </plugins> + + </build> + + <reporting> + <plugins> + <!-- Requires setting 'export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" ' --> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <version>3.9.0</version> + <configuration> + <targetJdk>${maven.compiler.target}</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> + <configuration> + <tagListOptions> + <tagClasses> + <tagClass> + <displayName>Needs Work</displayName> + <tags> + <tag> + <matchString>TODO</matchString> + <matchType>exact</matchType> + </tag> + <tag> + <matchString>FIXME</matchString> + <matchType>exact</matchType> + </tag> + <tag> + <matchString>XXX</matchString> + <matchType>exact</matchType> + </tag> + </tags> + </tagClass> + <tagClass> + <displayName>Noteable Markers</displayName> + <tags> + <tag> + <matchString>NOTE</matchString> + <matchType>exact</matchType> + </tag> + <tag> + <matchString>NOPMD</matchString> + <matchType>exact</matchType> + </tag> + <tag> + <matchString>NOSONAR</matchString> + <matchType>exact</matchType> + </tag> + </tags> + </tagClass> + </tagClasses> + </tagListOptions> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javancss-maven-plugin</artifactId> + <version>2.1</version> + </plugin> + </plugins> + </reporting> + + <modules> + <module>commons-testing-generic</module> + <module>commons-testing-junit4</module> + <!--<module>commons-testing-junit5</module> --> + <!--<module>commons-testing-junit4-mongodb</module> --> + </modules> + + <profiles> + <profile> + <id>java9</id> + <activation> + <jdk>9</jdk> + </activation> + <properties> + <!-- LANG-1265: allow tests to access private fields/methods of java.base classes via reflection --> + <argLine>-Xmx512m --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens + java.base/java.lang=ALL-UNNAMED</argLine> + <!-- versions below 3.0.0 do not work with java 9 --> + <commons.javadoc.version>3.0.0</commons.javadoc.version> + <!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 --> + <coveralls.skip>true</coveralls.skip> + </properties> + </profile> + + </profiles> + +</project> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3150dc4..015a87a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,7 +45,7 @@ The <action> type attribute can be add,update,fix,remove. </properties> <body> - <release version="1.0.0" date="2017-MM-DD" description="First release (Java 8)"> + <release version="1.0.0" date="2018-MM-DD" description="First release (Java 7)"> </release> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/src/changes/release-notes.vm ---------------------------------------------------------------------- diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm index faee66c..d43187b 100644 --- a/src/changes/release-notes.vm +++ b/src/changes/release-notes.vm @@ -1,135 +1,135 @@ -## 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. -## - -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. - - - ${project.name} - Version ${version} - Release Notes - - -INTRODUCTION: - -This document contains the release notes for the ${version} version of Apache Commons Testing. -Commons Testing is a set of utility functions and reusable components that should be of use in any -Java environment. - -Commons Testing 1.0.0 targets Java 8. - -$introduction.replaceAll("(?<!\015)\012", " -").replaceAll("(?m)^ +","") - -## N.B. the available variables are described here: -## http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html -## -## Hack to improve layout: replace all pairs of spaces with a single new-line -$release.description.replaceAll(" ", " -") - -## set up indent sizes. Only change indent1 -#set($props=${project.properties}) -#set($jiralen=$props.get("commons.jira.id").length()) -## indent1 = POOL-nnnn: -#set($blanklen=$jiralen+6)## +6 for "-nnnn:" -## must be at least as long as the longest JIRA id -#set($blanks=" ") -#set($indent1=$blanks.substring(0,$blanklen)) -## indent2 allows for issue wrapper -#set($indent2="$indent1 ") -## -#macro ( processaction ) -## Use replaceAll to fix up LF-only line ends on Windows. -#set($action=$actionItem.getAction().replaceAll("\n"," -")) -## Fix up indentation for multi-line action descriptions -#set($action=$action.replaceAll("(?m)^ +",$indent2)) -#if ($actionItem.getIssue()) -#set($issue="$actionItem.getIssue():") -## Pad shorter issue numbers -#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end -#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end -#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end -#else -#set($issue=$indent1) -#end -#if ($actionItem.getDueTo()) -#set($dueto=" Thanks to $actionItem.getDueTo().") -#else -#set($dueto="") -#end -o $issue ${action}$dueto -#set($action="") -#set($issue="") -#set($dueto="") -#end -## -#if ($release.getActions().size() == 0) -No changes defined in this version. -#else -Changes in this version include: - -#if ($release.getActions('add').size() !=0) -New features: -#foreach($actionItem in $release.getActions('add')) -#processaction() -#end -#end - -#if ($release.getActions('fix').size() !=0) -Fixed Bugs: -#foreach($actionItem in $release.getActions('fix')) -#processaction() -#end -#end - -#if ($release.getActions('update').size() !=0) -Changes: -#foreach($actionItem in $release.getActions('update')) -#processaction() -#end -#end - -#if ($release.getActions('remove').size() !=0) -Removed: -#foreach($actionItem in $release.getActions('remove')) -#processaction() -#end -#end -## End of main loop -#end - -Historical list of changes: ${project.url}changes-report.html - -For complete information on ${project.name}, including instructions on how to submit bug reports, -patches, or suggestions for improvement, see the Apache ${project.name} website: - +## 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. +## + +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. + + + ${project.name} + Version ${version} + Release Notes + + +INTRODUCTION: + +This document contains the release notes for the ${version} version of Apache Commons Testing. +Commons Testing is a set of utility functions and reusable components that should be of use in any +Java environment. + +Commons Testing 1.0.0 targets Java 7. + +$introduction.replaceAll("(?<!\015)\012", " +").replaceAll("(?m)^ +","") + +## N.B. the available variables are described here: +## http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html +## +## Hack to improve layout: replace all pairs of spaces with a single new-line +$release.description.replaceAll(" ", " +") + +## set up indent sizes. Only change indent1 +#set($props=${project.properties}) +#set($jiralen=$props.get("commons.jira.id").length()) +## indent1 = POOL-nnnn: +#set($blanklen=$jiralen+6)## +6 for "-nnnn:" +## must be at least as long as the longest JIRA id +#set($blanks=" ") +#set($indent1=$blanks.substring(0,$blanklen)) +## indent2 allows for issue wrapper +#set($indent2="$indent1 ") +## +#macro ( processaction ) +## Use replaceAll to fix up LF-only line ends on Windows. +#set($action=$actionItem.getAction().replaceAll("\n"," +")) +## Fix up indentation for multi-line action descriptions +#set($action=$action.replaceAll("(?m)^ +",$indent2)) +#if ($actionItem.getIssue()) +#set($issue="$actionItem.getIssue():") +## Pad shorter issue numbers +#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end +#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end +#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end +#else +#set($issue=$indent1) +#end +#if ($actionItem.getDueTo()) +#set($dueto=" Thanks to $actionItem.getDueTo().") +#else +#set($dueto="") +#end +o $issue ${action}$dueto +#set($action="") +#set($issue="") +#set($dueto="") +#end +## +#if ($release.getActions().size() == 0) +No changes defined in this version. +#else +Changes in this version include: + +#if ($release.getActions('add').size() !=0) +New features: +#foreach($actionItem in $release.getActions('add')) +#processaction() +#end +#end + +#if ($release.getActions('fix').size() !=0) +Fixed Bugs: +#foreach($actionItem in $release.getActions('fix')) +#processaction() +#end +#end + +#if ($release.getActions('update').size() !=0) +Changes: +#foreach($actionItem in $release.getActions('update')) +#processaction() +#end +#end + +#if ($release.getActions('remove').size() !=0) +Removed: +#foreach($actionItem in $release.getActions('remove')) +#processaction() +#end +#end +## End of main loop +#end + +Historical list of changes: ${project.url}changes-report.html + +For complete information on ${project.name}, including instructions on how to submit bug reports, +patches, or suggestions for improvement, see the Apache ${project.name} website: + ${project.url} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index 69574cb..fb063d8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,44 +1,50 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - 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. ---> -<project name="Lang"> - <bannerRight> - <name>Commons Testing</name> - <src>/images/logo.png</src> - <href>/index.html</href> - </bannerRight> - - <body> - <menu name="Lang"> - <item name="Overview" href="/index.html"/> - <item name="Download" href="/download_lang.cgi"/> - <item name="Javadoc (1.0.0)" href="javadocs/api-1.0.0/index.html"/> - <item name="Javadoc (Latest)" href="javadocs/api-release/index.html"/> - </menu> - - <menu name="Development"> - <item name="Building" href="/building.html"/> - <item name="Mailing Lists" href="/mail-lists.html"/> - <item name="Issue Tracking" href="/issue-tracking.html"/> - <item name="Developer Guide" href="/developerguide.html"/> - <item name="Source Repository" href="/source-repository.html"/> - <item name="Javadoc (GIT latest)" href="apidocs/index.html"/> - </menu> - - </body> - -</project> +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + 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. +--> +<project name="Lang"> + <bannerRight> + <name>Commons Testing</name> + <src>/images/logo.png</src> + <href>/index.html</href> + </bannerRight> + + <body> + <menu name="Testing"> + <item name="Overview" href="/index.html" /> + <item name="Download" href="/download_lang.cgi" /> + <item name="Javadoc (1.0.0)" href="javadocs/api-1.0.0/index.html" /> + <item name="Javadoc (Latest)" href="javadocs/api-release/index.html" /> + </menu> + + <menu name="Development"> + <item name="Building" href="/building.html" /> + <item name="Mailing Lists" href="/mail-lists.html" /> + <item name="Issue Tracking" href="/issue-tracking.html" /> + <item name="Developer Guide" href="/developerguide.html" /> + <item name="Source Repository" href="/source-repository.html" /> + <item name="Javadoc (GIT latest)" href="apidocs/index.html" /> + </menu> + + <menu name="Components" inherit="top" img="icon-cog"> + <item name="Parent" href="index.html" /> + <item name="Generic" href="commons-testing-generic/index.html" /> + <item name="JUnit 4" href="commons-testing-junit4/index.html" /> + </menu> + + </body> + +</project> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/src/site/xdoc/developerguide.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/developerguide.xml b/src/site/xdoc/developerguide.xml index 232c001..b18b433 100644 --- a/src/site/xdoc/developerguide.xml +++ b/src/site/xdoc/developerguide.xml @@ -1,60 +1,60 @@ -<!-- - 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. ---> -<document> - <properties> - <title>Developer guide for Apache Commons Testing</title> - </properties> - <body> - - <section name='Developer guide for Apache Commons Testing'> - - <h1> - The Apache Commons - <em>Testing</em> - Component - </h1> - <h2>Developers Guide</h2> - <br /> - <a href="#Introduction">[Introduction]</a> - <a href="#PackageStructure">[Package Structure]</a> - <a href="#UtilityClasses">[Utility Classes]</a> - <a href="#Javadoc">[Javadoc]</a> - <a href="#Building">[Building]</a> - <br /> - <br /> - - <a name="Introduction"></a> - <h3>1. INTRODUCTION</h3> - - <a name="PackageStructure"></a> - <h3>2. PACKAGE STRUCTURE</h3> - - <a name="UtilityClasses"></a> - <h3>3. UTILITY CLASSES</h3> - - <a name="Javadoc"></a> - <h3>4. JAVADOC</h3> - - <a name="Building"></a> - <h3>5.BUILDING</h3> - <h4>Building a Release</h4> - <p> - Commons Testing targets Java 8. - </p> - </section> - </body> -</document> +<!-- + 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. +--> +<document> + <properties> + <title>Developer guide for Apache Commons Testing</title> + </properties> + <body> + + <section name='Developer guide for Apache Commons Testing'> + + <h1> + The Apache Commons + <em>Testing</em> + Component + </h1> + <h2>Developers Guide</h2> + <br /> + <a href="#Introduction">[Introduction]</a> + <a href="#PackageStructure">[Package Structure]</a> + <a href="#UtilityClasses">[Utility Classes]</a> + <a href="#Javadoc">[Javadoc]</a> + <a href="#Building">[Building]</a> + <br /> + <br /> + + <a name="Introduction"></a> + <h3>1. INTRODUCTION</h3> + + <a name="PackageStructure"></a> + <h3>2. PACKAGE STRUCTURE</h3> + + <a name="UtilityClasses"></a> + <h3>3. UTILITY CLASSES</h3> + + <a name="Javadoc"></a> + <h3>4. JAVADOC</h3> + + <a name="Building"></a> + <h3>5.BUILDING</h3> + <h4>Building a Release</h4> + <p> + Commons Testing targets Java 7. + </p> + </section> + </body> +</document> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 2085a02..b400af4 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -1,99 +1,99 @@ -<?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. ---> -<document> - <properties> - <title>Home</title> - <author email="d...@commons.apache.org">Commons Documentation Team</author> - </properties> -<body> -<!-- ================================================== --> -<section name="Apache Commons Testing"> - -<p> -TODO -</p> - -</section> -<!-- ================================================== --> -<section name="Documentation"> -<p> -The package descriptions in the <a href="javadocs/api-release/index.html">JavaDoc</a> give an overview of the available features -and various <a href="project-reports.html">project reports</a> are provided. -</p> -<p> -The JavaDoc API documents are available online: -</p> -<ul> -<li>The <a href="javadocs/api-1.0.0/index.html">current stable release 1.0.0</a> [Java 8]</li> -</ul> -<p> -The <a href="source-repository.html">git repository</a> can be -<a href="https://git-wip-us.apache.org/repos/asf?p=commons-testing.git">browsed</a>, or you can browse/contribute via <a href="https://github.com/apache/commons-testing">GitHub</a>. -</p> -</section> -<!-- ================================================== --> -<section name="Release Information"> -<p>The latest stable release of Lang is 1.0.0. You may: </p> -<ul> -<li>Download <a href="http://commons.apache.org/lang/download_lang.cgi">1.0.0</a></li> -<li>Read the <a href="RELEASE-NOTES.txt">1.0.0 release notes</a></li> -</ul> -<p> -Alternatively you can pull it from the central Maven repositories: -<pre> -<dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-testing</artifactId> - <version>1.0.0</version> -</dependency> -</pre> -</p> - -<p> -For information on previous releases see the <a href="release-history.html">Release History</a>, and to download previous releases see the <a href="http://archive.apache.org/dist/commons/testing/">Commons Testing Archive</a>. -</p> -</section> -<!-- ================================================== --> -<section name="Getting Involved"> -<p> -The <a href="mail-lists.html">commons developer mailing list</a> is the main channel of communication for contributors. Please remember that the lists are shared between all commons components, so prefix your email by [testing]. </p> -<p>You can also visit the #apache-commons IRC channel on irc.freenode.net or peruse <a href="issue-tracking.html">JIRA</a>. Specific links of interest for JIRA are:</p> -<ul> -<li>Ideas looking for code: <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20TEST%20AND%20resolution%20%3D%20Unresolved%20AND%20fixVersion%20%3D%20%22Patch%20Needed%22%20ORDER%20BY%20priority%20DESC">Patch Needed</a></li> -<li>Issues with patches, looking for reviews: <a href="https://issues.apache.org/jira/issues/?jql=fixVersion%20%3D%20%22Review%20Patch%22%20AND%20project%20%3D%20TEST%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC">Review Patch</a></li> -</ul> -<p>Alternatively you can go through the <em>Needs Work</em> tags in the <a href="taglist.html">TagList report</a>.</p> -<p>If you'd like to offer up pull requests via GitHub rather than applying patches to JIRA, we have a <a href="https://github.com/apache/commons-testing/">GitHub mirror</a>. </p> -</section> -<!-- ================================================== --> -<section name="Support"> -<p> -The <a href="mail-lists.html">commons mailing lists</a> act as the main support forum. -The user list is suitable for most library usage queries. -The dev list is intended for the development discussion. -Please remember that the lists are shared between all commons components, -so prefix your email by [lang]. -</p> -<p> -Bug reports and enhancements are also welcomed via the <a href="issue-tracking.html">JIRA</a> issue tracker. -Please read the instructions carefully. -</p> -</section> -<!-- ================================================== --> -</body> -</document> +<?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. +--> +<document> + <properties> + <title>Home</title> + <author email="d...@commons.apache.org">Commons Documentation Team</author> + </properties> +<body> +<!-- ================================================== --> +<section name="Apache Commons Testing"> + +<p> +TODO +</p> + +</section> +<!-- ================================================== --> +<section name="Documentation"> +<p> +The package descriptions in the <a href="javadocs/api-release/index.html">JavaDoc</a> give an overview of the available features +and various <a href="project-reports.html">project reports</a> are provided. +</p> +<p> +The JavaDoc API documents are available online: +</p> +<ul> +<li>The <a href="javadocs/api-1.0.0/index.html">current stable release 1.0.0</a> [Java 7]</li> +</ul> +<p> +The <a href="source-repository.html">git repository</a> can be +<a href="https://git-wip-us.apache.org/repos/asf?p=commons-testing.git">browsed</a>, or you can browse/contribute via <a href="https://github.com/apache/commons-testing">GitHub</a>. +</p> +</section> +<!-- ================================================== --> +<section name="Release Information"> +<p>The latest stable release of Lang is 1.0.0. You may: </p> +<ul> +<li>Download <a href="http://commons.apache.org/lang/download_lang.cgi">1.0.0</a></li> +<li>Read the <a href="RELEASE-NOTES.txt">1.0.0 release notes</a></li> +</ul> +<p> +Alternatively you can pull it from the central Maven repositories: +<pre> +<dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-testing</artifactId> + <version>1.0.0</version> +</dependency> +</pre> +</p> + +<p> +For information on previous releases see the <a href="release-history.html">Release History</a>, and to download previous releases see the <a href="http://archive.apache.org/dist/commons/testing/">Commons Testing Archive</a>. +</p> +</section> +<!-- ================================================== --> +<section name="Getting Involved"> +<p> +The <a href="mail-lists.html">commons developer mailing list</a> is the main channel of communication for contributors. Please remember that the lists are shared between all commons components, so prefix your email by [testing]. </p> +<p>You can also visit the #apache-commons IRC channel on irc.freenode.net or peruse <a href="issue-tracking.html">JIRA</a>. Specific links of interest for JIRA are:</p> +<ul> +<li>Ideas looking for code: <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20TEST%20AND%20resolution%20%3D%20Unresolved%20AND%20fixVersion%20%3D%20%22Patch%20Needed%22%20ORDER%20BY%20priority%20DESC">Patch Needed</a></li> +<li>Issues with patches, looking for reviews: <a href="https://issues.apache.org/jira/issues/?jql=fixVersion%20%3D%20%22Review%20Patch%22%20AND%20project%20%3D%20TEST%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC">Review Patch</a></li> +</ul> +<p>Alternatively you can go through the <em>Needs Work</em> tags in the <a href="taglist.html">TagList report</a>.</p> +<p>If you'd like to offer up pull requests via GitHub rather than applying patches to JIRA, we have a <a href="https://github.com/apache/commons-testing/">GitHub mirror</a>. </p> +</section> +<!-- ================================================== --> +<section name="Support"> +<p> +The <a href="mail-lists.html">commons mailing lists</a> act as the main support forum. +The user list is suitable for most library usage queries. +The dev list is intended for the development discussion. +Please remember that the lists are shared between all commons components, +so prefix your email by [testing]. +</p> +<p> +Bug reports and enhancements are also welcomed via the <a href="issue-tracking.html">JIRA</a> issue tracker. +Please read the instructions carefully. +</p> +</section> +<!-- ================================================== --> +</body> +</document> http://git-wip-us.apache.org/repos/asf/commons-testing/blob/e22cc4fe/target/antrun/build-main.xml ---------------------------------------------------------------------- diff --git a/target/antrun/build-main.xml b/target/antrun/build-main.xml index 59138bd..c4ec696 100644 --- a/target/antrun/build-main.xml +++ b/target/antrun/build-main.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <project name="maven-antrun-" default="main" > -<target name="main"> - <copy todir="C:\vcs\git\apache\commons\commons-testing\target/apidocs/META-INF"> - <fileset dir="C:\vcs\git\apache\commons\commons-testing"> - <include name="LICENSE.txt"/> - <include name="NOTICE.txt"/> - </fileset> - </copy> +<target name="main"> + <copy todir="C:\vcs\git\apache\commons\commons-testing\target/apidocs/META-INF"> + <fileset dir="C:\vcs\git\apache\commons\commons-testing"> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </fileset> + </copy> </target> </project> \ No newline at end of file