Merge pull request #236 from apache/refactoring/235-Update-dependencies

Issue #235: Update dependencies
apache · Aug 11, 2023 · e1a060f · e1a060f
2 parents 5cf2377 + 7148639
commit e1a060f
Show file tree

Hide file tree

Showing 32 changed files with 193 additions and 1,034 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ target/
 api-change-report/
 issuesFixed
 .idea
+.factorypath
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,5 +18,6 @@
 @Library('uima-build-jenkins-shared-library') _
 
 defaultPipeline {
-  extraMavenArguments = '-Pjacoco,spotbugs,pmd,run-rat-report -Ddisable-rc-auto-staging'
+  // extraMavenArguments = '-Pjacoco,spotbugs,pmd -Ddisable-rc-auto-staging'
+  extraMavenArguments = '-Ddisable-rc-auto-staging'
 }
diff --git a/pom.xml b/pom.xml
@@ -88,9 +88,6 @@
               <doctitle>Apache uimaFIT ${project.version} User-Level API Documentation</doctitle>
               <windowtitle>Apache uimaFIT ${project.version} User-Level API Documentation</windowtitle>
               <notimestamp>true</notimestamp>
-              <links>
-                <link>https://uima.apache.org/d/uimaj-${uima-version}/apidocs/</link>
-              </links>
               <groups>
                 <group>
                   <title>uimaFIT</title>
@@ -140,7 +137,7 @@
     <module>uimafit-examples</module>
     <module>uimafit-spring</module>
     <module>uimafit-maven-plugin</module>
-    <module>uimafit-doc</module>
+    <module>uimafit-documentation</module>
     <module>uimafit-cpe</module>
     <module>uimafit-benchmark</module>
     <module>uimafit-parent</module>

diff --git a/uimafit-assertj/pom.xml b/uimafit-assertj/pom.xml
@@ -54,7 +54,7 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
 						<Require-Capability>
 							osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional,
 							osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.fit.validation.ValidationCheck)";cardinality:=multiple;resolution:=optional

diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml
@@ -100,7 +100,7 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
             <_dsannotations>*</_dsannotations>
             <_metatypeannotations>*</_metatypeannotations>
             <Import-Package>

diff --git a/uimafit-cpe/pom.xml b/uimafit-cpe/pom.xml
@@ -47,4 +47,18 @@
       <artifactId>uimaj-core</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/uimafit-docbook/pom.xml b/uimafit-docbook/pom.xml
diff --git a/uimafit-docbook/src/docbook/tools.uimafit.configurationparameters.xml b/uimafit-docbook/src/docbook/tools.uimafit.configurationparameters.xml