[maven/f17] Remove maven-local provides
by Mikolaj Izdebski
commit 1f951126d1776b4c622d2a3d30b021bd1a1873e8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 6 13:45:55 2013 +0100
Remove maven-local provides
maven-local will be created as a subpackage of jpackage-utils.
maven.spec | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 9a26f1e..98b175f 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 14.1%{?dist}
+Release: 14.2%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -113,12 +113,6 @@ Obsoletes: %{name} < 0:%{version}-%{release}
Obsoletes: maven2 < 2.2.1-99
Provides: maven2 = %{version}-%{release}
-# Fedora 18 and later have a separate maven-local package, which
-# functionality is provided by maven in Fedora 17. This virtual
-# provide is to allow packagers to share the same spec file between
-# different versions of Fedora.
-Provides: maven-local = %{version}-%{release}
-
%description
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
@@ -383,6 +377,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-14.2
+- Remove maven-local provides
+
* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-14.1
- Provide maven-local
11 years, 2 months
[maven-archetype] Upgrade to upstream version 2.2
by Michal Srb
commit dab66f14f9ca9b6ec77b78a80f098c0babc17f61
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Feb 6 10:10:26 2013 +0100
Upgrade to upstream version 2.2
- Build with xmvn
- Remove unnecessary depmap and patch
.gitignore | 1 +
...omponent-metadata-instead-of-maven-plugin.patch | 30 ----
maven-archetype.depmap | 14 --
maven-archetype.spec | 163 ++++----------------
sources | 2 +-
5 files changed, 35 insertions(+), 175 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12eb55b..bae0c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/maven-archetype-2.1-source-release.zip
+/maven-archetype-2.2-source-release.zip
diff --git a/maven-archetype.spec b/maven-archetype.spec
index 4b68e3a..5ab0411 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,17 +1,13 @@
Name: maven-archetype
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Maven project templating toolkit
Group: Development/Libraries
License: ASL 2.0
URL: https://maven.apache.org/archetype/
-Source0: http://search.maven.org/remotecontent?filepath=org/apache/maven/archetype...
+Source0: http://repo.maven.apache.org/maven2/org/apache/maven/archetype/%{name}/%{...
-# custom depmap needed to resolve ant-antlr which doesn't have pom/depmap
-Source1: %{name}.depmap
-
-Patch0: 0001-Use-component-metadata-instead-of-maven-plugin.patch
Patch1: 0002-Use-generics.patch
Patch2: 0003-Add-Maven-3-compatibility.patch
Patch3: %{name}-fix-jetty-namespace.patch
@@ -20,15 +16,13 @@ BuildArch: noarch
BuildRequires: jpackage-utils
# we added test dep skipping there
-BuildRequires: maven > 3.0.3-13
BuildRequires: maven-war-plugin
BuildRequires: maven-dependency-plugin
BuildRequires: maven-plugin-bundle
+BuildRequires: maven-script-interpreter
BuildRequires: jchardet
BuildRequires: plexus-containers-component-metadata
-
-Requires: jpackage-utils
-Requires: maven
+BuildRequires: xmvn
%description
Archetype is a Maven project templating toolkit. An archetype is
@@ -66,7 +60,6 @@ within your organization.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
%{summary}.
@@ -74,9 +67,6 @@ Requires: jpackage-utils
%package catalog
Summary: Maven Archetype Catalog model
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: %{name} = %{version}-%{release}
%description catalog
%{summary}.
@@ -84,9 +74,6 @@ Requires: %{name} = %{version}-%{release}
%package descriptor
Summary: Maven Archetype Descriptor model
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: %{name} = %{version}-%{release}
%description descriptor
%{summary}.
@@ -94,9 +81,6 @@ Requires: %{name} = %{version}-%{release}
%package registry
Summary: Maven Archetype Registry model
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: %{name} = %{version}-%{release}
%description registry
%{summary}.
@@ -104,19 +88,6 @@ Requires: %{name} = %{version}-%{release}
%package common
Summary: Maven Archetype common classes
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-catalog = %{version}-%{release}
-Requires: %{name}-descriptor = %{version}-%{release}
-Requires: %{name}-registry = %{version}-%{release}
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: jchardet
-Requires: dom4j
-Requires: jdom
-Requires: maven-project
-Requires: plexus-containers-container-default
-Requires: apache-commons-io
-Requires: plexus-velocity
%description common
%{summary}.
@@ -124,8 +95,6 @@ Requires: plexus-velocity
%package packaging
Summary: Maven Archetype packaging configuration for archetypes
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: %{name} = %{version}-%{release}
%description packaging
%{summary}.
@@ -133,20 +102,13 @@ Requires: %{name} = %{version}-%{release}
%package -n %{name}-plugin
Summary: Maven Plugin for using archetypes
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: apache-commons-collections
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-catalog = %{version}-%{release}
-Requires: %{name}-descriptor = %{version}-%{release}
-Requires: %{name}-registry = %{version}-%{release}
%description -n %{name}-plugin
%{summary}.
%prep
%setup -q
-%patch0 -p1
+
%patch1 -p1
%patch2 -p1
%patch3
@@ -186,105 +148,46 @@ pushd archetype-models/archetype-descriptor
popd
+# groovy is not really needed
+%pom_remove_dep org.codehaus.groovy:groovy maven-archetype-plugin/pom.xml
+
+%pom_disable_module archetype-testing
+%pom_remove_plugin org.apache.maven.plugins:maven-antrun-plugin archetype-common/pom.xml
+
+
%build
+%mvn_package :archetype-models maven-archetype
# we don't have cargo so skip tests for now
-mvn-rpmbuild -X -Dmaven.test.skip=true \
- -Dmaven.local.depmap.file=%{SOURCE1} \
- install javadoc:aggregate
+%mvn_build -s -f
%install
-# parent pom
-install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom
-
-for module in common packaging; do
- pushd archetype-$module
- install -Dpm 644 target/archetype-$module-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/$module.jar
- install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
-
- %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module
- popd
-done
-
-pushd archetype-models
- install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}-models.pom
-
- %add_maven_depmap JPP-%{name}-models.pom
-
- for module in catalog descriptor registry;do
- pushd archetype-$module
- install -Dpm 644 target/archetype-$module-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/$module.jar
- install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
-
- %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module
- popd
- done
-popd
+%mvn_install
-pushd %{name}-plugin
-install -Dpm 644 target/%{name}-plugin-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/plugin.jar
-install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-plugin.pom
-%add_maven_depmap JPP.%{name}-plugin.pom %{name}/plugin.jar -f plugin
-popd
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+%files -f .mfiles-maven-archetype
+%doc LICENSE NOTICE
+
+%files catalog -f .mfiles-archetype-catalog
+%files descriptor -f .mfiles-archetype-descriptor
+%files registry -f .mfiles-archetype-registry
-%files
-%doc LICENSE NOTICE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{name}-models.pom
-%{_mavendepmapfragdir}/%{name}
-%dir %{_javadir}/%{name}
+%files common -f .mfiles-archetype-common
-%files javadoc
+%files packaging -f .mfiles-archetype-packaging
+
+%files -n %{name}-plugin -f .mfiles-maven-archetype-plugin
+
+%files javadoc -f .mfiles-javadoc
%doc LICENSE
-%{_javadocdir}/%{name}
-%exclude %{_javadocdir}/%{name}/javadoc.sh
-
-%files catalog
-%{_mavendepmapfragdir}/%{name}-catalog
-%{_mavenpomdir}/JPP.%{name}-catalog.pom
-%{_javadir}/%{name}/catalog.jar
-
-%files descriptor
-%{_mavendepmapfragdir}/%{name}-descriptor
-%{_mavenpomdir}/JPP.%{name}-descriptor.pom
-%{_javadir}/%{name}/descriptor.jar
-
-%files registry
-%{_mavendepmapfragdir}/%{name}-registry
-%{_mavenpomdir}/JPP.%{name}-registry.pom
-%{_javadir}/%{name}/registry.jar
-
-%files common
-%{_mavendepmapfragdir}/%{name}-common
-%{_mavenpomdir}/JPP.%{name}-common.pom
-%{_javadir}/%{name}/common.jar
-
-%files packaging
-%{_mavendepmapfragdir}/%{name}-packaging
-%{_mavenpomdir}/JPP.%{name}-packaging.pom
-%{_javadir}/%{name}/packaging.jar
-
-%files -n %{name}-plugin
-%{_mavendepmapfragdir}/%{name}-plugin
-%{_mavenpomdir}/JPP.%{name}-plugin.pom
-%{_javadir}/%{name}/plugin.jar
%changelog
+* Fri Feb 01 2013 Michal Srb <msrb(a)redhat.com> - 2.2-1
+- Update to upstream version 2.2
+- Build with xmvn
+- Remove unnecessary depmap and patch
+
* Thu Aug 09 2012 Gerard Ryan <galileo(a)fedoraproject.org> - 2.1-7
- Add OSGI info to descriptor.jar
diff --git a/sources b/sources
index 037314b..dce2b97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce68217be882bdb491b9c9a2b36e0a80 maven-archetype-2.1-source-release.zip
+eb527b5e49fb64664fd15708f20b2806 maven-archetype-2.2-source-release.zip
11 years, 2 months
[javapackages-tools/f18: 7/7] Don't install mvn-local and mvn-rpmbuild on F18
by Mikolaj Izdebski
commit 64f841d5b2b2d566f8858b92bd56d77c3e2919a7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 6 09:51:24 2013 +0100
Don't install mvn-local and mvn-rpmbuild on F18
javapackages-tools.spec | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 505dac6..8812617 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 0.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
@@ -22,8 +22,8 @@ This package provides macros and scripts to support Java packaging.
%package -n maven-local
Summary: Macros and scripts for Maven packaging support
Requires: %{name} = %{version}-%{release}
-Requires: maven >= 3.0.4-28
-Requires: xmvn >= 0.2.5-1
+Requires: maven
+Requires: xmvn
# POM files needed by maven itself
Requires: apache-commons-parent
Requires: apache-parent
@@ -67,6 +67,11 @@ install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
+# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild
+# scripts as they are already provided by maven package.
+%if 0%{fedora} == 18
+rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
+%endif
# Ugly as hell, but Eclipse relocated various artifacts under
# their own groupId. We need to fix this globally.
@@ -105,6 +110,9 @@ install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Wed Feb 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.11.2-2
+- Don't install mvn-local and mvn-rpmbuild on F18
+
* Wed Jan 30 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.11.2-1
- Update to upstream version 0.11.2
11 years, 2 months
[javapackages-tools/f18] (7 commits) ...Don't install mvn-local and mvn-rpmbuild on F18
by Mikolaj Izdebski
Summary of changes:
93b23c2... Update to upstream version 0.10.0 (*)
5a40e81... Upload sources for 0.10.0 (*)
2c84094... Update to upstream version 0.10.1 (*)
4100124... Update to upstream version 0.11.0 (*)
fcee51c... Update to upstream version 0.11.1 (*)
793c4f2... Update to upstream version 0.11.2 (*)
64f841d... Don't install mvn-local and mvn-rpmbuild on F18
(*) This commit already existed in another branch; no separate mail sent
11 years, 2 months
[maven] Drop support for local mode
by Mikolaj Izdebski
commit 2cf4fd6a25ca10bdd9a579d499e9148612d18d1d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Jan 25 01:50:17 2013 +0100
Drop support for local mode
0001-Add-plugin-api-deps.patch | 28 --
0001-Customize-compiler-plugin.patch | 104 ------
0002-Use-custom-resolver.patch | 224 -------------
0003-Use-utf-8-source-encoding.patch | 24 --
...-text-scope-skipping-with-maven.test.skip.patch | 160 ---------
...ake-compiler-plugin-default-to-source-1.5.patch | 33 --
JavadirWorkspaceReader.java | 198 -----------
MavenJPackageDepmap.java | 313 -----------------
maven-bash-completion | 2 -
maven-empty-dep.jar | Bin 341 -> 0 bytes
maven-empty-dep.pom | 9 -
maven-script-local | 47 ---
maven-script-rpmbuild | 93 -----
maven.spec | 353 +++++---------------
repo-metadata.tar.xz | Bin 3028 -> 0 bytes
15 files changed, 79 insertions(+), 1509 deletions(-)
---
diff --git a/maven-bash-completion b/maven-bash-completion
index d137cd4..0ca36fa 100644
--- a/maven-bash-completion
+++ b/maven-bash-completion
@@ -88,5 +88,3 @@ _m2_complete()
}
complete -F _m2_complete -o filenames mvn
-complete -F _m2_complete -o filenames mvn-local
-complete -F _m2_complete -o filenames mvn-rpmbuild
diff --git a/maven.spec b/maven.spec
index e98eb7d..1260934 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 28%{?dist}
+Release: 29%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -10,39 +10,15 @@ License: ASL 2.0
URL: http://maven.apache.org/
# Source URL is for testing only, final version will be in different place:
# http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{versio...
-Source0: http://www.apache.org/dist//maven/source/apache-%{name}-%{version}-src.ta...
+Source0: http://archive.apache.org/dist/maven/source/apache-%{name}-%{version}-src...
Source1: maven-bash-completion
Source2: mvn.1
-# custom resolver java files
-# source: git clone git://fedorapeople.org/~sochotni/maven-javadir-resolver/
-Source100: JavadirWorkspaceReader.java
-Source101: MavenJPackageDepmap.java
-
-# empty files for resolving to nothing
-Source104: %{name}-empty-dep.pom
-Source105: %{name}-empty-dep.jar
-
# 2xx for created non-buildable sources
-Source200: %{name}-script
-Source201: %{name}-script-local
-Source202: %{name}-script-rpmbuild
-
-# Other included files
-Source250: repo-metadata.tar.xz
+Source200: %{name}-script
# Patch1XX could be upstreamed probably
Patch100: 0005-Use-generics-in-modello-generated-code.patch
-Patch101: 0006-Make-compiler-plugin-default-to-source-1.5.patch
-
-# Patch15X are already upstream
-Patch150: 0001-Add-plugin-api-deps.patch
-Patch151: 0003-Use-utf-8-source-encoding.patch
-
-# Patch2XX for non-upstreamable patches
-Patch200: 0002-Use-custom-resolver.patch
-Patch201: 0004-Fix-text-scope-skipping-with-maven.test.skip.patch
-Patch202: 0001-Customize-compiler-plugin.patch
BuildArch: noarch
@@ -76,33 +52,6 @@ BuildRequires: xmlunit
BuildRequires: animal-sniffer >= 1.6-5
%endif
-Requires: aether >= 1.13.1
-Requires: apache-commons-cli
-Requires: apache-resource-bundles
-Requires: async-http-client
-Requires: atinject
-Requires: google-guice >= 3.0
-Requires: guava
-Requires: hamcrest
-Requires: hamcrest
-Requires: java >= 1:1.6.0
-Requires: maven-wagon
-Requires: nekohtml
-Requires: plexus-cipher
-Requires: plexus-classworlds >= 2.4
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-interpolation
-Requires: plexus-sec-dispatcher
-Requires: plexus-utils
-Requires: sisu >= 2.1.1-2
-Requires: xbean
-Requires: xerces-j2
-Requires: yum-utils
-%if 0%{?fedora}
-Requires: animal-sniffer >= 1.6-5
-%endif
-
# Require maven-local for now to allow a smooth transition from maven
# to maven-local. Once packages start requiring maven-local directly
# the Requires below should be removed.
@@ -111,8 +60,7 @@ Requires: maven-local
# for noarch->arch change
Obsoletes: %{name} < 0:%{version}-%{release}
-# maven2 bin package no longer exists. Replace it
-# these should be around until F20
+# maven2 bin package no longer exists.
Obsoletes: maven2 < 2.2.1-99
Provides: maven2 = %{version}-%{release}
@@ -124,31 +72,13 @@ reporting and documentation from a central piece of information.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
-BuildArch: noarch
%description javadoc
%{summary}.
%prep
%setup -q -n apache-%{name}-%{version}%{?ver_add}
-%patch150 -p1
-%patch151 -p1
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
%patch100 -p1
-%patch101 -p1
-
-# get custom resolver in place
-mkdir -p maven-aether-provider/src/main/java/org/apache/maven/artifact/resolver \
- maven-aether-provider/src/main/java/org/apache/maven/artifact/repository
-
-cp %{SOURCE100} maven-aether-provider/src/main/java/org/apache/maven/artifact/resolver
-cp %{SOURCE101} maven-aether-provider/src/main/java/org/apache/maven/artifact/repository
-
-# by adding our things this has become compile dep
-sed -i 's:<scope>runtime</scope>::' maven-core/pom.xml
# not really used during build, but a precaution
rm maven-ant-tasks-*.jar
@@ -159,14 +89,12 @@ sed -i 's:\r::' *.txt
# fix for animal-sniffer (we don't generate 1.5 signatures)
sed -i 's:check-java-1.5-compat:check-java-1.6-compat:' pom.xml
-pushd apache-maven
-rm src/bin/*bat
-sed -i 's:\r::' src/conf/settings.xml
+rm -f apache-maven/src/bin/*.bat
+sed -i 's:\r::' apache-maven/src/conf/settings.xml
# Update shell scripts to use unversioned classworlds
sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath "${M2_HOME}"/boot/plexus-classworlds.jar':g \
- src/bin/mvn*
-popd
+ apache-maven/src/bin/mvn*
# Disable animal-sniffer on RHEL
# Temporarily disabled for fedora to solve asm & asm4 clashing on classpath
@@ -174,226 +102,103 @@ popd
%pom_remove_plugin :animal-sniffer-maven-plugin
#fi
+%pom_add_dep org.codehaus.plexus:plexus-container-default maven-plugin-api
+# Test dependencies
%pom_add_dep aopalliance:aopalliance:any:test maven-model-builder
%pom_add_dep cglib:cglib:any:test maven-model-builder
%build
-mvn-rpmbuild -e install javadoc:aggregate
+# Put all JARs in standard location, but create symlinks in Maven lib
+# directory so that Plexus Classworlds can find them.
+%mvn_file ":{*}" %{name}/@1 %{_datadir}/%{name}/lib/@1
+
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
mkdir m2home
(cd m2home
-tar --delay-directory-restore -xvf ../apache-maven/target/*tar.gz
-chmod -R +rwX apache-%{name}-%{version}%{?ver_add}
-chmod -x apache-%{name}-%{version}%{?ver_add}/conf/settings.xml
+ tar --delay-directory-restore -xvf ../apache-maven/target/*tar.gz
+ chmod -R +rwX apache-%{name}-%{version}%{?ver_add}
+ chmod -x apache-%{name}-%{version}%{?ver_add}/conf/settings.xml
)
%install
-export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{?ver_add}
+%mvn_install
-# maven2 directory in /usr/share/java
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-
-# put global m2 config into /etc and symlink it later
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}
-mv $M2_HOME/bin/m2.conf $RPM_BUILD_ROOT%{_sysconfdir}/
-
-###########
-# M2_HOME #
-###########
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-#################
-# Repo metadata #
-#################
-install -m 755 %{SOURCE250} $RPM_BUILD_ROOT%{_datadir}/%{name}/
-
-
-###############
-# M2_HOME/bin #
-###############
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
-cp -a $M2_HOME/bin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
-
-ln -sf %{_sysconfdir}/m2.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/m2.conf
-
-# Fallback scripts
-cp -af %{SOURCE201} $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/mvn-local
-cp -af %{SOURCE202} $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/mvn-rpmbuild
-
-
-################
-# M2_HOME/boot #
-################
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/boot
+export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{?ver_add}
-# this dangling symlink will be filled in by Requires
-(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/boot
- ln -sf `build-classpath plexus/classworlds` plexus-classworlds.jar
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/bin
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/boot
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/lib
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/ext
+install -d -m 755 %{buildroot}%{_bindir}
+install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d
+install -d -m 755 %{buildroot}%{_mandir}/man1
+
+install -p -m 755 %{SOURCE200} %{buildroot}%{_bindir}/mvn
+install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
+mv $M2_HOME/bin/m2.conf %{buildroot}%{_sysconfdir}
+ln -sf %{_sysconfdir}/m2.conf %{buildroot}%{_datadir}/%{name}/bin/m2.conf
+
+cp -a $M2_HOME/bin/* %{buildroot}%{_datadir}/%{name}/bin
+cp -a $M2_HOME/conf/* %{buildroot}%{_datadir}/%{name}/conf
+
+ln -sf $(build-classpath plexus/classworlds) \
+ %{buildroot}%{_datadir}/%{name}/boot/plexus-classworlds.jar
+
+(cd %{buildroot}%{_datadir}/%{name}/lib
+ build-jar-repository -s -p . \
+ aether/api \
+ aether/connector-wagon \
+ aether/impl \
+ aether/spi \
+ aether/util \
+ aopalliance \
+ atinject \
+ cglib \
+ commons-cli \
+ google-guice \
+ guava \
+ maven-wagon/file \
+ maven-wagon/http-lightweight \
+ maven-wagon/http-shared \
+ maven-wagon/provider-api \
+ nekohtml \
+ objectweb-asm \
+ plexus/containers-component-annotations \
+ plexus/interpolation \
+ plexus/plexus-cipher \
+ plexus/plexus-sec-dispatcher \
+ plexus/utils \
+ sisu/sisu-inject-bean \
+ sisu/sisu-inject-plexus \
+ slf4j/api \
+ slf4j/nop \
+ xbean/xbean-reflect \
+ xerces-j2 \
)
-################
-# M2_HOME/conf #
-################
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/conf
-cp -a $M2_HOME/conf/* $RPM_BUILD_ROOT%{_datadir}/%{name}/conf/
-
-###############
-# M2_HOME/lib #
-###############
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
-
-# jdom is needed for our custom resolving code only
-(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
-
- build-jar-repository -s -p . aether/api aether/connector-wagon aether/impl aether/spi aether/util \
- commons-cli guava google-guice nekohtml plexus/plexus-cipher \
- plexus/containers-component-annotations \
- plexus/interpolation plexus/plexus-sec-dispatcher plexus/utils \
- sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \
- maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \
- xbean/xbean-reflect xerces-j2 atinject aopalliance cglib \
- slf4j/api slf4j/nop objectweb-asm
- # dependency of our resolver
- mkdir ext/
- build-jar-repository -s -p ext/ xml-commons-apis
-)
-
-################
-# M2_HOME/poms #
-#*##############
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/poms
-
-########################
-# /etc/maven/fragments #
-########################
-install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/maven/fragments
-
-##############################
-# /usr/share/java repository #
-##############################
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/repository
-ln -s %{_javadir} $RPM_BUILD_ROOT%{_datadir}/%{name}/repository/JPP
-
-##############################
-# /usr/share/java-jni repository #
-##############################
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/repository-java-jni
-ln -s %{_javajnidir} $RPM_BUILD_ROOT%{_datadir}/%{name}/repository-java-jni/JPP
-
-##############################
-# _libdir/java repository #
-##############################
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/repository-jni
-# create symlink in post, remove in preun so we can stay noarch
-
-##################
-# javadir/maven #
-#*################
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-
-#######################
-# javadir/maven/poms #
-#*#####################
-ln -s %{_datadir}/%{name}/poms $RPM_BUILD_ROOT%{_javadir}/%{name}/poms
-
-# for our custom resolver to remove dependencies we need empty jar and
-# pom file
-install -m 644 %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven-empty-dep.pom
-install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
-
-# Dependencies that should be ignored.
-%add_to_maven_depmap javax.activation activation any JPP/%{name} empty-dep
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.activation any JPP/%{name} empty-dep
-%add_to_maven_depmap org.apache.maven.wagon wagon-webdav any JPP/%{name} empty-dep
-%add_to_maven_depmap org.apache.maven.wagon wagon-webdav-jackrabbit any JPP/%{name} empty-dep
-
-############
-# /usr/bin #
-############
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-
-# Wrapper
-cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn
-
-###################
-# Individual jars #
-###################
-
-for module in maven-aether-provider maven-artifact maven-compat \
- maven-core maven-embedder maven-model \
- maven-model-builder maven-plugin-api \
- maven-repository-metadata maven-settings \
- maven-settings-builder;do
-
- pushd $module
- install -m 644 target/$module-%{version}%{?ver_add}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
- ln -s %{_javadir}/%{name}/$module.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/$module.jar
- install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$module.pom
- %add_to_maven_depmap org.apache.maven $module %{version} JPP/%{name} $module
- popd
-done
-
-# maven pom
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven.pom
-%add_to_maven_depmap org.apache.maven maven %{version} JPP/%{name} maven
-
-# javadocs
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# Install bash-completion
-install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
-
-# Manual page
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
-gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/*
-
-
-%preun
-if [ $1 -eq 0 ] ; then
- if [ -h %{_datadir}/%{name}/repository-jni/JPP ];then
- rm %{_datadir}/%{name}/repository-jni/JPP
- fi
-fi
-
-%posttrans
-# ugly as hell
-ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
-
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt README.txt
-%attr(0755,root,root) %{_bindir}/mvn
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/bin
-%attr(0755,root,root) %{_datadir}/%{name}/bin/mvn
-%attr(0755,root,root) %{_datadir}/%{name}/bin/mvnyjp
-%attr(0755,root,root) %{_datadir}/%{name}/bin/mvnDebug
-%attr(0755,root,root) %{_datadir}/%{name}/bin/mvn-local
-%attr(0755,root,root) %{_datadir}/%{name}/bin/mvn-rpmbuild
-%{_datadir}/%{name}/bin/*.conf
+%{_datadir}/%{name}
+%{_bindir}/mvn
+%dir %{_javadir}/%{name}
%config(noreplace) %{_sysconfdir}/m2.conf
-%{_datadir}/%{name}/boot
-%{_datadir}/%{name}/conf
-%{_datadir}/%{name}/lib
-%{_datadir}/%{name}/poms
-%{_datadir}/%{name}/repository
-%{_datadir}/%{name}/repository-jni
-%{_datadir}/%{name}/repository-java-jni
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}
-%{_datadir}/%{name}/repo-metadata.tar.xz
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
%{_mandir}/man1/mvn.1.gz
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
%changelog
+* Fri Jan 25 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-29
+- Drop support for local mode
+- Build with xmvn, rely on auto-requires
+
* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-28
- Move mvn-local and mvn-rpmbuild out of %_bindir
11 years, 3 months
Re: [java-sig-commits] #5467: 2 Packages missing from mirrors
by Fedora Release Engineering
#5467: 2 Packages missing from mirrors
------------------------------+-----------------------
Reporter: limb | Owner: rel-eng@…
Type: task | Status: closed
Milestone: Fedora 19 Alpha | Component: koji
Resolution: fixed | Keywords:
Blocked By: | Blocking:
------------------------------+-----------------------
Changes (by kevin):
* resolution: => fixed
* status: new => closed
Comment:
You can --force tag things into f18-updates and they should go out with
the next updates push.
I'd done so with the rt3 package.
--
Ticket URL: <https://fedorahosted.org/rel-eng/ticket/5467#comment:4>
Fedora Release Engineering <http://fedorahosted.org/rel-eng>
Release Engineering for the Fedora Project
11 years, 3 months
[maven-reporting-impl] Migrate from maven-doxia to doxia subpackages
by Michal Srb
commit 516c3d383572d3015ff35817db8c9028b244ef60
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Feb 5 09:32:36 2013 +0100
Migrate from maven-doxia to doxia subpackages
maven-reporting-impl.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index b2d69ef..64b047e 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -1,6 +1,6 @@
Name: maven-reporting-impl
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Abstract classes to manage report generation
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-reporting-impl
@@ -22,7 +22,7 @@ Requires: apache-commons-validator
Requires: java
Requires: jpackage-utils
Requires: maven
-Requires: maven-doxia
+Requires: maven-doxia-core
Requires: maven-doxia-sink-api
Requires: maven-doxia-sitetools
Requires: maven-project
@@ -84,6 +84,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Tue Feb 05 2013 Michal Srb <msrb(a)redhat.com> - 2.2-2
+- Migrate from maven-doxia to doxia subpackages
+
* Fri Jan 11 2013 Tomas Radej <tradej(a)redhat.com> - 2.2-1
- Initial version
11 years, 3 months
