From 740cb0ae619d19f2ade181743742ad6bb6da6ccd Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 13 Feb 2015 18:24:49 +0100 Subject: [PATCH 01/13] introduce license macro --- uimaj.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/uimaj.spec b/uimaj.spec index 3ce6d92..7f5b405 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,13 +1,11 @@ Name: uimaj Version: 2.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ Source0: http://www.apache.org/dist/uima/%{name}-%{version}/%{name}-%{version}-source-release.zip -BuildRequires: java-devel - BuildRequires: mvn(ant-contrib:ant-contrib) BuildRequires: mvn(axis:axis) BuildRequires: mvn(axis:axis-jaxrpc) @@ -135,10 +133,11 @@ rm -r %{name}-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationView sed -i "s|1.2.8|1.2.17|" %{name}-core/pom.xml -%build - %mvn_package :PearPackagingMavenPlugin uima-pear-maven-plugin %mvn_package :jcasgen-maven-plugin jcasgen-maven-plugin + +%build + %mvn_build -- -Dproject.build.sourceEncoding=UTF-8 %install @@ -146,18 +145,22 @@ sed -i "s|1.2.8|1.2.17|" %{name}-core/pom. %files -f .mfiles %dir %{_javadir}/%{name} -%doc LICENSE NOTICE README RELEASE_NOTES.html +%doc README RELEASE_NOTES.html +%license LICENSE NOTICE %files -n jcasgen-maven-plugin -f .mfiles-jcasgen-maven-plugin -%doc LICENSE NOTICE +%license LICENSE NOTICE %files -n uima-pear-maven-plugin -f .mfiles-uima-pear-maven-plugin -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Feb 13 2015 gil cattaneo 2.5.0-4 +- introduce license macro + * Sun Jun 08 2014 Fedora Release Engineering - 2.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -171,4 +174,4 @@ sed -i "s|1.2.8|1.2.17|" %{name}-core/pom. - update to 2.4.2 * Wed Feb 06 2013 gil cattaneo 2.4.0-1 -- initial rpm \ No newline at end of file +- initial rpm From 0efc8933aeabc2ad9a09fea5b94e43518bf08642 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:29:29 +0000 Subject: [PATCH 02/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index 7f5b405..8ba0303 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -158,6 +158,9 @@ sed -i "s|1.2.8|1.2.17|" %{name}-core/pom. %license LICENSE NOTICE %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 13 2015 gil cattaneo 2.5.0-4 - introduce license macro From 09096e32f55718ce1b034337f8a705c968e7d890 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 19 Jun 2015 16:17:53 +0200 Subject: [PATCH 03/13] disable doclint in javadoc --- uimaj.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uimaj.spec b/uimaj.spec index 8ba0303..4b6504a 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -85,6 +85,9 @@ find . -name "*.cmd" -delete # Build @ random fails %pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :maven-javadoc-plugin jcasgen-maven-plugin + # Unavailable libraries # e.g. # UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib/uimaj-as-core.jar From 56f34f304f2f82aeaba59b046ba61fbd42630c27 Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 5 Sep 2015 23:46:41 +0200 Subject: [PATCH 04/13] update to 2.8.1 --- .gitignore | 1 + sources | 2 +- uimaj.spec | 66 ++++++++++++++++++++---------------------------------- 3 files changed, 26 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 3041c58..df65e88 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /uimaj-2.5.0-source-release.zip +/uimaj-2.8.1-source-release.zip diff --git a/sources b/sources index 3d74a35..768f91b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40422ab17c74c97cd8f158d27c98528d uimaj-2.5.0-source-release.zip +377bb6ac02085dba20527af6daa3629f uimaj-2.8.1-source-release.zip diff --git a/uimaj.spec b/uimaj.spec index 4b6504a..624d627 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,40 +1,33 @@ Name: uimaj -Version: 2.5.0 -Release: 5%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ Source0: http://www.apache.org/dist/uima/%{name}-%{version}/%{name}-%{version}-source-release.zip +BuildRequires: maven-local BuildRequires: mvn(ant-contrib:ant-contrib) BuildRequires: mvn(axis:axis) BuildRequires: mvn(axis:axis-jaxrpc) +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache.commons:commons-logging) -# maven plugins +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +BuildRequires: mvn(org.apache.ant:ant-apache-regexp) BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc) BuildRequires: mvn(org.apache.uima:parent-pom:pom:) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) - -BuildRequires: apache-rat-plugin -BuildRequires: maven-local -BuildRequires: maven-dependency-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-invoker-plugin -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-plugin-bundle -BuildRequires: maven-plugin-plugin -BuildRequires: maven-remote-resources-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: mvn(org.apache.ant:ant-apache-regexp) +BuildRequires: mvn(xmlunit:xmlunit) BuildArch: noarch @@ -78,24 +71,11 @@ find . -name "*.bat" -delete find . -name "*.class" -delete find . -name "*.cmd" -delete -# [ERROR] uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java -# cannot access org.apache.commons.logging.Log -%pom_add_dep org.apache.commons:commons-logging %{name}-adapter-soap - # Build @ random fails -%pom_remove_plugin :apache-rat-plugin - -%pom_remove_plugin :maven-javadoc-plugin -%pom_remove_plugin :maven-javadoc-plugin jcasgen-maven-plugin - -# Unavailable libraries -# e.g. -# UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib/uimaj-as-core.jar -# UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib/uimaj-as-activemq.jar -# UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib/uimaj-as-jms.jar -# for now, until all deps aren't available, i prefer don't install script files -# or systemd support -# src/main/scripts/*.sh +%pom_remove_plugin -r :apache-rat-plugin +# org.semver:enforcer-rule:0.9.33 +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :maven-javadoc-plugin # Remove eclipse stuff (dont provides pom or depmap file) %pom_disable_module ../aggregate-%{name}-eclipse-plugins aggregate-%{name} @@ -108,11 +88,12 @@ find . -name "*.cmd" -delete %pom_remove_dep org.apache.uima:%{name}-ep-cas-editor-ide %pom_remove_dep org.apache.uima:%{name}-ep-launcher %pom_remove_dep org.apache.uima:%{name}-examples -#%%pom_remove_dep org.eclipse.emf:common %%{name}-examples -#%%pom_remove_dep org.eclipse.emf:ecore %%{name}-examples -#%%pom_remove_dep org.eclipse.emf:ecore-xmi %%{name}-examples %pom_disable_module ../%{name}-examples aggregate-%{name} +# [ERROR] uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java +# cannot access org.apache.commons.logging.Log +%pom_add_dep org.apache.commons:commons-logging %{name}-adapter-soap + # Use system jvm apis %pom_remove_dep org.apache.geronimo.specs:geronimo-activation_1.0.2_spec %{name}-adapter-soap @@ -125,16 +106,15 @@ rm -r %{name}-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTe %{name}-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java \ %{name}-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java \ jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java +# These tests fails with java8 +rm -r %{name}-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java # Unavailable test:crossref2:1.0.0-SNAPSHOT %pom_remove_plugin :maven-invoker-plugin jcasgen-maven-plugin sed -i 's/\r//' NOTICE README -# These tests fails with java8 -rm -r %{name}-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java - -sed -i "s|1.2.8|1.2.17|" %{name}-core/pom.xml +%pom_xpath_set "pom:dependency[pom:artifactId = 'log4j']/pom:version" 1.2.17 %{name}-core %mvn_package :PearPackagingMavenPlugin uima-pear-maven-plugin %mvn_package :jcasgen-maven-plugin jcasgen-maven-plugin @@ -147,7 +127,6 @@ sed -i "s|1.2.8|1.2.17|" %{name}-core/pom. %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc README RELEASE_NOTES.html %license LICENSE NOTICE @@ -161,6 +140,9 @@ sed -i "s|1.2.8|1.2.17|" %{name}-core/pom. %license LICENSE NOTICE %changelog +* Sat Sep 05 2015 gil cattaneo 2.8.1-1 +- update to 2.8.1 + * Fri Jun 19 2015 Fedora Release Engineering - 2.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 0d0abd2657e927c0474f36d7645e3ed0db62cb01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:17:36 +0000 Subject: [PATCH 05/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index 624d627..23159cb 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -140,6 +140,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Sep 05 2015 gil cattaneo 2.8.1-1 - update to 2.8.1 From 53b0a24f3317fb45d4f6b55df69eef9d81c5d7cd Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 25 Aug 2016 11:11:56 +0200 Subject: [PATCH 06/13] jackson 2.7 build fix --- uimaj-2.8.1-jackson2.7.patch | 20 ++++++++++++++++++++ uimaj.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 uimaj-2.8.1-jackson2.7.patch diff --git a/uimaj-2.8.1-jackson2.7.patch b/uimaj-2.8.1-jackson2.7.patch new file mode 100644 index 0000000..5859baf --- /dev/null +++ b/uimaj-2.8.1-jackson2.7.patch @@ -0,0 +1,20 @@ +diff -Nru uimaj-2.8.1/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java uimaj-2.8.1.jackson/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java +--- uimaj-2.8.1/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java 2015-08-04 17:06:42.000000000 +0200 ++++ uimaj-2.8.1.jackson/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java 2016-08-25 10:57:52.780477994 +0200 +@@ -37,6 +37,7 @@ + import com.fasterxml.jackson.core.JsonGenerationException; + import com.fasterxml.jackson.core.JsonGenerator; + import com.fasterxml.jackson.core.PrettyPrinter; ++import com.fasterxml.jackson.core.util.DefaultIndenter; + import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; + import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.FixedSpaceIndenter; + +@@ -351,7 +352,7 @@ + + public void withNl() { + if (isFormattedOutput) { +- uimaPrettyPrinter.indentObjectsWith(DefaultPrettyPrinter.Lf2SpacesIndenter.instance); ++ uimaPrettyPrinter.indentObjectsWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE); + } + } + diff --git a/uimaj.spec b/uimaj.spec index 23159cb..fbbabb3 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,10 +1,11 @@ Name: uimaj Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ Source0: http://www.apache.org/dist/uima/%{name}-%{version}/%{name}-%{version}-source-release.zip +Patch0: uimaj-2.8.1-jackson2.7.patch BuildRequires: maven-local BuildRequires: mvn(ant-contrib:ant-contrib) @@ -71,6 +72,8 @@ find . -name "*.bat" -delete find . -name "*.class" -delete find . -name "*.cmd" -delete +%patch0 -p1 + # Build @ random fails %pom_remove_plugin -r :apache-rat-plugin # org.semver:enforcer-rule:0.9.33 @@ -140,6 +143,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Thu Aug 25 2016 gil cattaneo 2.8.1-3 +- jackson 2.7 build fix + * Fri Feb 05 2016 Fedora Release Engineering - 2.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0423f49b882941095c5926cfc47a1cf1b7caca4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:40:07 +0000 Subject: [PATCH 07/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index fbbabb3..5185d4b 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -143,6 +143,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Aug 25 2016 gil cattaneo 2.8.1-3 - jackson 2.7 build fix From 34548a109c567e7ebd8154059df668be5afd9c83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:56:03 +0000 Subject: [PATCH 08/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index 5185d4b..cf63515 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -143,6 +143,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b4d186387c8a38a9d0496cad4fb4927fdd0daa58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:56:43 +0000 Subject: [PATCH 09/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index cf63515..668939d 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -143,6 +143,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.8.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c185544e0143708594d00e35d3cdacf83916731f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 13 Apr 2018 23:40:35 +0100 Subject: [PATCH 10/13] Remove dep on obsolete axis --- uimaj.spec | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/uimaj.spec b/uimaj.spec index 668939d..fa9d8d4 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -9,19 +9,14 @@ Patch0: uimaj-2.8.1-jackson2.7.patch BuildRequires: maven-local BuildRequires: mvn(ant-contrib:ant-contrib) -BuildRequires: mvn(axis:axis) -BuildRequires: mvn(axis:axis-jaxrpc) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(org.apache.commons:commons-logging) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.ant:ant-apache-regexp) BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) @@ -93,12 +88,9 @@ find . -name "*.cmd" -delete %pom_remove_dep org.apache.uima:%{name}-examples %pom_disable_module ../%{name}-examples aggregate-%{name} -# [ERROR] uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java -# cannot access org.apache.commons.logging.Log -%pom_add_dep org.apache.commons:commons-logging %{name}-adapter-soap - -# Use system jvm apis -%pom_remove_dep org.apache.geronimo.specs:geronimo-activation_1.0.2_spec %{name}-adapter-soap +# Disable SOAP module which relies upon the ancient and obsolete axis library +%pom_disable_module ../%{name}-adapter-soap aggregate-%{name} +%pom_remove_dep org.apache.uima:%{name}-adapter-soap # Unavailable deps org.apache.uima:uima-docbook-olink:zip:olink:1-SNAPSHOT %pom_disable_module ../aggregate-%{name}-docbooks aggregate-%{name} @@ -123,7 +115,6 @@ sed -i 's/\r//' NOTICE README %mvn_package :jcasgen-maven-plugin jcasgen-maven-plugin %build - %mvn_build -- -Dproject.build.sourceEncoding=UTF-8 %install @@ -143,6 +134,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Fri Apr 13 2018 Mat Booth - 2.8.1-7 +- Remove dep on obsolete axis + * Fri Feb 09 2018 Fedora Release Engineering - 2.8.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a1f58295dd79bf7313e6b8b153045fa97ba5ee3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:11:18 +0000 Subject: [PATCH 11/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index fa9d8d4..cb1b1ac 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -134,6 +134,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.8.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Apr 13 2018 Mat Booth - 2.8.1-7 - Remove dep on obsolete axis From f8c4618b7c60a2a2475cdc2e114868929b1391fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:24:32 +0000 Subject: [PATCH 12/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uimaj.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uimaj.spec b/uimaj.spec index cb1b1ac..0340608 100644 --- a/uimaj.spec +++ b/uimaj.spec @@ -1,6 +1,6 @@ Name: uimaj Version: 2.8.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications License: ASL 2.0 URL: http://uima.apache.org/ @@ -134,6 +134,9 @@ sed -i 's/\r//' NOTICE README %license LICENSE NOTICE %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.8.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.8.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5510fdc91e42d9cfa9b711e2111000d375008fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 11 Sep 2019 12:50:47 +0200 Subject: [PATCH 13/13] Orphaned for 6+ weeks --- .gitignore | 2 - dead.package | 1 + sources | 1 - uimaj-2.8.1-jackson2.7.patch | 20 ---- uimaj.spec | 183 ----------------------------------- 5 files changed, 1 insertion(+), 206 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 uimaj-2.8.1-jackson2.7.patch delete mode 100644 uimaj.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index df65e88..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/uimaj-2.5.0-source-release.zip -/uimaj-2.8.1-source-release.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 768f91b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -377bb6ac02085dba20527af6daa3629f uimaj-2.8.1-source-release.zip diff --git a/uimaj-2.8.1-jackson2.7.patch b/uimaj-2.8.1-jackson2.7.patch deleted file mode 100644 index 5859baf..0000000 --- a/uimaj-2.8.1-jackson2.7.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nru uimaj-2.8.1/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java uimaj-2.8.1.jackson/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java ---- uimaj-2.8.1/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java 2015-08-04 17:06:42.000000000 +0200 -+++ uimaj-2.8.1.jackson/uimaj-json/src/main/java/org/apache/uima/json/impl/JsonContentHandlerJacksonWrapper.java 2016-08-25 10:57:52.780477994 +0200 -@@ -37,6 +37,7 @@ - import com.fasterxml.jackson.core.JsonGenerationException; - import com.fasterxml.jackson.core.JsonGenerator; - import com.fasterxml.jackson.core.PrettyPrinter; -+import com.fasterxml.jackson.core.util.DefaultIndenter; - import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; - import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.FixedSpaceIndenter; - -@@ -351,7 +352,7 @@ - - public void withNl() { - if (isFormattedOutput) { -- uimaPrettyPrinter.indentObjectsWith(DefaultPrettyPrinter.Lf2SpacesIndenter.instance); -+ uimaPrettyPrinter.indentObjectsWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE); - } - } - diff --git a/uimaj.spec b/uimaj.spec deleted file mode 100644 index 0340608..0000000 --- a/uimaj.spec +++ /dev/null @@ -1,183 +0,0 @@ -Name: uimaj -Version: 2.8.1 -Release: 9%{?dist} -Summary: Apache UIMA is an implementation of the OASIS-UIMA specifications -License: ASL 2.0 -URL: http://uima.apache.org/ -Source0: http://www.apache.org/dist/uima/%{name}-%{version}/%{name}-%{version}-source-release.zip -Patch0: uimaj-2.8.1-jackson2.7.patch - -BuildRequires: maven-local -BuildRequires: mvn(ant-contrib:ant-contrib) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.ant:ant-apache-regexp) -BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.uima:parent-pom:pom:) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -BuildRequires: mvn(xmlunit:xmlunit) - -BuildArch: noarch - -%description -Apache UIMA is an implementation of the OASIS-UIMA specifications. - -OASIS UIMA Committee: . - -Unstructured Information Management applications are software systems -that analyze large volumes of unstructured information in order to -discover knowledge that is relevant to an end user. - -An example UIM application might ingest plain text and identify -entities, such as persons, places, organizations; or relations, -such as works-for or located-at. - -%package -n jcasgen-maven-plugin -Summary: Apache UIMA Maven JCasGen Plugin - -%description -n jcasgen-maven-plugin -A Maven Plugin for using JCasGen to generate Java classes from -XML type system descriptions. - -%package -n uima-pear-maven-plugin -Summary: Apache UIMA Maven Pear Plugin - -%description -n uima-pear-maven-plugin -This is a maven plugin that produces a pear artifact. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains javadoc for %{name}. - -%prep -%setup -q -# Cleanup -find . -name "*.jar" -delete -find . -name "*.bat" -delete -find . -name "*.class" -delete -find . -name "*.cmd" -delete - -%patch0 -p1 - -# Build @ random fails -%pom_remove_plugin -r :apache-rat-plugin -# org.semver:enforcer-rule:0.9.33 -%pom_remove_plugin -r :maven-enforcer-plugin -%pom_remove_plugin -r :maven-javadoc-plugin - -# Remove eclipse stuff (dont provides pom or depmap file) -%pom_disable_module ../aggregate-%{name}-eclipse-plugins aggregate-%{name} -%pom_remove_dep org.apache.uima:%{name}-ep-cas-editor -%pom_remove_dep org.apache.uima:%{name}-ep-configurator -%pom_remove_dep org.apache.uima:%{name}-ep-debug -%pom_remove_dep org.apache.uima:%{name}-ep-jcasgen -%pom_remove_dep org.apache.uima:%{name}-ep-pear-packager -%pom_remove_dep org.apache.uima:%{name}-ep-runtime -%pom_remove_dep org.apache.uima:%{name}-ep-cas-editor-ide -%pom_remove_dep org.apache.uima:%{name}-ep-launcher -%pom_remove_dep org.apache.uima:%{name}-examples -%pom_disable_module ../%{name}-examples aggregate-%{name} - -# Disable SOAP module which relies upon the ancient and obsolete axis library -%pom_disable_module ../%{name}-adapter-soap aggregate-%{name} -%pom_remove_dep org.apache.uima:%{name}-adapter-soap - -# Unavailable deps org.apache.uima:uima-docbook-olink:zip:olink:1-SNAPSHOT -%pom_disable_module ../aggregate-%{name}-docbooks aggregate-%{name} - -# These tests @ random fails -rm -r %{name}-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java \ - %{name}-core/src/test/java/org/apache/uima/cas/test/SofaTest.java \ - %{name}-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java \ - %{name}-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java \ - jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java -# These tests fails with java8 -rm -r %{name}-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java - -# Unavailable test:crossref2:1.0.0-SNAPSHOT -%pom_remove_plugin :maven-invoker-plugin jcasgen-maven-plugin - -sed -i 's/\r//' NOTICE README - -%pom_xpath_set "pom:dependency[pom:artifactId = 'log4j']/pom:version" 1.2.17 %{name}-core - -%mvn_package :PearPackagingMavenPlugin uima-pear-maven-plugin -%mvn_package :jcasgen-maven-plugin jcasgen-maven-plugin - -%build -%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 - -%install -%mvn_install - -%files -f .mfiles -%doc README RELEASE_NOTES.html -%license LICENSE NOTICE - -%files -n jcasgen-maven-plugin -f .mfiles-jcasgen-maven-plugin -%license LICENSE NOTICE - -%files -n uima-pear-maven-plugin -f .mfiles-uima-pear-maven-plugin -%license LICENSE NOTICE - -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 2.8.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.8.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Apr 13 2018 Mat Booth - 2.8.1-7 -- Remove dep on obsolete axis - -* Fri Feb 09 2018 Fedora Release Engineering - 2.8.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.8.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Aug 25 2016 gil cattaneo 2.8.1-3 -- jackson 2.7 build fix - -* Fri Feb 05 2016 Fedora Release Engineering - 2.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Sep 05 2015 gil cattaneo 2.8.1-1 -- update to 2.8.1 - -* Fri Jun 19 2015 Fedora Release Engineering - 2.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 gil cattaneo 2.5.0-4 -- introduce license macro - -* Sun Jun 08 2014 Fedora Release Engineering - 2.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.5.0-2 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Jan 15 2014 gil cattaneo 2.5.0-1 -- update to 2.5.0 - -* Tue Aug 27 2013 gil cattaneo 2.4.2-1 -- update to 2.4.2 - -* Wed Feb 06 2013 gil cattaneo 2.4.0-1 -- initial rpm