diff --git a/uima-addons-2.3.1-disable-embedded-dependencies.patch b/uima-addons-2.3.1-disable-embedded-dependencies.patch
new file mode 100644
index 0000000..7ea8067
--- /dev/null
+++ b/uima-addons-2.3.1-disable-embedded-dependencies.patch
@@ -0,0 +1,20 @@
+--- uima-addons-parent/pom.xml	2011-08-24 09:50:02.000000000 +0200
++++ uima-addons-parent/pom.xml-gil	2013-09-09 13:24:26.636180564 +0200
+@@ -456,15 +456,11 @@
+ 	                <buildDirectory>${project.build.directory}/osgi</buildDirectory>
+ 	                <manifestLocation>${project.build.directory}/osgi/META-INF</manifestLocation>
+ 	                <instructions>
+-	                  <Import-Package>org.apache.log.*;resolution:=optional</Import-Package>
+-	                  <Embed-Dependency>*;scope=compile;</Embed-Dependency>
+-	                  <Embed-Directory>lib</Embed-Directory>
++	                  <Import-Package>*;resolution:=optional</Import-Package>
+ 	                  <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ 	                  <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+-                    <Bundle-ClassPath>.,lib/${project.build.finalName}.jar,{maven-dependencies},lib/uimaj-core-${uimaDependencyVersion}.jar</Bundle-ClassPath>
+                     <Include-Resource>
+-                      {maven-resources}, {maven-dependencies},
+-                      lib/uimaj-core-${uimaDependencyVersion}.jar=${settings.localRepository}/org/apache/uima/uimaj-core/${uimaDependencyVersion}/uimaj-core-${uimaDependencyVersion}.jar
++                      {maven-resources}
+                     </Include-Resource>
+ 	                  <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+ 	                  <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
diff --git a/uima-addons-2.3.1-httpclient.patch b/uima-addons-2.3.1-httpclient.patch
new file mode 100644
index 0000000..ccd2d7a
--- /dev/null
+++ b/uima-addons-2.3.1-httpclient.patch
@@ -0,0 +1,21 @@
+--- SimpleServer/src/main/java/org/apache/uima/simpleserver/util/HttpClientUtils.java	2011-08-24 09:50:00.000000000 +0200
++++ SimpleServer/src/main/java/org/apache/uima/simpleserver/util/HttpClientUtils.java-gil	2013-09-09 15:46:38.106704930 +0200
+@@ -44,13 +44,13 @@
+     url = new URL("http", host, port, file);
+     method = new HttpGet(url.toString());
+     HttpResponse response = null;
+-    try {
++//    try {
+     response = httpClient.execute(method);
+-    } catch (InterruptedException e) {
++//    } catch (InterruptedException e) {
+       // If we get here, something's seriously wrong
+-      e.printStackTrace();
+-      return null;
+-    }
++//      e.printStackTrace();
++//      return null;
++//    }
+     return response;
+   }
+ 
diff --git a/uima-addons-2.3.1-source-release.zip b/uima-addons-2.3.1-source-release.zip
new file mode 100644
index 0000000..21d3711
Binary files /dev/null and b/uima-addons-2.3.1-source-release.zip differ
diff --git a/uima-addons.spec b/uima-addons.spec
new file mode 100644
index 0000000..4c8213f
--- /dev/null
+++ b/uima-addons.spec
@@ -0,0 +1,117 @@
+Name:                uima-addons
+Version:             2.3.1
+Release:             1
+Summary:             Apache UIMA Addons components
+License:             ASL 2.0
+URL:                 http://uima.apache.org/sandbox.html
+Source0:             http://archive.apache.org/dist/uima/%{name}-%{version}-source-release.zip
+# fix bundle plugin configuration
+Patch0:              %{name}-%{version}-disable-embedded-dependencies.patch
+# fix build for httpclient > 4.0
+Patch1:              %{name}-%{version}-httpclient.patch
+BuildRequires:       mvn(bsf:bsf) mvn(commons-digester:commons-digester) mvn(commons-io:commons-io)
+BuildRequires:       mvn(commons-lang:commons-lang) mvn(commons-logging:commons-logging-api)
+BuildRequires:       mvn(javax.xml.stream:stax-api) mvn(log4j:log4j:1.2.17) mvn(org.apache.ant:ant)
+BuildRequires:       mvn(org.apache.httpcomponents:httpclient) mvn(org.apache.uima:parent-pom:pom:)
+BuildRequires:       mvn(org.apache.uima:uimaj-core) mvn(org.apache.uima:uimaj-document-annotation)
+BuildRequires:       mvn(org.apache.xmlbeans:xmlbeans) mvn(org.beanshell:bsh)
+BuildRequires:       mvn(org.tartarus:snowball) mvn(rhino:js)
+BuildRequires:       mvn(org.apache.tomcat:tomcat-servlet-api)
+%if 0
+BuildRequires:       mvn(org.apache.lucene:lucene-snowball:2.9.3)
+BuildRequires:       mvn(org.apache.solr:solr-core:3.1.0) mvn(org.apache.solr:solr-solrj:3.1.0)
+BuildRequires:       mvn(org.apache.tika:tika-core:0.7) mvn(org.apache.tika:tika-parsers:0.7)
+BuildRequires:       mvn(org.apache.uima:uimaj-examples:2.3.1)
+BuildRequires:       mvn(org.eclipse.emf.ecore:xmi:2.3.0-v200706262000)
+BuildRequires:       mvn(org.eclipse.emf:common:2.3.0-v200706262000)
+BuildRequires:       mvn(org.eclipse.emf:ecore:2.3.0-v200706262000)
+BuildRequires:       mvn(org.mortbay.jetty:jetty:6.1.8)
+%endif
+BuildRequires:       mvn(junit:junit) mvn(org.apache.uima:uimaj-test-util)
+BuildRequires:       mvn(org.apache.uima:uimaj-component-test-util)
+BuildRequires:       maven-local mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires:       mvn(org.apache.uima:PearPackagingMavenPlugin)
+BuildRequires:       mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:       mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires:       mvn(org.codehaus.mojo:xmlbeans-maven-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-antrun-plugin) mvn(ant-contrib:ant-contrib)
+BuildRequires:       mvn(org.apache.ant:ant-apache-regexp)
+BuildArch:           noarch
+%description
+UIMA Addons is a collection of Annotators extracted for
+sandbox for official distribution. It also provides
+Simple Server and Pear packaging tools.
+
+%package javadoc
+Summary:             Javadoc for %{name}
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+%patch0 -p0
+%patch1 -p0
+%pom_remove_plugin :maven-assembly-plugin uima-addons-parent
+%pom_remove_plugin :maven-dependency-plugin uima-addons-parent
+%pom_remove_plugin :maven-resources-plugin uima-addons-parent
+%pom_remove_plugin :maven-javadoc-plugin uima-addons-parent
+%pom_disable_module ConfigurableFeatureExtractor
+%pom_disable_module Lucas
+%pom_disable_module Solrcas
+%pom_disable_module TikaAnnotator
+%pom_remove_dep org.mortbay.jetty:jetty SimpleServer
+rm -r SimpleServer/src/main/java/org/apache/uima/simpleserver/util/JettyUtils.java \
+ SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ServerFailureTest.java \
+ SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ServerTest.java
+for p in AlchemyAPIAnnotator BSFAnnotator ConceptMapper DictionaryAnnotator \
+ FsVariables OpenCalaisAnnotator PearPackagingAntTask RegularExpressionAnnotator \
+ SimpleServer SnowballAnnotator Tagger WhitespaceTokenizer; do
+%pom_xpath_remove "pom:project/pom:build/pom:finalName" ${p}
+done
+for m in ConfigurableFeatureExtractor DictionaryAnnotator RegularExpressionAnnotator SimpleServer; do
+%pom_remove_dep org.apache.geronimo.specs:geronimo-stax-api_1.0_spec  ${m}
+%pom_add_dep javax.xml.stream:stax-api:1.0.1 ${m}
+done
+rm -r SnowballAnnotator/src/main/java/org/tartarus
+%pom_add_dep org.tartarus:snowball SnowballAnnotator
+rm SnowballAnnotator/src/test/java/org/apache/uima/annotator/SnowballAnnotatorTest.java
+rm -r AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java
+sed -i 's/\r//' LICENSE NOTICE
+rm -r AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/HtmlMicroformatsAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextCategorizationAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextConceptTaggingAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextKeywordExtractionAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextLanguageDetectionAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextSentimentAnalysisAnnotatorTest.java \
+ OpenCalaisAnnotator/src/test/java/org/apache/uima/annotator/calais/OpenCalaisAnnotatorTest.java
+rm -f AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/URLMicroformatsAnnotatorTest.java
+sed -i "s|<groupId>javax.servlet</groupId>|<groupId>org.apache.tomcat</groupId>|" SimpleServer/pom.xml
+sed -i "s|<artifactId>servlet-api</artifactId>|<artifactId>tomcat-servlet-api</artifactId>|" SimpleServer/pom.xml
+sed -i "s|<version>2.4.0</version>|<version>2.6.0</version>|" SimpleServer/pom.xml
+sed -i "s|<version>2.4.0</version>|<version>2.6.0</version>|" ConfigurableFeatureExtractor/pom.xml
+sed -i "s|<version>2.4.0</version>|<version>2.6.0</version>|" RegularExpressionAnnotator/pom.xml
+sed -i "s|<version>2.4.0</version>|<version>2.6.0</version>|" DictionaryAnnotator/pom.xml
+sed -i "s|<version>1.2.14</version>|<version>1.2.17</version>|" BSFAnnotator/pom.xml
+%mvn_package ::pear: __noinstall
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc RELEASE_NOTES.html
+%license LICENSE NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
+
+%changelog
+* Wed Aug 19 2020 maminjie <maminjie1@huawei.com> - 2.3.1-1
+- package init
diff --git a/uima-addons.yaml b/uima-addons.yaml
new file mode 100644
index 0000000..b3a6a58
--- /dev/null
+++ b/uima-addons.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: apache/uima-addons
+tag_prefix: "uima-addons-"
+seperator: "."