From d5926f087cdbc03ed0e563a5411eb475bdab495f3b78245a95c1907c09ab512e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Nov 2023 06:29:05 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=3 --- parent-pom-10.tar.gz | 3 --- parent-pom-13.tar.gz | 3 +++ uima-parent-pom.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 parent-pom-10.tar.gz create mode 100644 parent-pom-13.tar.gz diff --git a/parent-pom-10.tar.gz b/parent-pom-10.tar.gz deleted file mode 100644 index 37912f9..0000000 --- a/parent-pom-10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77d1d26c2e69bf5164aefbbbba8c98d08a4666a7089e200b5514838e207eb0e5 -size 20711 diff --git a/parent-pom-13.tar.gz b/parent-pom-13.tar.gz new file mode 100644 index 0000000..b41ccfa --- /dev/null +++ b/parent-pom-13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29d55dac5e018ee653deb633bb8e334e689d7ad642a1baaaf061c53afb00f96f +size 137234 diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index 3945212..df0abd2 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -1,7 +1,7 @@ # # spec file for package uima-parent-pom # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: uima-parent-pom -Version: 10 +Version: 13 Release: 0 Summary: Apache UIMA Parent POM License: Apache-2.0 From 1e1b94e76603acc54e1f47a7d41ab51a228ec6e7b4737e7369d89bb0e79ed752 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Nov 2023 07:35:12 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=4 --- uima-parent-pom.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index df0abd2..4ad4d56 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -72,6 +72,7 @@ This package provides Parent for Apache UIMA Projects. # Unavailable deps %pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'build-eclipse-update-subsite']" %pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'build distribution']" +%pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'java11']" cp -p %{SOURCE1} . sed -i 's/\r//' LICENSE-2.0.txt README.txt From a29859fb56b77505902e993f1c025cdb806065436dc4eaa3384075a737e5582b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Nov 2023 07:41:56 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=5 --- uima-parent-pom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index 4ad4d56..0f2d8ea 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -33,7 +33,6 @@ BuildRequires: mvn(jakarta-regexp:jakarta-regexp) BuildRequires: mvn(org.apache.ant:ant-apache-regexp) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildArch: noarch @@ -65,6 +64,7 @@ This package provides Parent for Apache UIMA Projects. %pom_remove_plugin :maven-assembly-plugin %pom_remove_plugin :maven-remote-resources-plugin %pom_remove_plugin :maven-javadoc-plugin +%pop_remove_plugin :maven-enforcer-plugin # unavailable deps org.apache.uima:uima-docbook-olink:zip:olink:1-SNAPSHOT # https://svn.apache.org/repos/asf/uima/build/trunk/uima-docbook-olink/ From 1f5c5a06c7980f1b88843a69440fb8508cc8b6e173518c2013f45594f459757f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Nov 2023 07:42:32 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=6 --- uima-parent-pom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index 0f2d8ea..a6427be 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -64,7 +64,7 @@ This package provides Parent for Apache UIMA Projects. %pom_remove_plugin :maven-assembly-plugin %pom_remove_plugin :maven-remote-resources-plugin %pom_remove_plugin :maven-javadoc-plugin -%pop_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-enforcer-plugin # unavailable deps org.apache.uima:uima-docbook-olink:zip:olink:1-SNAPSHOT # https://svn.apache.org/repos/asf/uima/build/trunk/uima-docbook-olink/ From 0dd782fdd0f97867abb3b054d3cfc8d80b99806b1f88c31222bf25ebff345239 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 May 2024 01:19:17 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=7 --- uima-parent-pom.changes | 22 ++++++++++++++++++++++ uima-parent-pom.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/uima-parent-pom.changes b/uima-parent-pom.changes index 92ecca8..439200d 100644 --- a/uima-parent-pom.changes +++ b/uima-parent-pom.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri May 17 01:16:17 UTC 2024 - Fridrich Strba + +- Update to version 13 + * UIMA-5612: first batch of upgrades to apache-wide parent pom + * UIMA-5612: set versions for enforcer using properties + * UIMA-5612: updates: + 1) fix jira version for reporting + 2) set property surefire.version to 2.20.1 (current level) + 3) make javadoc version use the variable + * UIMA-5612: update the build for signed eclipse update site + * UIMA-5856: Use modern checksum algorithms during release + * UIMA-5876, UIMA-5753: updates for signatures/checksums and + Java 11 enablement, details in the Jira comments. Includes + patched jars and patches for two maven plugins + * UIMA-5876: update uima-wide parent pom + * UIMA-5897: workaround for Apache Nexus rule not allowing + unsigned .sha512 checksums + * UIMA-6059: apache license header can't be switched because + it breaks rat check + * UIMA-6059: http to https + ------------------------------------------------------------------- Fri Feb 28 07:21:28 UTC 2020 - Fridrich Strba diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index a6427be..08026a3 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -1,7 +1,7 @@ # # spec file for package uima-parent-pom # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 3e825a422ef9b1068c83191e3676ce70db53a7d2c14ccb23dc10ff9afae18fab Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 May 2024 01:23:49 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=8 --- uima-parent-pom.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index 08026a3..df7ec2e 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -32,7 +32,6 @@ BuildRequires: mvn(ant-contrib:ant-contrib) BuildRequires: mvn(jakarta-regexp:jakarta-regexp) BuildRequires: mvn(org.apache.ant:ant-apache-regexp) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildArch: noarch @@ -49,6 +48,7 @@ This package provides Parent for Apache UIMA Projects. %prep %setup -q -n uima-build-parent-pom-%{version} +find . -name \*.jar -print -delete %pom_xpath_remove pom:Embed-Dependency %pom_xpath_remove pom:Embed-Directory @@ -65,6 +65,7 @@ This package provides Parent for Apache UIMA Projects. %pom_remove_plugin :maven-remote-resources-plugin %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-antrun-plugin # unavailable deps org.apache.uima:uima-docbook-olink:zip:olink:1-SNAPSHOT # https://svn.apache.org/repos/asf/uima/build/trunk/uima-docbook-olink/ From 3da2bcf44083db11c0dc2f1702c88c44cb87db23e35ab822844a51dea81f3175 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 May 2024 01:51:21 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=9 --- _service | 18 ++++++++++++++++++ parent-pom-13.tar.gz | 3 --- uima-parent-pom-13.tar.xz | 3 +++ uima-parent-pom.changes | 3 +++ uima-parent-pom.spec | 12 +++--------- 5 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 _service delete mode 100644 parent-pom-13.tar.gz create mode 100644 uima-parent-pom-13.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..b4570e5 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + git + git@github.com:apache/uima-build.git + parent-pom-13 + parent-pom-* + @PARENT_TAG@ + parent-pom-(.*) + uima-parent-pom + src + plugin-patches + + + *.tar + xz + + + diff --git a/parent-pom-13.tar.gz b/parent-pom-13.tar.gz deleted file mode 100644 index b41ccfa..0000000 --- a/parent-pom-13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29d55dac5e018ee653deb633bb8e334e689d7ad642a1baaaf061c53afb00f96f -size 137234 diff --git a/uima-parent-pom-13.tar.xz b/uima-parent-pom-13.tar.xz new file mode 100644 index 0000000..ae91823 --- /dev/null +++ b/uima-parent-pom-13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6321ed327f7dc5c7a9172a50e0f12e93994083e68e6d74a02dc379ad3ea552c1 +size 20740 diff --git a/uima-parent-pom.changes b/uima-parent-pom.changes index 439200d..620d37b 100644 --- a/uima-parent-pom.changes +++ b/uima-parent-pom.changes @@ -19,6 +19,9 @@ Fri May 17 01:16:17 UTC 2024 - Fridrich Strba * UIMA-6059: apache license header can't be switched because it breaks rat check * UIMA-6059: http to https +- Fetch sources using service in order to filter out spurious + binary files +- Remove bogus dependencies ------------------------------------------------------------------- Fri Feb 28 07:21:28 UTC 2020 - Fridrich Strba diff --git a/uima-parent-pom.spec b/uima-parent-pom.spec index df7ec2e..cb8d847 100644 --- a/uima-parent-pom.spec +++ b/uima-parent-pom.spec @@ -23,15 +23,11 @@ Summary: Apache UIMA Parent POM License: Apache-2.0 Group: Development/Libraries/Java URL: https://uima.apache.org/ -Source0: https://github.com/apache/uima-build/archive/parent-pom-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz # uima-parent-pom package don't include the license file # reported @ https://issues.apache.org/jira/browse/UIMA-3575 Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: maven-local -BuildRequires: mvn(ant-contrib:ant-contrib) -BuildRequires: mvn(jakarta-regexp:jakarta-regexp) -BuildRequires: mvn(org.apache.ant:ant-apache-regexp) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildArch: noarch @@ -47,8 +43,7 @@ supports scalablity, and provides tooling. This package provides Parent for Apache UIMA Projects. %prep -%setup -q -n uima-build-parent-pom-%{version} -find . -name \*.jar -print -delete +%setup -q %pom_xpath_remove pom:Embed-Dependency %pom_xpath_remove pom:Embed-Directory @@ -75,8 +70,7 @@ find . -name \*.jar -print -delete %pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'build distribution']" %pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'java11']" -cp -p %{SOURCE1} . -sed -i 's/\r//' LICENSE-2.0.txt README.txt +cp -p %{SOURCE1} LICENSE-2.0.txt %build %{mvn_build} From 7ba8a0b04fb61b367158cf542b9258a2061ace61c6c6cf7a104b3438d0c9cc8d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 May 2024 01:56:20 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/Java:packages/uima-parent-pom?expand=0&rev=10 --- _service | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/_service b/_service index b4570e5..71d7754 100644 --- a/_service +++ b/_service @@ -1,18 +1,18 @@ - - git - git@github.com:apache/uima-build.git - parent-pom-13 - parent-pom-* - @PARENT_TAG@ - parent-pom-(.*) + + git + git@github.com:apache/uima-build.git + parent-pom-13 + parent-pom-* + @PARENT_TAG@ + parent-pom-(.*) uima-parent-pom src plugin-patches - - - *.tar - xz - - + + + *.tar + xz + +