You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2022/11/24 14:40:55 UTC

[uima-uimaj] 01/01: Merge commit 'a43f366f653e5bcb8f243db4a8c11e583064b898' into upmerge

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch upmerge
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 8a47e1720eb6ce1544421e250680762eb90d9577
Merge: e9ef409f3 a43f366f6
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Nov 24 15:40:48 2022 +0100

    Merge commit 'a43f366f653e5bcb8f243db4a8c11e583064b898' into upmerge
    
    * commit 'a43f366f653e5bcb8f243db4a8c11e583064b898':
      Issue #258: Apache UIMA Java SDK 3.3.1 release
      Issue #258: Apache UIMA Java SDK 3.3.1 release
      Issue #258: Apache UIMA Java SDK 3.3.1 release
      Issue #260: Issues-fixed report for GitHub and Jira
      Issue #258: Apache UIMA Java SDK 3.3.1 release
      Issue #258: Apache UIMA Java SDK 3.3.1 release
      Issue #258: Apache UIMA Java SDK 3.3.1 release
    
    % Conflicts:
    %       pom.xml
    %       uimaj-eclipse-update-site/pom.xml

 README.md                        |  4 +--
 RELEASE_NOTES.md                 | 66 ++++++++++++------------------------
 pom.xml                          | 19 +++++++++++
 uimaj-legacy-jira-report/pom.xml | 73 ++++++++++++++++++++++++++++++++++++++++
 uimaj-parent/pom.xml             |  8 ++++-
 5 files changed, 122 insertions(+), 48 deletions(-)

diff --cc pom.xml
index 3f65aae5c,2d11cd77b..950dca882
--- a/pom.xml
+++ b/pom.xml
@@@ -332,42 -332,29 +333,60 @@@
      
      <profile>
        <id>apache-release</id>
 -      
 +
        <build>
 -        <!-- Run jira report -->
 -        <!-- depends on having -DjiraVersion set -->
          <plugins>
+           <plugin>
+             <artifactId>maven-changes-plugin</artifactId>
+             <executions>
+               <execution>
+                 <id>default-cli</id>
+                 <phase>generate-resources</phase>
+                 <goals>
+                   <goal>github-report</goal>
+                 </goals>
+                 <configuration>
+                   <columnNames>Type,Id,Status,Summary</columnNames>
+                   <onlyCurrentVersion>true</onlyCurrentVersion>
+                   <githubAPIScheme>https</githubAPIScheme>
+                   <githubAPIPort>443</githubAPIPort>
+                 </configuration>
+               </execution>
+             </executions>
+           </plugin>
 +          <plugin>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-antrun-plugin</artifactId>
 +            <inherited>false</inherited>
 +            <executions>
 +              <execution>
 +                <phase>install</phase>
 +                <goals>
 +                  <goal>run</goal>
 +                </goals>
 +                <configuration>
 +                  <target>
 +                    <mkdir dir="${staging-local-root}/${staging-folder}" />
 +                    <copy todir="${staging-local-root}/${staging-folder}">
 +                      <fileset dir="${project.build.directory}">
 +                        <include name="uimaj-${project.version}-*.zip" />
 +                        <include name="uimaj-${project.version}-*.zip.asc" />
 +                        <include name="uimaj-${project.version}-*.zip.sha512" />
 +                        <include name="uimaj-${project.version}-*.tar.gz" />
 +                        <include name="uimaj-${project.version}-*.tar.gz.asc" />
 +                        <include name="uimaj-${project.version}-*.tar.gz.sha512" />
 +                      </fileset>
 +                    </copy>
 +                    <copy todir="${staging-local-root}/${staging-folder}/eclipse-update-site">
 +                      <fileset dir="uimaj-eclipse-update-site/target/repository">
 +                        <include name="**/*" />
 +                      </fileset>
 +                    </copy>
 +                  </target>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
          </plugins>
        </build>
      </profile>