Author: cwiklik
Date: Tue Feb 13 01:58:57 2018
New Revision: 1824088

URL: http://svn.apache.org/viewvc?rev=1824088&view=rev
Log:
UIMA-3476 automate version strings in README and RELEASE_NOTES.html by using 
placeholder ${project.version} 

Modified:
    uima/uima-ducc/trunk/README
    uima/uima-ducc/trunk/RELEASE_NOTES.html
    uima/uima-ducc/trunk/pom.xml
    uima/uima-ducc/trunk/src/main/assembly/bin.xml

Modified: uima/uima-ducc/trunk/README
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/README?rev=1824088&r1=1824087&r2=1824088&view=diff
==============================================================================
--- uima/uima-ducc/trunk/README (original)
+++ uima/uima-ducc/trunk/README Tue Feb 13 01:58:57 2018
@@ -1,4 +1,4 @@
-              Apache Distributed UIMA Cluster Computing (DUCC) Version 2.2.1 
README
+              Apache Distributed UIMA Cluster Computing (DUCC) Version 
${project.version} README
               
 
 1. Building from the Source Distribution

Modified: uima/uima-ducc/trunk/RELEASE_NOTES.html
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/RELEASE_NOTES.html?rev=1824088&r1=1824087&r2=1824088&view=diff
==============================================================================
--- uima/uima-ducc/trunk/RELEASE_NOTES.html (original)
+++ uima/uima-ducc/trunk/RELEASE_NOTES.html Tue Feb 13 01:58:57 2018
@@ -20,10 +20,10 @@
    ***************************************************************
    -->
 <head>
-  <title>Apache Distributed UIMA Cluster Computing (DUCC) 2.2.1 Release 
Notes</title>
+  <title>Apache Distributed UIMA Cluster Computing (DUCC) ${project.version} 
Release Notes</title>
 </head>
 <body>
-<h1>Apache UIMA-DUCC (Unstructured Information Management Architecture - 
Distributed UIMA Cluster Computing ) v.2.2.1 Release Notes</h1>
+<h1>Apache UIMA-DUCC (Unstructured Information Management Architecture - 
Distributed UIMA Cluster Computing ) v.${project.version} Release Notes</h1>
 
 <h2>Contents</h2>
 <p>
@@ -45,7 +45,7 @@ provides cluster management services to
       
 <h2><a name="major.changes">2. Major Changes in this Release</a></h2>
 <p>
-Apache UIMA DUCC 2.2.1 is a maintenance release containing new features and 
bug fixes. What's new:<br>
+Apache UIMA DUCC ${project.version} is a maintenance release containing new 
features and bug fixes. What's new:<br>
 
 <ul>
 <li>The userid of a privileged DUCC installation does not have to be 
"ducc"</li>
@@ -62,7 +62,7 @@ Apache UIMA DUCC 2.2.1 is a maintenance
 For a complete list of issues fixed and up-to-date information on UIMA-DUCC 
issues, see our issue tracker: 
 <a 
href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20UIMA%20AND%20fixVersion%20%3D%20%222.2.1-Ducc%22%20";>https://issues.apache.org/jira/issues/?jql=project%20%3D%20UIMA%20AND%20fixVersion%20%3D%20%222.2.1-Ducc%22%20</a>
 
-This version of DUCC includes UIMA-SDK v.2.9.0, UIMA-AS v.2.9.0, and ActiveMQ 
v.5.14.0.
+This version of DUCC includes UIMA-SDK v.2.10.2, UIMA-AS v.2.10.2, and 
ActiveMQ v.5.15.2.
 </p> 
       
 <h2><a name="migration">3. Migration from a Prior Release</a></h2>
@@ -84,6 +84,8 @@ able to test for AnalysisEngineProcessEx
 
    if ( error instanceof AnalysisEngineProcessException ) ...
 
+To use OS-based login with the WebServer while running DUCC with IBM java, the 
minimum JDK version is 
+Java 8 SR4 FP5 (8.0.4.5).
 
 </body>
 </html>

Modified: uima/uima-ducc/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/pom.xml?rev=1824088&r1=1824087&r2=1824088&view=diff
==============================================================================
--- uima/uima-ducc/trunk/pom.xml (original)
+++ uima/uima-ducc/trunk/pom.xml Tue Feb 13 01:58:57 2018
@@ -209,12 +209,43 @@
                </dependency>
        </dependencies>
        <build>
-               <resources />
+               <resources/>
 
 
 
                <plugins>
 
+<plugin>
+  <groupId>org.apache.maven.plugins</groupId>
+  <artifactId>maven-resources-plugin</artifactId>
+  <version>3.0.1</version>
+  <executions>
+    <execution>
+      <id>readme-releasenotes-version-replace</id>
+      <phase>process-resources</phase>
+      <goals>
+        <goal>copy-resources</goal>
+      </goals>
+      <configuration>
+        <outputDirectory>${project.basedir}/target</outputDirectory>
+        <resources>                                        
+          <resource>
+            <directory>${project.basedir}</directory>
+            <includes>
+              <include>README</include>
+              <include>RELEASE_NOTES.html</include>
+            </includes>
+            <filtering>true</filtering>
+          </resource>
+        </resources>
+        <encoding>UTF-8</encoding>
+      </configuration>            
+    </execution>
+  </executions>
+</plugin>
+
+
+
                        <!-- This java doc config is for building the ones 
distributed with the 
                                bin packaging, and also posted on our website. 
-->
                        <plugin>

Modified: uima/uima-ducc/trunk/src/main/assembly/bin.xml
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1824088&r1=1824087&r2=1824088&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-ducc/trunk/src/main/assembly/bin.xml Tue Feb 13 01:58:57 2018
@@ -305,6 +305,16 @@ under the License.
       <directoryMode>755</directoryMode>        
     </fileSet>
     
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>README</include>
+        <include>RELEASE_NOTES.html</include>
+      </includes>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>        
+    </fileSet>
     <!--      JETTY  -->
     <fileSet>
       
<directory>target/jetty/jetty-distribution-${jetty.version}/lib</directory>
@@ -388,8 +398,8 @@ under the License.
       <outputDirectory></outputDirectory>
       <includes>
         <include>issuesFixed/**</include>
-        <include>README</include>
-        <include>RELEASE_NOTES.html</include>
+        <include>target/README</include>
+        <include>target/RELEASE_NOTES.html</include>
         <!-- Temporarily disable the include below for 1.1.0-Ducc release -->
         <!-- JIRAs bug prevents more than 100 jiras in the report produced -->
         <!-- by maven changes plugin. Workaround is to generate report     -->


Reply via email to