OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=30

2019-11-17 15:39:56 +00:00 · 2019-11-17 15:39:56 +00:00 · 2a52a35125
commit 2a52a35125
parent 8869d117d3
9 changed files with 170 additions and 11 deletions
--- a/0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
+++ b/0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
@ -0,0 +1,27 @@
+From 2f1be92ecb3cc227dd4a6957165b4c6c9268400c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Sun, 6 Oct 2019 16:31:51 +0200
+Subject: [PATCH] Fix resolution of aliases registered by %add_maven_depmap
+
+---
+ .../fedoraproject/xmvn/connector/gradle/GradleResolver.java   | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
+index 90b07eb1..7f292e00 100644
+--- a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
+++ b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
+@@ -175,8 +175,8 @@ public class GradleResolver
+     {
+         ModuleVersionIdentifier moduleId =
+             ( (DefaultModuleComponentArtifactMetadata) artifact ).toArtifactIdentifier().getModuleVersionIdentifier();
+-        String groupId = moduleId.getGroup();
+-        String artifactId = artifact.getName().getName();
+        String groupId = ( (DefaultModuleComponentArtifactMetadata) artifact ).getId().getComponentIdentifier().getGroup();
+        String artifactId =( (DefaultModuleComponentArtifactMetadata) artifact ).getId().getComponentIdentifier().getModule();
+         String extension = artifact.getName().getExtension();
+         String classifier = artifact.getName().getClassifier();
+         String version = moduleId.getVersion();
+-- 
+2.23.0
+
--- a/xmvn-connector-aether.spec
+++ b/xmvn-connector-aether.spec
@ -1,7 +1,7 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-connector-aether
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/xmvn-connector-gradle.changes
+++ b/xmvn-connector-gradle.changes
@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Wed Mar 27 06:28:06 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of xmvn-connector-gradle 3.0.0
--- a/xmvn-connector-gradle.spec
+++ b/xmvn-connector-gradle.spec
@ -0,0 +1,128 @@
+#
+# spec file for package xmvn-connector-gradle
+#
+# Copyright (c) 2019 SUSE LLC.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%global parent xmvn
+%global subname connector-gradle
+Name:           %{parent}-%{subname}
+Version:        3.0.0
+Release:        0
+Summary:        XMvn Connector for Gradle
+License:        Apache-2.0
+Group:          Development/Tools/Building
+URL:            https://fedora-java.github.io/xmvn/
+Source0:        https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz
+Patch0:         0001-Fix-installer-plugin-loading.patch
+Patch1:         0001-Port-to-Gradle-4.2.patch
+Patch2:         0001-Port-to-Gradle-4.3.1.patch
+Patch3:         0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch
+Patch4:         0001-Fix-configuration-of-aliased-plugins.patch
+Patch5:         0001-Don-t-use-JAXB-for-converting-bytes-to-hex-string.patch
+Patch6:         0001-Use-apache-commons-compress-for-manifest-injection-a.patch
+Patch7:         0001-port-to-gradle-4.4.1.patch
+Patch8:         0001-Replace-JAXB-parser.patch
+Patch9:         0001-Fix-resolution-of-aliases-registered-by-add_maven_de.patch
+BuildRequires:  fdupes
+# Build this one with the bootstrap package in order to avoid build cycles
+BuildRequires:  maven-local
+BuildRequires:  mvn(javax.inject:javax.inject)
+BuildRequires:  mvn(org.apache.ivy:ivy)
+BuildRequires:  mvn(org.codehaus.groovy:groovy-all)
+BuildRequires:  mvn(org.fedoraproject.xmvn:xmvn-api)
+BuildRequires:  mvn(org.gradle:gradle-base-services) >= 4.4.1
+BuildRequires:  mvn(org.gradle:gradle-base-services-groovy) >= 4.4.1
+BuildRequires:  mvn(org.gradle:gradle-core) >= 4.4.1
+BuildRequires:  mvn(org.gradle:gradle-dependency-management) >= 4.4.1
+BuildRequires:  mvn(org.gradle:gradle-resources) >= 4.4.1
+BuildRequires:  mvn(org.slf4j:slf4j-api)
+#!BuildRequires: gradle-bootstrap groovy-bootstrap gpars-bootstrap
+BuildArch:      noarch
+
+%description
+This package provides XMvn Connector for Gradle, which provides
+integration of Gradle with XMvn.  It provides an adapter which allows
+XMvn resolver to be used as Gradle resolver.
+
+%package javadoc
+Summary:        API documentation for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package provides %{summary}.
+
+%prep
+%setup -q -n %{parent}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+# Bisect IT has no chances of working in local, offline mode, without
+# network access - it needs to access remote repositories.
+find -name BisectIntegrationTest.java -delete
+
+# Resolver IT won't work either - it tries to execute JAR file, which
+# relies on Class-Path in manifest, which is forbidden in Fedora...
+find -name ResolverIntegrationTest.java -delete
+
+%pom_remove_plugin -r :maven-site-plugin
+
+%{mvn_package} ":xmvn{,-it}" __noinstall
+
+# Upstream code quality checks, not relevant when building RPMs
+%pom_remove_plugin -r :apache-rat-plugin
+%pom_remove_plugin -r :maven-checkstyle-plugin
+%pom_remove_plugin -r :jacoco-maven-plugin
+# FIXME pom macros don't seem to support submodules in profile
+%pom_remove_plugin :jacoco-maven-plugin xmvn-it
+
+# remove dependency plugin maven-binaries execution
+# we provide apache-maven by symlink
+%pom_xpath_remove "pom:executions/pom:execution[pom:id[text()='maven-binaries']]"
+
+# Don't put Class-Path attributes in manifests
+%pom_remove_plugin :maven-jar-plugin xmvn-tools
+
+pushd %{name}
+  %{mvn_file} :{*} %{parent}/@1
+popd
+
+%build
+pushd %{name}
+  %{mvn_build} -f -- -Dsource=8
+popd
+
+%install
+pushd %{name}
+%mvn_install
+%fdupes -s %{buildroot}%{_javadocdir}
+popd
+
+%files -f %{name}/.mfiles
+%license LICENSE NOTICE
+%doc AUTHORS README.md
+
+%files javadoc -f %{name}/.mfiles-javadoc
+%license LICENSE NOTICE
+
+%changelog
--- a/xmvn-connector-ivy.spec
+++ b/xmvn-connector-ivy.spec
@ -1,7 +1,7 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-connector-ivy
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/xmvn-mojo.spec
+++ b/xmvn-mojo.spec
@ -1,7 +1,7 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-mojo
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/xmvn-parent.spec
+++ b/xmvn-parent.spec
@ -1,7 +1,7 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-parent
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/xmvn-tools.spec
+++ b/xmvn-tools.spec
@ -1,7 +1,7 @@
 #
-# spec file for package xmvn
+# spec file for package xmvn-tools
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/xmvn.spec
+++ b/xmvn.spec
@ -1,7 +1,7 @@
 #
 # spec file for package xmvn
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed