Merge branch 'main' into bugfix/240-Helper-annotation-created-by-Sele…

…ctFS-should-not-survive * main: (57 commits) Issue #228 - Move the UimaDecompiler class Issue #226: Provide SPI interfaces to locate descriptors Issue #228 - Move the UimaDecompiler class Issue #230: Remove version overrides in Maven plugin modules Issue #226: Provide SPI interfaces to locate descriptors [UIMA-6481] Enable issue management in GitHub repos [UIMA-6474] Switch to getDataPathElements() in UimaContext [UIMA-6474] Switch to getDataPathElements() in UimaContext [UIMA-6474] Switch to getDataPathElements() in UimaContext [No Jira] Remove outdated figure [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6459] Upgrade dependencies [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8 [UIMA-6462] Avoid deploy broken checksum files for p2content.xml and artifacts.xml in feature modules [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide ...
apache · Aug 15, 2022 · 5111a2c · 5111a2c
2 parents 819c18d + 2f6692a
commit 5111a2c
Show file tree

Hide file tree

Showing 72 changed files with 1,980 additions and 1,036 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -1,19 +1,55 @@
-#   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
+# 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
 #
-#   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://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.
+#
+
 github:
-  description: "UIMA Java SDK, version 3 (in main), 2 (in main-v2)"
+  description: "Apache UIMA Java SDK"
   homepage: https://uima.apache.org
+  dependabot_alerts:  true
+  dependabot_updates: false
+  notifications:
+    commits:      commits@uima.apache.org
+    issues:       dev@uima.apache.org
+    pullrequests: dev@uima.apache.org
+    jobs:         dev@uima.apache.org
+    jira_options: link label
+  labels:
+  - apache
+  - uima
+  - text-analysis
+  - java
+  features:
+    wiki: false
+    issues: true
+    projects: true
+  enabled_merge_buttons:
+    squash:  true
+    merge:   true
+    rebase:  false
+  del_branch_on_merge: true
+  protected_branches:
+    main:
+     required_status_checks:
+        strict: true
+        contexts:
+          - continuous-integration/jenkins/pr-merge
+    main-v2:
+     required_status_checks:
+        strict: true
+        contexts:
+          - continuous-integration/jenkins/pr-merge
+
+
diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
@@ -50,7 +50,6 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -25,9 +25,9 @@
 
 [What is UIMA?](#what.is.uima)  
 [Major Changes in this Release](#major.changes)  
+[List of JIRA Issues Fixed in this Release](#list.issues)  
 [How to Get Involved](#get.involved)  
 [How to Report Issues](#report.issues)  
-[List of JIRA Issues Fixed in this Release](#list.issues)  
 
 ## <a id="what.is.uima">What is UIMA?</a>
 

diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
@@ -68,5 +68,6 @@
     <module>../uima-docbook-tutorials-and-users-guides</module>
     <!-- Converted to Asciidoc -->
     <module>../uima-doc-v3-users-guide</module>
+    <module>../uima-doc-v3-maintainers-guide</module>
   </modules>
 </project>
diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml
@@ -17,13 +17,15 @@
    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">
+<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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
@@ -44,9 +46,9 @@
     <module>../uimaj-ep-cas-editor-ide</module>
     <module>../uimaj-ep-runtime</module>
 
-    <!-- remove because of Jenkins / versioning issues -->
-    <!-- see  https://issues.apache.org/jira/browse/UIMA-2497 -->
     <module>../uimaj-eclipse-feature-tools</module>
     <module>../uimaj-eclipse-feature-runtime</module>
+    <module>../uimaj-eclipse-update-site</module>
+    <module>../uimaj-eclipse-maven-p2-site</module>
   </modules>
 </project>
diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/jVinci/pom.xml b/jVinci/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
@@ -55,7 +55,6 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/...e/marker-file-identifying-eclipse-feature → marker-file-enabling-auto-staging b/...e/marker-file-identifying-eclipse-feature → marker-file-enabling-auto-staging
diff --git a/...s/marker-file-identifying-eclipse-feature → marker-file-enabling-tycho-release b/...s/marker-file-identifying-eclipse-feature → marker-file-enabling-tycho-release
diff --git a/...rker-file-identifying-eclipse-update-site → marker-file-identifying-parent-pom b/...rker-file-identifying-eclipse-update-site → marker-file-identifying-parent-pom
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
     <relativePath>uimaj-parent/pom.xml</relativePath>
   </parent>
 
@@ -39,20 +39,19 @@
   <description>The top project for the UIMA Java SDK</description>
   <url>${uimaWebsiteUrl}</url>
 
-  <properties>
-    <jiraVersion>3.3.0SDK</jiraVersion>   
-    <assemblyFinalName>uimaj-${project.version}</assemblyFinalName> 
-    <assemblyBinDescriptor>src/main/assembly/bin-without-jackson.xml</assemblyBinDescriptor> 
-    <postNoticeText>${ibmNoticeText}</postNoticeText>    
-  </properties>
-
   <scm>
     <connection>scm:git:https://github.com/apache/uima-uimaj/</connection>
     <developerConnection>scm:git:https://github.com/apache/uima-uimaj/</developerConnection>
     <url>https://github.com/apache/uima-uimaj/</url>
     <tag>uimaj-3.2.0</tag>
   </scm>
 
+  <properties>
+    <jiraVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}SDK</jiraVersion>
+    <assemblyBinDescriptor>src/main/assembly/bin-without-jackson.xml</assemblyBinDescriptor> 
+    <postNoticeText>${ibmNoticeText}</postNoticeText>    
+  </properties>
+
   <!-- dependencies that go into the various builds via dependency-sets -->
   <!-- version is specified here -->
   <!-- default scope is compile -->
@@ -139,22 +138,22 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-json</artifactId>
       <version>${project.version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-v3migration-jcas</artifactId>
       <version>${project.version}</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.bitbucket.mstrobel</groupId>
       <artifactId>procyon-core</artifactId>
       <version>0.5.32</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.bitbucket.mstrobel</groupId>
       <artifactId>procyon-compilertools</artifactId>
       <version>0.5.32</version>
-    </dependency>  
+    </dependency>
     <dependency>    <!-- apache v2 license  2016 checked -->
       <groupId>com.github.javaparser</groupId>
       <artifactId>javaparser-core</artifactId>
@@ -173,18 +172,17 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
       <version>${log4j-version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
       <version>${log4j-version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
       <version>${log4j-version}</version>
-    </dependency>    
-
+    </dependency>
   </dependencies>
 
 
@@ -273,6 +271,7 @@
                 <!-- default configuration -->
               <configuration>
                 <excludes combine.children="append">
+                  <exclude>marker-file-rc-auto-staging-module</exclude>
                   <!-- These markdown files cannot bear a license header -->
                   <exclude>NOTICE.md</exclude>
                   <exclude>src/main/bin_distr_license_notices/NOTICE.md</exclude>
@@ -293,6 +292,7 @@
                   <exclude>uimaj-cpe/**</exclude>
                   <exclude>uimaj-document-annotation/**</exclude>
                   <exclude>uimaj-eclipse-*/**</exclude>
+                  <exclude>uimaj-maven-p2-site/**</exclude>
                   <exclude>uimaj-ep-*/**</exclude>
                   <exclude>uimaj-examples/**</exclude>
                   <exclude>uimaj-test-util/**</exclude>
@@ -332,23 +332,43 @@
 
     <profile>
       <id>apache-release</id>
-      
+
       <build>
-        <!-- Run jira report -->
-        <!-- depends on having -DjiraVersion set -->
         <plugins>
           <plugin>
-            <artifactId>maven-changes-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <inherited>false</inherited>
             <executions>
               <execution>
-                <id>default-cli</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
                 <configuration>
-                  <fixVersionIds>${jiraVersion}</fixVersionIds>
+                  <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>  
+            </executions>
           </plugin>
-        </plugins>     
+        </plugins>
       </build>
     </profile>
 

diff --git a/stage-relesase-artifacts.sh b/stage-relesase-artifacts.sh