Attachment 587017 Details for Bug 825355 – Proposed patch to remove completely the build-config module

[patch] Proposed patch to remove completely the build-config module

0001-Remove-dependency-on-the-checkstyle-module-rhgz-8253.patch (text/plain), 4.65 KB, created by Juan Hernández on 2012-05-26 14:44:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2012-05-26 14:44:42 UTC

Size: 4.65 KB

patch

obsolete

>From 706bf3d96909b1882e624aa83da233be09876783 Mon Sep 17 00:00:00 2001
>From: Juan Hernandez <juan.hernandez@redhat.com>
>Date: Sat, 26 May 2012 16:27:24 +0200
>Subject: [PATCH] Remove dependency on the checkstyle module (rhgz#825355)
>
>The build-config module contains only the checkstyle configuration
>file used in the rest of the modules. Execution of checkstyle has
>already been removed as it generates the following error:
>
>[ERROR] Failed to execute goal
>org.apache.maven.plugins:maven-checkstyle-plugin:2.9.1:checkstyle
>(check-style) on project weld-core-parent: Reporting mojo's can
>only be called from ReportDocumentRender -> [Help 1]
>
>But the parent POM still contains a non optional dependency on
>build-config, so builds or other packages can bring it as a
>transitive dependency. In order to avoid that this patch excludes
>build-config from the build and removes the dependency from the
>parent POM.
>
>In the future, if the above ERROR is fixed the build-config
>dependency should also be changed to be optional.
>---
> weld-core-remove-checkstyle.patch |   56 +++++++++++++++++++++++++++++++++----
> weld-core.spec                    |    5 +++-
> 2 files changed, 54 insertions(+), 7 deletions(-)
>
>diff --git a/weld-core-remove-checkstyle.patch b/weld-core-remove-checkstyle.patch
>index 123f565..a34ff90 100644
>--- a/weld-core-remove-checkstyle.patch
>+++ b/weld-core-remove-checkstyle.patch
>@@ -1,7 +1,51 @@
>-diff -Naur weld-core-1.1.5.AS71.Final/pom.xml weld-core-1.1.5.AS71.Final-work/pom.xml
>---- weld-core-1.1.5.AS71.Final/pom.xml	2012-03-15 10:15:45.699999974 +0100
>-+++ weld-core-1.1.5.AS71.Final-work/pom.xml	2012-03-15 10:46:10.320001536 +0100
>-@@ -523,42 +523,9 @@
>+diff --git a/pom.xml b/pom.xml
>+index 09c5afe..6d9805a 100644
>+--- a/pom.xml
>++++ b/pom.xml
>+@@ -39,7 +39,6 @@
>+         <cargo.maven2.plugin.version>1.0</cargo.maven2.plugin.version>
>+         <cdi.api.version>1.0-SP4</cdi.api.version>
>+         <cdi.tck.version>1.0.4.SP3</cdi.tck.version>
>+-        <checkstyle.plugin.version>2.5</checkstyle.plugin.version>
>+         <contiperf.version>1.06</contiperf.version>
>+         <findbugs-maven-plugin.version>2.3.2</findbugs-maven-plugin.version>
>+         <glassfish.el.version>2.1.2-b04</glassfish.el.version>
>+@@ -73,7 +72,6 @@
>+     </properties>
>+ 
>+     <modules>
>+-        <module>build-config</module>
>+         <module>impl</module>
>+     </modules>
>+ 
>+@@ -396,12 +394,6 @@
>+ 
>+             <dependency>
>+                 <groupId>org.jboss.weld</groupId>
>+-                <artifactId>weld-build-config</artifactId>
>+-                <version>${project.version}</version>
>+-            </dependency>
>+-
>+-            <dependency>
>+-                <groupId>org.jboss.weld</groupId>
>+                 <artifactId>weld-core</artifactId>
>+                 <version>${project.version}</version>
>+             </dependency>
>+@@ -495,13 +487,6 @@
>+ 
>+     </dependencyManagement>
>+ 
>+-    <dependencies>
>+-        <dependency>
>+-            <groupId>org.jboss.weld</groupId>
>+-            <artifactId>weld-build-config</artifactId>
>+-        </dependency>
>+-    </dependencies>
>+-
>+     <build>
>+         <pluginManagement>
>+             <plugins>
>+@@ -523,42 +508,9 @@
>                      <artifactId>selenium-maven-plugin</artifactId>
>                      <version>${selenium.maven.plugin.version}</version>
>                  </plugin>
>@@ -44,7 +88,7 @@ diff -Naur weld-core-1.1.5.AS71.Final/pom.xml weld-core-1.1.5.AS71.Final-work/po
>      </build>
>  
>  
>-@@ -591,13 +558,6 @@
>+@@ -591,13 +543,6 @@
>                      <value>!false</value>
>                  </property>
>              </activation>
>@@ -58,7 +102,7 @@ diff -Naur weld-core-1.1.5.AS71.Final/pom.xml weld-core-1.1.5.AS71.Final-work/po
>          </profile>
>          <profile>
>              <id>examples</id>
>-@@ -640,11 +600,6 @@
>+@@ -640,11 +585,6 @@
>                      <value>!false</value>
>                  </property>
>              </activation>
>diff --git a/weld-core.spec b/weld-core.spec
>index e2426ea..ada1be3 100644
>--- a/weld-core.spec
>+++ b/weld-core.spec
>@@ -3,7 +3,7 @@
> 
> Name: weld-core
> Version: 1.1.5
>-Release: 3%{namedreltag}%{?dist}
>+Release: 4%{namedreltag}%{?dist}
> Summary: Reference Implementation for JSR-299: Contexts and Dependency Injection (CDI)
> Group: Development/Libraries
> License: ASL 2.0 and LGPLv2+ and (CDDL or GPLv2 with exceptions)
>@@ -111,6 +111,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> 
> 
> %changelog
>+* Sat May 26 2012 Juan Hernandez <juan.hernandez@redhat.com> 1.1.5-4.AS71.Final
>+- Remove the dependency on the checkstyle module (rhbz#825355)
>+
> * Mon Apr 02 2012 Juan Hernandez <juan.hernandez@redhat.com> 1.1.5-3.AS71.Final
> - Remove binaries bundled in the tarball
> 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 825355: 586927 | 587017 | 587018