commit f3c36fcf90b66d0fb5ccf12b2184a25bb4e7e261
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Jan 23 16:01:04 2015 +0100
Remove XMvn connector for Gradle
GradleResolver.java | 374 ---------------------------------------------------
gradle.spec | 39 +-----
2 files changed, 1 insertions(+), 412 deletions(-)
---
diff --git a/gradle.spec b/gradle.spec
index ee6225b..6709b8f 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -27,7 +27,6 @@ Source2: gradle-font-metadata.xml
Source3: gradle-jquery-metadata.xml
Source4: gradle-launcher.sh
Source5: gradle.desktop
-Source6: GradleResolver.java
# Sources 99xx are used only for bootstrapping.
# Main script used to build gradle with plain groovyc
@@ -249,11 +248,6 @@ BuildRequires: lato-fonts
BuildRequires: liberation-mono-fonts
BuildRequires: js-jquery
-# Dependencies for XMvn connector for Gradle (to be removed once the
-# connector is merged into XMvn)
-BuildRequires: xmvn-api
-BuildRequires: xmvn-launcher
-
# Generic runtime dependencies.
Requires: javapackages-tools
Requires: java-devel
@@ -401,19 +395,6 @@ sensible defaults. Gradle is quickly becoming the build system of
choice for many open source projects, leading edge enterprises and
legacy automation challenges.
-%package local
-Summary: XMvn connector for Gradle
-Requires: %{name} = %{version}-%{release}
-Requires: javapackages-local
-Requires: apache-ivy
-Requires: slf4j
-Requires: xmvn-api
-Requires: xmvn-launcher
-
-%description local
-This package provides XMvn connector for Gradle, which allows Gradle
-to resolve artifacts from system artifact repository.
-
%prep
%setup -q
%patch0 -p1
@@ -467,18 +448,6 @@ gradle -x docs:distDocs --offline -s install -Pgradle_installPath=$PWD/inst \
-PfinalRelease -Dbuild.number="%{?fedora:Fedora }%{?rhel:Red Hat }%{version}-%{release}"
%endif
-# Build and assemble XMvn connector for Gradle
-mkdir -p local/org/fedoraproject/xmvn/connector/gradle
-cd ./local
-cp %{SOURCE6} org/fedoraproject/xmvn/connector/gradle/
-%if %{with bootstrap}
-gradle_classpath=../bootstrap-home/lib/gradle-core-00.jar:../bootstrap-home/lib/gradle-dependency-management-00.jar:../bootstrap-home/lib/gradle-resources-00.jar:../bootstrap-home/lib/gradle-base-services-00.jar
-%else
-gradle_classpath="$(echo ../subprojects/core/build/libs/gradle-core-%{version}*.jar):$(echo ../subprojects/dependency-management/build/libs/gradle-dependency-management-%{version}*.jar):$(echo ../subprojects/resources/build/libs/gradle-resources-%{version}*.jar):$(echo ../subprojects/base-services/build/libs/gradle-base-services-%{version}*.jar)"
-%endif
-javac -cp $gradle_classpath:$(build-classpath xmvn/xmvn-api xmvn/xmvn-launcher slf4j/api ivy) $(find -name *.java)
-jar cf xmvn-connector-gradle.jar org
-
%install
install -d -m 755 %{buildroot}%{_javadir}/%{name}/
@@ -536,11 +505,6 @@ done
%endif
-# Install XMvn connector for Gradle. This should eventually be moved to XMvn.
-%mvn_artifact org.fedoraproject.xmvn:xmvn-connector-gradle:2.1.0-SNAPSHOT local/xmvn-connector-gradle.jar
-%mvn_package ":xmvn*" local
-%mvn_file ":{xmvn*}" xmvn/@1
-
%mvn_install
install -d -m 755 %{buildroot}%{_bindir}/
@@ -577,11 +541,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc changelog.txt
%doc LICENSE NOTICE
-%files local -f .mfiles-local
-
%changelog
* Fri Jan 23 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-2
- Generate Maven metadata for gradle-dependency-management
+- Remove XMvn connector for Gradle
* Wed Jan 21 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-1
- Update to upstream version 2.2.1