[maven-changes-plugin] Migration from plexus-maven-plugin to plexus-containers-component-metadata
by Stanislav Ochotnicky
commit 85e23f59cf85b7890550883d117da1531f0ae9f7
Author: Jaromír Cápík <jcapik(a)redhat.com>
Date: Tue Jul 19 13:38:49 2011 +0200
Migration from plexus-maven-plugin to plexus-containers-component-metadata
...es-plugin-migration-to-component-metadata.patch | 29 ++++++++++++++++++++
maven-changes-plugin.spec | 11 +++++--
2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/maven-changes-plugin-migration-to-component-metadata.patch b/maven-changes-plugin-migration-to-component-metadata.patch
new file mode 100644
index 0000000..0f28625
--- /dev/null
+++ b/maven-changes-plugin-migration-to-component-metadata.patch
@@ -0,0 +1,29 @@
+diff -Naur maven-changes-plugin-2.6.orig/pom.xml maven-changes-plugin-2.6/pom.xml
+--- maven-changes-plugin-2.6.orig/pom.xml 2011-06-19 08:07:34.000000000 +0200
++++ maven-changes-plugin-2.6/pom.xml 2011-07-15 12:54:07.256409156 +0200
+@@ -383,14 +383,13 @@
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.8</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+@@ -404,7 +403,7 @@
+ </configuration>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>merge-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index 2bd9d4b..22a826b 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changes-plugin
Version: 2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries
@@ -10,6 +10,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%
Source1: %{name}.depmap
Patch0: 0001-Fix-Maven-3-compatibility.patch
+Patch1: %{name}-migration-to-component-metadata.patch
BuildArch: noarch
@@ -35,7 +36,7 @@ BuildRequires: maven-shared-reporting-api
BuildRequires: maven-shared-reporting-impl
BuildRequires: modello
BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-mail-sender
BuildRequires: plexus-i18n
BuildRequires: plexus-interpolation
@@ -98,12 +99,13 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
mvn-rpmbuild -e \
-Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
@@ -133,6 +135,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Fri Jul 15 2011 Jaromir Capik <jcapik(a)redhat.com> 2.6-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.6-1
- Update to latest upstream (2.6)
- Properly complete BR/R
12 years, 9 months
[Bug 723124] New: maven2 owns files also owned by subpackages
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: maven2 owns files also owned by subpackages
https://bugzilla.redhat.com/show_bug.cgi?id=723124
Summary: maven2 owns files also owned by subpackages
Product: Fedora
Version: rawhide
Platform: noarch
OS/Version: Linux
Status: NEW
Severity: medium
Priority: unspecified
Component: maven2
AssignedTo: yyang(a)redhat.com
ReportedBy: guido.grazioli(a)gmail.com
QAContact: extras-qa(a)fedoraproject.org
CC: dbhole(a)redhat.com, yyang(a)redhat.com,
akurtako(a)redhat.com, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Description of problem:
Multiple jars in /usr/share/java/maven2 are owned both my maven2 rpm and its
subpackages.
Version-Release number of selected component (if applicable):
maven2-2.2.1-25.fc16.noarch
How reproducible:
for i in /usr/share/java/maven2/*.jar ; do echo $i ; rpm -q --whatprovides $i ;
done
Actual results:
/usr/share/java/maven2/maven-artifact-manager.jar
maven-artifact-manager-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
/usr/share/java/maven2/maven-model.jar
maven-model-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
/usr/share/java/maven2/maven-monitor.jar
maven-monitor-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
/usr/share/java/maven2/maven-plugin-registry.jar
maven-plugin-registry-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
/usr/share/java/maven2/maven-profile.jar
maven-profile-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
/usr/share/java/maven2/maven-project.jar
maven-project-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
/usr/share/java/maven2/maven-toolchain.jar
maven-toolchain-2.2.1-25.fc16.noarch
maven2-2.2.1-25.fc16.noarch
Expected results:
affected jars are only owned by actual package
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 9 months
[maven2] Unown files contained in subpackages (#723124)
by Stanislav Ochotnicky
commit 9dfef89c5781a822a42b218e98165ee2eee61ea5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jul 19 10:32:02 2011 +0200
Unown files contained in subpackages (#723124)
maven2.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index d27c6f2..2321880 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -599,8 +599,16 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
%{_datadir}/%{name}/repository
-%{_mavendepmapfragdir}
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
+%exclude %{_javadir}/%{name}/maven-artifact-manager.jar
+%exclude %{_javadir}/%{name}/maven-project.jar
+%exclude %{_javadir}/%{name}/maven-plugin-registry.jar
+%exclude %{_javadir}/%{name}/maven-monitor.jar
+%exclude %{_javadir}/%{name}/maven-model.jar
+%exclude %{_javadir}/%{name}/maven-profile.jar
+%exclude %{_javadir}/%{name}/maven-toolchain.jar
+
%if %{bootstrap}
%{_datadir}/%{name}/bootstrap_repo
@@ -644,6 +652,9 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%changelog
+* Tue Jul 19 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-26
+- Unown jars contained in subpackages (#723124)
+
* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-25
- Add maven-toolchain subpackage
12 years, 9 months
[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=652183
Guido Grazioli <guido.grazioli(a)gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Depends on| |723124
Bug 652183 depends on bug 718188, which changed state.
Bug 718188 Summary: Review Request: jpathwatch - Java library for monitoring directories for changes
https://bugzilla.redhat.com/show_bug.cgi?id=718188
What |Old Value |New Value
----------------------------------------------------------------------------
Resolution| |ERRATA
Status|ON_QA |CLOSED
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.
12 years, 9 months
[Bug 718830] New: Fedora's httpcomponents-client imports too many logging related packages
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Fedora's httpcomponents-client imports too many logging related packages
https://bugzilla.redhat.com/show_bug.cgi?id=718830
Summary: Fedora's httpcomponents-client imports too many
logging related packages
Product: Fedora
Version: 15
Platform: All
OS/Version: Linux
Status: NEW
Severity: urgent
Priority: unspecified
Component: httpcomponents-client
AssignedTo: sochotni(a)redhat.com
ReportedBy: sgehwolf(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: sochotni(a)redhat.com, sgehwolf(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Created attachment 511222
--> https://bugzilla.redhat.com/attachment.cgi?id=511222
Working version of MANIFEST.MF for httpclient v4.1.x
Description of problem:
Upstream's package only depends on org.apache.commons.logging (v1.1.1). See
https://issues.apache.org/jira/browse/HTTPCLIENT-1082 for reference. However,
the generated MANIFEST.MF of /usr/share/java/httpcomponents/httpclient.jar
contains Import-Package statements including org.apache.log, org.apache.log4j
and a few others. However, it should only import org.apache.commons.logging and
perhaps org.apache.commons.logging.impl (which is provided by
apache-commons-logging).
Version-Release number of selected component (if applicable):
rpm -q httpcomponents-client
httpcomponents-client-4.1.1-2.fc16.noarch
How reproducible:
Always.
Steps to Reproduce:
Please get back to me if you need a reproducer.
Actual results:
MANIFEST.MF has wrong Import-Package statements.
Expected results:
MANIFEST.MF looks similar to the version I'm attaching. That one, which only
removes wrong Import-Package statements, works for me.
For reference, have a look at the MANIFEST.MF of httpclient v4.1.0 as provided
by eclipse.org (orbit):
http://www.eclipse.org/downloads/download.php?r=1&file=/tools/orbit/downl...
They do not depend on any logging frameworks other than commons.logging.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 9 months
[httpcomponents-client] Fix for RH Bz#718830
by jerboaa
commit 0f67941d83ffe19ebc06e34d373381711d385bcb
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Fri Jul 15 17:33:46 2011 -0400
Fix for RH Bz#718830
Add instructions so as to not Import-Package optional dependencies.
0001-Cleanup-pom.patch | 235 --------------------------------------------
httpclient-pom-fix.patch | 80 +++++++++++++++
httpcomponents-client.spec | 16 +++-
httpmime-pom-fix.patch | 23 +++++
main-pom-fix.patch | 114 +++++++++++++++++++++
5 files changed, 230 insertions(+), 238 deletions(-)
---
diff --git a/httpclient-pom-fix.patch b/httpclient-pom-fix.patch
new file mode 100644
index 0000000..a1d4327
--- /dev/null
+++ b/httpclient-pom-fix.patch
@@ -0,0 +1,80 @@
+--- httpclient/pom.xml.sav 2011-03-14 16:54:35.000000000 -0400
++++ httpclient/pom.xml 2011-07-15 16:41:41.568795119 -0400
+@@ -38,7 +38,7 @@
+ HttpComponents Client (base module)
+ </description>
+ <url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -65,12 +65,6 @@
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.mockito</groupId>
+- <artifactId>mockito-core</artifactId>
+- <version>${mockito.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <properties>
+@@ -116,25 +110,19 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
+ <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ <Private-Package></Private-Package>
++ <Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-Package>
++ </instructions>
+ </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
++ </plugin>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -161,11 +149,14 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <version>${clover.version}</version>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+- <jdk>1.5</jdk>
++ <instructions>
++ <Export-Package>*</Export-Package>
++ <Private-Package></Private-Package>
++ <Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-Package>
++ </instructions>
+ </configuration>
+ </plugin>
+
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 1642a41..73170e9 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,13 +3,17 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/httpcomponent...
# Remove optional build deps not available in Fedora
-Patch0: 0001-Cleanup-pom.patch
+# and add proper Apache felix bundle plugin instructions
+# so that we get a reasonable OSGi manifest.
+Patch0: main-pom-fix.patch
+Patch1: httpclient-pom-fix.patch
+Patch2: httpmime-pom-fix.patch
BuildArch: noarch
@@ -46,7 +50,9 @@ API docs for %{name}.
%prep
%setup -q
-%patch0 -p1 -b .sav
+%patch0 -b .sav
+%patch1 -b .sav
+%patch2 -b .sav
%build
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
@@ -94,6 +100,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Jul 15 2011 Severin Gehwolf <sgehwolf(a)redhat.com> 4.1.1-3
+- Fix for RH Bz#718830. Add instructions so as to not
+ Import-Package optional dependencies.
+
* Thu Apr 7 2011 Severin Gehwolf <sgehwolf(a)redhat.com> 4.1.1-2
- Add BR/R apache-commons-codec, since httpcomponents-client's
MANIFEST.MF has an Import-Package: org.apache.commons.codec
diff --git a/httpmime-pom-fix.patch b/httpmime-pom-fix.patch
new file mode 100644
index 0000000..5ecc705
--- /dev/null
+++ b/httpmime-pom-fix.patch
@@ -0,0 +1,23 @@
+--- httpmime/pom.xml.sav 2011-03-14 16:54:32.000000000 -0400
++++ httpmime/pom.xml 2011-07-15 13:51:08.530725700 -0400
+@@ -38,7 +38,7 @@
+ HttpComponents HttpClient - MIME coded entities
+ </description>
+ <url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -112,6 +112,11 @@
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+
diff --git a/main-pom-fix.patch b/main-pom-fix.patch
new file mode 100644
index 0000000..371e98d
--- /dev/null
+++ b/main-pom-fix.patch
@@ -0,0 +1,114 @@
+--- pom.xml.sav 2011-03-14 16:54:35.000000000 -0400
++++ pom.xml 2011-07-15 13:51:08.537725611 -0400
+@@ -82,28 +82,11 @@
+ <modules>
+ <module>httpclient</module>
+ <module>httpmime</module>
+- <module>httpclient-cache</module>
+- <module>httpclient-osgi</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+- <artifactId>maven-notice-plugin</artifactId>
+- <groupId>org.apache.httpcomponents</groupId>
+- <executions>
+- <execution>
+- <id>attach-notice-license</id>
+- <goals>
+- <goal>generate</goal>
+- </goals>
+- </execution>
+- </executions>
+- <configuration>
+- <projectTitle>Apache HttpComponents</projectTitle>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+@@ -190,49 +173,6 @@
+ </configuration>
+ </plugin>
+ <plugin>
+- <groupId>com.agilejava.docbkx</groupId>
+- <artifactId>docbkx-maven-plugin</artifactId>
+- <dependencies>
+- <dependency>
+- <groupId>org.docbook</groupId>
+- <artifactId>docbook-xml</artifactId>
+- <version>4.4</version>
+- <scope>runtime</scope>
+- </dependency>
+- </dependencies>
+- <configuration>
+- <includes>index.xml</includes>
+- <chunkedOutput>true</chunkedOutput>
+- <xincludeSupported>true</xincludeSupported>
+- <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+- <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
+- <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
+- <entities>
+- <entity>
+- <name>version</name>
+- <value>${project.version}</value>
+- </entity>
+- </entities>
+- <postProcess>
+- <copy todir="target/site/tutorial">
+- <fileset dir="target/docbkx">
+- <include name="**/*.html" />
+- <include name="**/*.pdf" />
+- </fileset>
+- </copy>
+- <copy todir="target/site/tutorial/html">
+- <fileset dir="src/docbkx/resources">
+- <include name="**/*.css" />
+- <include name="**/*.png" />
+- <include name="**/*.gif" />
+- <include name="**/*.jpg" />
+- </fileset>
+- </copy>
+- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
+- </postProcess>
+- </configuration>
+- </plugin>
+- <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+@@ -253,14 +193,7 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <configuration>
+- <comparisonVersion>${comparisonVersion}</comparisonVersion>
+- </configuration>
+- </plugin>
+- </plugins>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -281,15 +214,7 @@
+ </reportSets>
+ </plugin>
+
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <configuration>
+- <comparisonVersion>${comparisonVersion}</comparisonVersion>
+- </configuration>
+- </plugin>
+-
+- </plugins>
++ </plugins>
+ </reporting>
+
+ </project>
12 years, 9 months