[maven-jar-plugin] Install license files
by Stanislav Ochotnicky
commit 8667d0d761434000f6896be47a9e31ea36786938
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 13 14:13:54 2012 +0100
Install license files
- Use generated maven file lists
maven-jar-plugin.spec | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 6d238c6..4784374 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-jar-plugin
Version: 2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven JAR Plugin
Group: Development/Libraries
@@ -14,6 +14,7 @@ Patch0: %{name}-maven-core-dep.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: javapackages-tools >= 0.7.0
BuildRequires: maven
BuildRequires: maven-plugin-plugin
BuildRequires: maven-jar-plugin
@@ -44,7 +45,7 @@ Provides: maven2-plugin-jar = %{version}-%{release}
Obsoletes: maven2-plugin-jar <= 0:2.0.8
%description
-Builds a Java Archive (JAR) file from the compiled
+Builds a Java Archive (JAR) file from the compiled
project classes and resources.
%package javadoc
@@ -57,7 +58,7 @@ API documentation for %{name}.
%prep
-%setup -q
+%setup -q
%patch0 -p1
#let plexus-container-default be retrieved as a dependency
@@ -82,15 +83,18 @@ install -pm 644 pom.xml \
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%doc LICENSE NOTICE
%files javadoc
+%doc LICENSE NOTICE
%{_javadocdir}/%{name}
%changelog
+* Tue Nov 13 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.4-3
+- Install license files
+- Use generated maven file lists
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 6 months
[maven] Temporarly require Plexus POMs as a workaround
by Mikolaj Izdebski
commit c0f471b46904e17eda9727ac1acef66ca6a872e7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Nov 13 11:01:31 2012 +0100
Temporarly require Plexus POMs as a workaround
maven.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 97366ed..770c1d1 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -84,6 +84,9 @@ BuildRequires: animal-sniffer >= 1.6-5
BuildRequires: plexus-pom
BuildRequires: plexus-components-pom
BuildRequires: plexus-tools-pom
+Requires: plexus-pom
+Requires: plexus-components-pom
+Requires: plexus-tools-pom
Requires: aether >= 1.13.1
Requires: apache-commons-cli
@@ -421,6 +424,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Tue Nov 13 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-23
+- Temporarly require Plexus POMs as a workaround
+
* Mon Nov 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-22
- Drop dependency on maven2-common-poms
- Drop support for /etc/maven/fragments
11 years, 6 months
[maven] Drop dependency on maven2-common-poms
by Mikolaj Izdebski
commit a419043fad59e30841bf60e32f203798f7ff4a5e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Nov 12 19:23:40 2012 +0100
Drop dependency on maven2-common-poms
- Drop support for /etc/maven/fragments
MavenJPackageDepmap.java | 16 +++-----------
maven.spec | 48 ++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 48 insertions(+), 16 deletions(-)
---
diff --git a/MavenJPackageDepmap.java b/MavenJPackageDepmap.java
index 8fa1b3b..ab2fea1 100644
--- a/MavenJPackageDepmap.java
+++ b/MavenJPackageDepmap.java
@@ -160,21 +160,13 @@ public class MavenJPackageDepmap {
private static void buildJppArtifactMap() {
- processDepmapFile("/etc/maven/maven2-versionless-depmap.xml");
-
- // process fragments in etc
- File fragmentDir = new File("/etc/maven/fragments");
- String flist[] = fragmentDir.list();
- if (flist != null) {
- java.util.Arrays.sort(flist);
- for (String fragFilename : flist)
- processDepmapFile("/etc/maven/fragments/" + fragFilename);
- }
+ if (new File("/etc/maven/maven2-versionless-depmap.xml").exists())
+ processDepmapFile("/etc/maven/maven2-versionless-depmap.xml");
// process fragments is usr. Once packages are rebuilt, we can skip
// fragments in /etc
- fragmentDir = new File("/usr/share/maven-fragments");
- flist = fragmentDir.list();
+ File fragmentDir = new File("/usr/share/maven-fragments");
+ String[] flist = fragmentDir.list();
if (flist != null) {
java.util.Arrays.sort(flist);
for (String fragFilename : flist)
diff --git a/maven.spec b/maven.spec
index 1cd4dae..97366ed 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -47,6 +47,8 @@ BuildArch: noarch
BuildRequires: aether >= 1.13.1
BuildRequires: aopalliance
BuildRequires: apache-commons-parent
+BuildRequires: apache-parent
+BuildRequires: apache-resource-bundles
BuildRequires: async-http-client
BuildRequires: atinject
BuildRequires: buildnumber-maven-plugin
@@ -54,13 +56,14 @@ BuildRequires: cglib
BuildRequires: google-guice >= 3.0
BuildRequires: hamcrest
BuildRequires: maven
-BuildRequires: maven2-common-poms
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-parent
+BuildRequires: maven-plugins-pom
+BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-plugin
@@ -77,9 +80,16 @@ BuildRequires: xmlunit
BuildRequires: animal-sniffer >= 1.6-5
%endif
+# FIXME temporarly require plexus POMs until plexus packages are fixed
+BuildRequires: plexus-pom
+BuildRequires: plexus-components-pom
+BuildRequires: plexus-tools-pom
+
Requires: aether >= 1.13.1
Requires: apache-commons-cli
Requires: apache-commons-parent
+Requires: apache-parent
+Requires: apache-resource-bundles
Requires: async-http-client
Requires: atinject
Requires: google-guice >= 3.0
@@ -87,8 +97,9 @@ Requires: guava
Requires: hamcrest
Requires: hamcrest
Requires: java >= 1:1.6.0
-Requires: maven2-common-poms
Requires: maven-parent
+Requires: maven-plugins-pom
+Requires: maven-remote-resources-plugin
Requires: maven-wagon
Requires: mojo-parent
Requires: nekohtml
@@ -299,6 +310,12 @@ ln -s %{_datadir}/%{name}/poms $RPM_BUILD_ROOT%{_javadir}/%{name}/poms
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 #
############
@@ -343,6 +360,25 @@ install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/*
+
+# Ugly as hell, but Eclipse relocated various artifacts under
+# their own groupId. We need to fix this globally.
+# FIXME: this should be moved to respective packages
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet any JPP tomcat-servlet-3.0-api
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.security.auth.message any JPP geronimo-jaspic-spec
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.mail.glassfish any JPP/javamail mail
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.transaction any JPP geronimo-jta
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.annotation any JPP geronimo-annotation
+%add_to_maven_depmap org.eclipse.jetty.orbit org.objectweb.asm any JPP/objectweb-asm asm-all
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp any JPP tomcat-jsp-api
+%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.jasper.glassfish any JPP glassfish-jsp
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp.jstl any JPP taglibs-core
+%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish any JPP taglibs-standard
+%add_to_maven_depmap org.eclipse.jetty.orbit javax.el any JPP tomcat-el-2.2-api
+%add_to_maven_depmap org.eclipse.jetty.orbit com.sun.el any JPP tomcat-el-2.2-api
+%add_to_maven_depmap org.eclipse.jetty.orbit org.eclipse.jdt.core any JPP/eclipse jdt.core
+
+
%preun
if [ $1 -eq 0 ] ; then
if [ -h %{_datadir}/%{name}/repository-jni/JPP ];then
@@ -373,7 +409,7 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%{_datadir}/%{name}/repository
%{_datadir}/%{name}/repository-jni
%{_datadir}/%{name}/repository-java-jni
-%config %{_mavendepmapfragdir}/%{name}
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%{_datadir}/%{name}/repo-metadata.tar.xz
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
@@ -385,6 +421,10 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon Nov 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-22
+- Drop dependency on maven2-common-poms
+- Drop support for /etc/maven/fragments
+
* Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-21
- Add support for custom jar/pom/fragment directories
11 years, 6 months
[async-http-client] Update to upstream version 1.7.7
by Mikolaj Izdebski
commit 9b8e0fa6343769b1fc6b992a6a29d17b5183aa22
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Nov 12 17:49:33 2012 +0100
Update to upstream version 1.7.7
async-http-client.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/async-http-client.spec b/async-http-client.spec
index 86cac83..cf1f775 100644
--- a/async-http-client.spec
+++ b/async-http-client.spec
@@ -1,6 +1,6 @@
Name: async-http-client
-Version: 1.7.6
+Version: 1.7.7
Release: 1%{?dist}
Summary: Asynchronous Http Client for Java
@@ -91,6 +91,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Mon Nov 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.7.7-1
+- Update to upstream version 1.7.7
+
* Thu Oct 25 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.7.6-1
- Update to upstream version 1.7.6
- Update to current packaging guidelines
diff --git a/sources b/sources
index fe25515..89bef7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfdf928cb9b51aa4c02c9c980be6fa7c async-http-client-1.7.6.tar.bz2
+22aa0810651c0d2bc8788474a20dca59 async-http-client-1.7.7.tar.bz2
11 years, 6 months
[Bug 875779] New: Snakeyaml bundles base64coder and part of gdata-utils
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=875779
Bug ID: 875779
Severity: unspecified
Clone Of: 875777
Version: 7.0
Depends On: 875777
Priority: unspecified
CC: java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com, mizdebsk(a)redhat.com,
mmorsi(a)redhat.com
Assignee: java-maint(a)redhat.com
Summary: Snakeyaml bundles base64coder and part of gdata-utils
Regression: ---
Story Points: ---
Classification: Red Hat
OS: Unspecified
Reporter: sochotni(a)redhat.com
Type: Bug
Documentation: ---
Hardware: Unspecified
Mount Type: ---
Status: NEW
Component: snakeyaml
Product: Red Hat Enterprise Linux 7
+++ This bug was initially created as a clone of Bug #875777 +++
Description of problem:
src/main/java/org/yaml/snakeyaml/external contains external modules that are
source-bundled within snakeyaml. Ideally they should be unbunled (they are
already packaged separately)
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 6 months