[Jpackage-commits] dist/maven-notice-plugin/JPP-6 maven-notice-plugin-jpp-depmap.xml, 1.2, 1.3 maven-notice-plugin.spec, 1.3, 1.4 maven2-plugin-notice-NoticeMojo-constructor.patch, NONE, 1.1

David Walluck david at ryu.zarb.org
Wed Dec 8 18:30:07 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven-notice-plugin/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv13175

Modified Files:
	maven-notice-plugin-jpp-depmap.xml maven-notice-plugin.spec 
Added Files:
	maven2-plugin-notice-NoticeMojo-constructor.patch 
Log Message:
- add maven2-plugin-notice-NoticeMojo-constructor.patch
- add jpp depmap entry for qdox


Index: maven-notice-plugin-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-notice-plugin/JPP-6/maven-notice-plugin-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** maven-notice-plugin-jpp-depmap.xml	7 Dec 2010 22:21:45 -0000	1.2
--- maven-notice-plugin-jpp-depmap.xml	8 Dec 2010 17:30:05 -0000	1.3
***************
*** 1,2 ****
--- 1,14 ----
  <dependencies>
+    <dependency>
+       <maven>
+          <groupId>com.thoughtworks.qdox</groupId>
+          <artifactId>qdox</artifactId>
+          <version>1.6.3</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>qdox</artifactId>
+          <version>1.11</version>
+       </jpp>
+    </dependency>
  </dependencies>

Index: maven-notice-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-notice-plugin/JPP-6/maven-notice-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-notice-plugin.spec	7 Dec 2010 22:28:23 -0000	1.3
--- maven-notice-plugin.spec	8 Dec 2010 17:30:05 -0000	1.4
***************
*** 57,61 ****
  Source2:        %{name}-jpp-depmap.xml
  Source4:        %{name}-component-info.xml
! Patch0:          maven-notice-plugin-pom.patch
  Requires(post):  jpackage-utils
  Requires(postun): jpackage-utils
--- 57,62 ----
  Source2:        %{name}-jpp-depmap.xml
  Source4:        %{name}-component-info.xml
! Patch0:         maven-notice-plugin-pom.patch
! Patch1:         maven2-plugin-notice-NoticeMojo-constructor.patch
  Requires(post):  jpackage-utils
  Requires(postun): jpackage-utils
***************
*** 111,114 ****
--- 112,116 ----
  %setup -q 
  %patch0 -p0 -b .sav0
+ %patch1 -p0 -b .sav1
  
  cp -p %{SOURCE1} settings.xml

--- NEW FILE: maven2-plugin-notice-NoticeMojo-constructor.patch ---
--- src/main/java/org/apache/httpcomponents/maven/plugin/notice/NoticeMojo.java.sav	2010-12-08 14:53:55.000000000 +0100
+++ src/main/java/org/apache/httpcomponents/maven/plugin/notice/NoticeMojo.java	2010-12-08 14:55:02.000000000 +0100
@@ -122,10 +122,10 @@
                 }
             } catch (URISyntaxException ex) {
                 throw new MojoFailureException("Invalid URI: " +
-                        ex.getMessage(), ex);
+                        ex.getMessage());
             } catch (IOException ex) {
                 throw new MojoFailureException("I/O error copying LICENSE file: " +
-                        ex.getMessage(), ex);
+                        ex.getMessage());
             }
         }
         File file = findFile("NOTICE.txt");
@@ -135,7 +135,7 @@
                 rewriteNotice(file, out);
             } catch (IOException ex) {
                 throw new MojoFailureException("I/O error copying NOTICE file: " +
-                        ex.getMessage(), ex);
+                        ex.getMessage());
             }
         }
 




More information about the JPackage-commits mailing list