diff --git a/.gitignore b/.gitignore index bfcf489..2059d50 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /xmvn-0.4.2.tar.xz /xmvn-0.5.0.tar.xz /xmvn-0.5.1.tar.xz +/xmvn-1.0.0.tar.xz diff --git a/sources b/sources index 900a236..c9e75ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45bd84f2061977153d65b536fa4d0f9b xmvn-0.5.1.tar.xz +343ac79abbc7efeaf1a872b75469aed7 xmvn-1.0.0.tar.xz diff --git a/xmvn.spec b/xmvn.spec index e2a170e..7db2775 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,27 +1,12 @@ Name: xmvn -Version: 0.5.1 -Release: 4%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz -# from upstream commit ccc197d to fix NPE -Patch0: 0001-Be-careful-when-unboxing-Boolean-that-can-be-null.patch - -# from upstream commits f62ca1f and f6b2c9 to fix handling of packages with dots -# in groupid -Patch1: 0002-Implement-desired-handling-dots-in-JPP-groupId.patch - -# from upstream commits 44d9c60 and bf7b9a7 to allow resolution -# of tools.jar without specifying system scope or systemPath -Patch2: 0003-Implement-Java-home-resolver.patch - -# Allow installation of Eclipse plugins in javadir -Patch3: %{name}-eclipse-plugin.patch - - BuildRequires: maven >= 3.1.0 BuildRequires: maven-local BuildRequires: beust-jcommander @@ -29,6 +14,7 @@ BuildRequires: cglib BuildRequires: maven-dependency-plugin BuildRequires: maven-plugin-build-helper BuildRequires: maven-assembly-plugin +BuildRequires: maven-invoker-plugin Requires: maven >= 3.1.0 @@ -46,25 +32,28 @@ This package provides %{summary}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 # Add cglib test dependency as a workaround for rhbz#911365 -%pom_add_dep cglib:cglib::test %{name}-core +#pom_add_dep cglib:cglib::test %{name}-core +%pom_add_dep cglib:cglib %{name}-core +%pom_add_dep aopalliance:aopalliance %{name}-core +# remove dependency plugin maven-binaries execution +# we provide apache-maven by symlink +%pom_xpath_remove "pom:executions/pom:execution[pom:id[text()='maven-binaries']]" -# remove dependency plugin, we provide apache-maven by symlink -%pom_remove_plugin :maven-dependency-plugin # get mavenVersion that is expected mver=$(sed -n '//{s/.*>\(.*\)<.*/\1/;p}' \ xmvn-parent/pom.xml) mkdir -p target/dependency/ ln -s %{_datadir}/maven target/dependency/apache-maven-$mver + +# skip ITs for now (mix of old & new XMvn config causes issues +rm -rf src/it + %build -%mvn_file ":{xmvn-{core,connector}}" %{name}/@1 %{_datadir}/%{name}/lib/@1 +%mvn_file ":{xmvn-{core,connector}}" %{name}/@1 ../%{name}/lib/@1 %mvn_build -X tar --delay-directory-restore -xvf target/*tar.bz2 @@ -74,19 +63,18 @@ chmod -R +rwX %{name}-%{version}* %install %mvn_install -cp -r %{name}-%version/* %{buildroot}%{_datadir}/%{name}/ +cp -r %{name}-%{version}*/* %{buildroot}%{_datadir}/%{name}/ ln -sf %{_datadir}/maven/bin/mvn %{buildroot}%{_datadir}/%{name}/bin/mvn ln -sf %{_datadir}/maven/bin/mvnDebug %{buildroot}%{_datadir}/%{name}/bin/mvnDebug ln -sf %{_datadir}/maven/bin/mvnyjp %{buildroot}%{_datadir}/%{name}/bin/mvnyjp - # helper scripts install -d -m 755 %{buildroot}%{_bindir} install -m 755 xmvn-tools/src/main/bin/tool-script \ %{buildroot}%{_datadir}/%{name}/bin/ -for tool in subst resolve bisect;do +for tool in subst resolve bisect install;do rm %{buildroot}%{_datadir}/%{name}/bin/%{name}-$tool ln -s tool-script \ %{buildroot}%{_datadir}/%{name}/bin/%{name}-$tool @@ -96,21 +84,30 @@ for tool in subst resolve bisect;do exec %{_datadir}/%{name}/bin/%{name}-$tool "\${@}" EOF chmod +x %{buildroot}%{_bindir}/%{name}-$tool + done # copy over maven lib directory cp -r %{_datadir}/maven/lib/* %{buildroot}%{_datadir}/%{name}/lib/ # possibly recreate symlinks that can be automated with xmvn-subst -%{buildroot}%{_datadir}/%{name}/bin/%{name}-subst \ - %{buildroot}%{_datadir}/%{name}/ +%{name}-subst %{buildroot}%{_datadir}/%{name}/ -for mod in api connector-wagon impl spi util; do - ln -sf %{_javadir}/aether/aether-$mod.jar \ - %{buildroot}%{_datadir}/%{name}/lib/aether_aether-$mod.jar +for tool in subst resolver bisect installer;do + # sisu doesn't contain pom.properties. Manually replace with symlinks + pushd %{buildroot}%{_datadir}/%{name}/lib/$tool + rm org.eclipse.sisu*jar sisu-guice*jar + build-jar-repository . org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + guice/google-guice + popd done -ln -s %{_sysconfdir}/maven/logging %{buildroot}%{_datadir}/%{name}/conf +if [[ `find %{buildroot}%{_datadir}/%{name}/lib -type f -name '*.jar' -not -name '*%{name}*' | wc -l` -ne 0 ]];then + echo "Some jar files were not symlinked during build. Aborting" + exit 1 +fi + # /usr/bin/xmvn script cat <%{buildroot}%{_bindir}/%{name} @@ -124,7 +121,7 @@ cp -P %{_datadir}/maven/conf/settings.xml %{buildroot}%{_datadir}/%{name}/conf/ %pretrans -p -- we changed symlink to dir in 0.5.0-1, workaround RPM issues -for key, dir in pairs({"conf", "boot"}) do +for key, dir in pairs({"conf", "conf/logging", "boot"}) do path = "%{_datadir}/%{name}/" .. dir if posix.readlink(path) then os.remove(path) @@ -141,6 +138,12 @@ end %doc LICENSE NOTICE %changelog +* Mon Sep 09 2013 Stanislav Ochotnicky - 1.0.0-1 +- Updating to upstream 1.0.0 + +* Tue Sep 3 2013 Stanislav Ochotnicky 1.0.0-0.2.alpha1 +- Update to upstream version 1.0.0 alpha1 + * Sun Aug 04 2013 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild