Skip to content
Permalink
Browse files
…ons-release-plugin into temp-6-13
  • Loading branch information
chtompki committed Jun 14, 2018
2 parents b96fa91 + fc71aa2 commit 7f0dc647ccb0db2adc8e9ce6358c4dae8b369dbe
Showing 6 changed files with 18 additions and 17 deletions.
@@ -16,4 +16,5 @@ site-content
.settings
.classpath
.project
.externalToolBuilders
.externalToolBuilders
/.checkstyle
@@ -18,7 +18,6 @@ language: java
sudo: false

jdk:
- openjdk7
- oraclejdk8

script:
14 pom.xml
@@ -76,8 +76,8 @@
<properties>
<!-- clirr.failOnError=False-->
<failOnError>false</failOnError>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.dependency.version>3.5.3</maven.dependency.version>
<commons.componentid>commons-release-plugin</commons.componentid>
<commons.jira.id>COMMONSSITE</commons.jira.id>
@@ -91,7 +91,7 @@
</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
<checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
<checkstyle.version>6.19</checkstyle.version>
<checkstyle.version>8.10.1</checkstyle.version>
<maven-scm.version>1.10.0</maven-scm.version>
<commons.jacoco.version>0.8.0</commons.jacoco.version>
<commons.jacoco.classRatio>0.1</commons.jacoco.classRatio>
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.16.1</version>
<version>1.17</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
@@ -199,7 +199,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.8</version>
<version>1.2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -260,7 +260,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-ant</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
</dependencies>

@@ -28,6 +28,7 @@
<release version="1.3" date="YYYY-MM-DD" description="TBD">
<action issue="COMMONSSITE-113" type="update" dev="chtompki">Put unpacked site in scm dev dist directory for navigating purposes.</action>
<action issue="COMMONSSITE-108" type="add" dev="chtompki">Adding README.html and HEADER.html to staged release</action>
<action type="update" dev="ggregory">Update platform requirement from Java 7 to Java 8.</action>
</release>

<release version="1.2" date="2018-04-02" description="Version 1.2">
@@ -314,7 +314,6 @@ private void commitFiles(List<File> filesToCommit, ScmProvider provider, ScmRepo
* can properly handle the exception.
*/
private File copyReleaseNotesToWorkingDirectory() throws MojoExecutionException {
StringBuffer copiedReleaseNotesAbsolutePath;
SharedFunctions.initDirectory(getLog(), distVersionRcVersionDirectory);
getLog().info("Copying RELEASE-NOTES.txt to working directory.");
File copiedReleaseNotes = new File(distVersionRcVersionDirectory, releaseNotesFile.getName());
@@ -327,18 +326,19 @@ private File copyReleaseNotesToWorkingDirectory() throws MojoExecutionException
* the directory structure of the distribution staging repository. Specifically:
* <ul>
* <li>root:</li>
* <li><ul>
* <ul>
* <li>site</li>
* <li>site.zip</li>
* <li>RELEASE-NOTES.txt</li>
* <li>source:</li>
* <li><ul>
* <ul>
* <li>-src artifacts....</li>
* </ul></li>
* </ul>
* <li>binaries:</li>
* <li><ul>
* <ul>
* <li>-bin artifacts....</li>
* </ul></li>
* </ul></li>
* </ul>
* </ul>
* </ul>
*
* @param copiedReleaseNotes is the RELEASE-NOTES.txt file that exists in the
@@ -16,7 +16,7 @@
-->
<h1>${artifactIdWithFirstLetterscapitalized} v${version}.</h1>

<p>This is the 1.3 version of commons-text. It is available in both binary and source distributions.</p>
<p>This is the ${version} version of ${artifactId}. It is available in both binary and source distributions.</p>


<p><font color="red" size="+2">Note:</font>

0 comments on commit 7f0dc64

Please sign in to comment.