[Jpackage-commits] rpms/free/maven-enforcer enforcer-rules-pom.patch, NONE, 1.1 fix-site.patch, NONE, 1.1 maven-enforcer-disableplugins.patch, 1.1, NONE maven-enforcer-plexus-javadoc.patch, NONE, 1.1 maven-enforcer-skip-tests.patch, NONE, 1.1 maven-enforcer.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed Oct 12 19:59:29 CEST 2011


Update of /home/projects/jpackage/cvs/rpms/free/maven-enforcer
In directory ryu.zarb.org:/tmp/QtD75Y_4U_/rpms/free/maven-enforcer

Modified Files:
	maven-enforcer.spec 
Added Files:
	enforcer-rules-pom.patch fix-site.patch 
	maven-enforcer-plexus-javadoc.patch 
	maven-enforcer-skip-tests.patch 
Removed Files:
	maven-enforcer-disableplugins.patch 
Log Message:
1.0.1-2.jpp6

--- maven-enforcer-disableplugins.patch DELETED ---

--- NEW FILE: maven-enforcer-plexus-javadoc.patch ---
--- maven-enforcer-1.0.1/pom.xml.orig	2011-10-12 13:26:59.201101969 -0400
+++ maven-enforcer-1.0.1/pom.xml	2011-10-12 13:26:59.205101659 -0400
@@ -286,7 +286,7 @@
              </tagletArtifact>
              <tagletArtifact>
                <groupId>org.codehaus.plexus</groupId>
-               <artifactId>plexus-javadoc</artifactId>
+               <artifactId>plexus-component-javadoc</artifactId>
                <version>1.0</version>
              </tagletArtifact>
            </tagletArtifacts>

--- NEW FILE: enforcer-rules-pom.patch ---
--- enforcer-rules/pom.xml.orig	2009-03-30 03:13:48.000000000 +0800
+++ enforcer-rules/pom.xml	2010-09-06 10:03:59.000000000 +0800
@@ -41,6 +41,18 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-descriptor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
     </dependency>
     <dependency>

--- NEW FILE: maven-enforcer-skip-tests.patch ---
--- maven-enforcer-1.0.1/pom.xml~	2011-09-19 02:19:59.000000000 -0400
+++ maven-enforcer-1.0.1/pom.xml	2011-09-19 03:59:48.908160308 -0400
@@ -168,13 +168,13 @@
         <artifactId>enforcer-rules</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
+      <!--<dependency>
         <groupId>org.apache.maven.enforcer</groupId>
         <artifactId>enforcer-rules</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
-      </dependency>
+      </dependency>-->
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
--- maven-enforcer-1.0.1/enforcer-rules/pom.xml~	2011-09-19 02:19:59.000000000 -0400
+++ maven-enforcer-1.0.1/enforcer-rules/pom.xml	2011-09-19 03:59:12.868889630 -0400
@@ -125,13 +125,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <executions>
+        <!--<executions>
           <execution>
             <goals>
               <goal>test-jar</goal>
             </goals>
           </execution>
-        </executions>
+        </executions>-->
       </plugin>
     </plugins>
   </build>
--- maven-enforcer-1.0.1/maven-enforcer-plugin/pom.xml~	2011-06-14 14:45:13.000000000 -0400
+++ maven-enforcer-1.0.1/maven-enforcer-plugin/pom.xml	2011-09-19 03:59:31.094509371 -0400
@@ -98,11 +98,11 @@
       <groupId>org.apache.maven.enforcer</groupId>
       <artifactId>enforcer-rules</artifactId>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.apache.maven.enforcer</groupId>
       <artifactId>enforcer-rules</artifactId>
       <type>test-jar</type>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>

Index: maven-enforcer.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven-enforcer/maven-enforcer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-enforcer.spec	29 Mar 2010 19:58:58 -0000	1.1
--- maven-enforcer.spec	12 Oct 2011 17:59:27 -0000	1.2
***************
*** 1,135 ****
  
! %define namedversion 1.0-beta-1
! 
! Name:		maven-enforcer
! Version:	1.0
! Release:	0.2.b1.1.2%{?dist}
  Epoch:          0
! Summary:	Rule enforcer for maven
! 
! Group:		Development	
! License:	Apache Style
! URL:		http://maven.apache.org/plugins/maven-enforcer-plugin/
! 
! # svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-beta-1/ maven-enforcer
! # tar czf maven-enforcer-src.tar.gz maven-enforcer
! Source0:	%{name}-src.tar.gz
  
- Patch0:		%{name}-disableplugins.patch
  
- BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
! BuildRequires:	ant
! BuildRequires:  ant-junit
  BuildRequires:  maven2
  BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
- BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-shared-plugin-testing-harness
! BuildRequires:  maven-surefire
  BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  maven-shared
! BuildRequires:  maven-shared-archiver
  BuildRequires:  maven-shared-reporting-impl
! BuildRequires:  maven-shared-plugin-tools-api
! BuildRequires:  maven-shared-plugin-tools-beanshell
! BuildRequires:  maven-shared-plugin-tools-java
! BuildRequires:  maven-doxia
! BuildRequires:  maven-doxia-sitetools
! BuildRequires:  plexus-digest
! BuildRequires:  plexus-maven-plugin
! 
! Provides:       maven-enforcer-rule-api
! Obsoletes:      maven-enforcer-rule-api <= 1.0-0.1.a3
! 
! BuildArch:		noarch
  
  %description
! This component provides the generic interfaces needed to implement custom
! rules for the maven-enforcer-plugin.
  
  %package javadoc
! Summary:	Javadoc for maven-enforcer
! Group:		Development/Documentation
  
  %description javadoc
! Java API documentation for enforcer-rule-api.
  
! %package -n maven2-plugin-enforcer
! Epoch:          1
! Summary:	Plugin to enforcer various rules during maven build
! Group:		Development
! Requires:	maven2 >= 0:2.0.8-10.38
! Requires:	maven-enforcer
! Obsoletes:	maven2-plugin <= 0:2.0.8
  
! %description -n maven2-plugin-enforcer
! The Enforcer plugin provides goals to control certain environmental constraints
! such as Maven version, JDK version and OS family along with many more standard
! rules and user created rules.
  
! %prep
! %setup -q -n %{name}
  
! %patch0
  
! %build
  
! export MAVEN_REPO_LOCAL=`pwd`/.m2
! mkdir $MAVEN_REPO_LOCAL
  
! mvn-jpp \
  %if 0
!     -Dmaven.test.failure.ignore=true \
  %endif
!     -Dmaven.test.skip=true \
!     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!     install javadoc:javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
! # install jars
! install -dm 755 $RPM_BUILD_ROOT/%{_javadir}/%{name}
  
! install -p -m 644 enforcer-api/target/enforcer-api-%{namedversion}.jar \
!     $RPM_BUILD_ROOT/%{_javadir}/%{name}/enforcer-api-%{namedversion}.jar
! ln -s enforcer-api-%{namedversion}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/enforcer-api.jar
  
! install -p -m 644 enforcer-rules/target/enforcer-rules-%{namedversion}.jar \
!     $RPM_BUILD_ROOT/%{_javadir}/%{name}/enforcer-rules-%{namedversion}.jar
! ln -s enforcer-rules-%{namedversion}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/enforcer-rules.jar
  
! install -p -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{namedversion}.jar \
!     $RPM_BUILD_ROOT/%{_javadir}/%{name}/maven-plugin-%{namedversion}.jar
! ln -s maven-plugin-%{namedversion}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/maven-plugin.jar
  
! #install poms
! install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
! install -p -m 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-enforcer-enforcer.pom
! install -p -m 644 enforcer-api/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-enforcer-enforcer-api.pom
! install -p -m 644 enforcer-rules/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-enforcer-enforcer-rules.pom
! install -p -m 644 maven-enforcer-plugin/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-enforcer-maven-plugin.pom
  
! #depmap entries
! %add_to_maven_depmap org.apache.maven.enforcer enforcer %{namedversion} JPP/maven-enforcer enforcer
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{namedversion} JPP/maven-enforcer enforcer-api
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{namedversion} JPP/maven-enforcer enforcer-rules 
! %add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{namedversion} JPP/maven-enforcer maven-plugin
  
! # install javadoc
! install -dm 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}/enforcer-api
! cp -a enforcer-api/target/site/apidocs/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}/enforcer-api
! install -dm 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}/enforcer-rules
! cp -a enforcer-rules/target/site/apidocs/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}/enforcer-rules
! install -dm 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}/maven-plugin
! cp -a maven-enforcer-plugin/target/site/apidocs/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}/maven-plugin
! ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
  
  %post
--- 1,157 ----
+ %global namedversion %{version}
  
! Name:           maven-enforcer
! Version:        1.0.1
! Release:        2%{?dist}
  Epoch:          0
! Summary:        Maven Enforcer
! Group:          Development/Java
! License:        ASL 2.0
! URL:            http://maven.apache.org/enforcer
! # svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/1.0.1 maven-enforcer-1.0.1 && tar cjf maven-enforcer-1.0.1.tar.bz2 maven-enforcer-1.0.1
! Source0:        maven-enforcer-%{namedversion}.tar.bz2
! Patch0:         fix-site.patch
! Patch1:         enforcer-rules-pom.patch
! # FIXME: we can enable if we can get the right plexus-container-default to be used
! Patch2:         maven-enforcer-skip-tests.patch
! Patch3:         maven-enforcer-plexus-javadoc.patch
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  
  
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       java
! Requires:       jpackage-utils
! BuildRequires:  java-devel
! Requires:       jakarta-commons-lang
! BuildRequires:  jakarta-commons-lang
! Requires:       easymock
! BuildRequires:  easymock
! Requires:       junit
! BuildRequires:  junit
! Requires:       maven-shared-common-artifact-filters
! BuildRequires:  maven-shared-common-artifact-filters
! Requires:       maven-shared-dependency-tree
! BuildRequires:  maven-shared-dependency-tree
! Requires:       bsh2
! BuildRequires:  bsh2
! Requires:       plexus-container-default
! BuildRequires:  plexus-container-default
! Requires:       plexus-i18n
! BuildRequires:  plexus-i18n
! Requires:       plexus-maven-plugin
! BuildRequires:  plexus-maven-plugin
! Requires:       plexus-utils
! BuildRequires:  plexus-utils
  BuildRequires:  maven2
+ BuildRequires:  maven2-common-poms
+ BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-javadoc
+ BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-plugin-tools-javadoc
  BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  maven-shared-plugin-testing-harness
! BuildRequires:  cobertura-maven-plugin
  BuildRequires:  maven-shared-reporting-impl
! BuildRequires:  plexus-containers-component-javadoc
  
  %description
! Enforcer is a build rule execution framework.
  
  %package javadoc
! Group:          Documentation
! Summary:        Javadoc for %{name}
! Requires:       jpackage-utils
  
  %description javadoc
! API documentation for %{name}.
  
! %package api
! Summary:        Enforcer API
! Group:          Development/Java
! Requires:       %{name} = %{epoch}:%{version}-%{release}
  
! %description api
! This component provides the generic interfaces needed to 
! implement custom rules for the maven-enforcer-plugin.
  
! %package rules
! Summary:        Enforcer Rules
! Group:          Development/Java
! Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       %{name}-api = %{epoch}:%{version}-%{release}
  
! %description rules
! This component contains the standard Enforcer Rules.
  
! %package -n maven-enforcer-plugin
! Summary:        Enforcer Rules
! Group:          Development/Java
! Obsoletes:      maven2-plugin-enforcer <= 0:2.0.8
! Provides:       maven2-plugin-enforcer = %{epoch}:%{version}-%{release}
! Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       %{name}-rules = %{epoch}:%{version}-%{release}
  
! %description -n maven-enforcer-plugin
! This component contains the standard Enforcer Rules.
  
! %prep
! %setup -q
! %patch0 -p0 -b .sav0
  %if 0
! %patch1 -p0 -b .sav1
! %patch2 -p1 -b .sav2
  %endif
! %patch3 -p1 -b .sav3
! 
! %build
! export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file://`pwd`/maven2-brew
! export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} -Dmaven.test.skip=false deploy javadoc:aggregate
  
  %install
! %{__rm} -rf %{buildroot}
  
! # jars
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p enforcer-api/target/enforcer-api-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-api-%{namedversion}.jar
! %{__cp} -p enforcer-rules/target/enforcer-rules-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-rules-%{namedversion}.jar
! %{__cp} -p enforcer-rules/target/enforcer-rules-%{namedversion}-tests.jar %{buildroot}%{_javadir}/enforcer-rules-%{namedversion}-tests.jar
  
! %{__cp} -p maven-enforcer-plugin/target/maven-enforcer-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/maven-enforcer-plugin-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed} "s|-%{namedversion}||g"`; done)
  
! # poms
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
  
! %{__cp} -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-enforcer.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer %{namedversion} JPP enforcer
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/enforcer
  
! %{__cp} -p enforcer-api/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-enforcer-api.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{namedversion} JPP enforcer-api
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/enforcer-api
  
! %{__cp} -p enforcer-rules/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-enforcer-rules.pom
! %add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{namedversion} JPP enforcer-rules
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/enforcer-rules
  
! %{__cp} -p maven-enforcer-plugin/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-maven-enforcer-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{namedversion} JPP maven-enforcer-plugin
! %{__mv} %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/maven-enforcer-plugin
! 
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  %post
***************
*** 140,165 ****
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %files
! %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/enforcer-api*
! %{_javadir}/%{name}/enforcer-rules*
! %{_datadir}/maven2/poms/JPP.maven-enforcer-enforcer.pom
! %{_datadir}/maven2/poms/JPP.maven-enforcer-enforcer-api.pom
! %{_datadir}/maven2/poms/JPP.maven-enforcer-enforcer-rules.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
- %files -n maven2-plugin-enforcer
- %defattr(-,root,root,-)
- %{_javadir}/%{name}/maven-plugin*
- %{_datadir}/maven2/poms/JPP.maven-enforcer-maven-plugin.pom
- 
  %changelog
  * Mon Mar 29 2010 David Walluck <dwakkuck at redhat.com> 0:1.0-0.1.a4.1.2
  - disable tests
--- 162,209 ----
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %files
! %defattr(0644,root,root,0755)
! %{_datadir}/maven2/poms/JPP-enforcer.pom
! %{_mavendepmapfragdir}/enforcer
! 
! %files api
! %defattr(0644,root,root,0755)
! %{_javadir}*/enforcer-api-%{namedversion}.jar
! %{_javadir}*/enforcer-api.jar
! %{_datadir}/maven2/poms/JPP-enforcer-api.pom
! %{_mavendepmapfragdir}/enforcer-api
! 
! %files rules
! %defattr(0644,root,root,0755)
! %{_javadir}*/enforcer-rules-%{namedversion}.jar
! %{_javadir}*/enforcer-rules.jar
! %{_javadir}*/enforcer-rules-%{namedversion}-tests.jar
! %{_javadir}*/enforcer-rules-tests.jar
! %{_datadir}/maven2/poms/JPP-enforcer-rules.pom
! %{_mavendepmapfragdir}/enforcer-rules
! 
! %files -n maven-enforcer-plugin
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-enforcer-plugin-%{namedversion}.jar
! %{_javadir}*/maven-enforcer-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-enforcer-plugin.pom
! %{_mavendepmapfragdir}/maven-enforcer-plugin
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
  %{_javadocdir}/%{name}
  
  %changelog
+ * Wed Oct 12 2011 David Walluck <dwalluck at redhat.com> 1.0.1-2
+ - add poms and depmaps to subpackages
+ - fix Group
+ - enable tests
+ 
+ * Mon Sep 19 2011 David Walluck <dwalluck at redhat.com> 1.0.1-1
+ - 1.0.1
+ 
  * Mon Mar 29 2010 David Walluck <dwakkuck at redhat.com> 0:1.0-0.1.a4.1.2
  - disable tests
***************
*** 167,171 ****
  
  * Wed Sep 2 2009 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a4.1.1
! - Initial build.
! 
! 
--- 211,213 ----
  
  * Wed Sep 2 2009 Deepak Bhole <dbhole at redhat.com> 1.0-0.1.a4.1.1
! - Initial build

--- NEW FILE: fix-site.patch ---
--- src/site/site.xml.sav	2009-01-16 15:55:37.000000000 +0200
+++ src/site/site.xml	2010-05-19 14:38:47.945028586 +0300
@@ -30,6 +30,6 @@ under the License.
       <item name="Maven" href="http://maven.apache.org/index.html" />
       <item name="Enforcer" href="http://maven.apache.org/enforcer/index.html" />
     </breadcrumbs>
-    <menu ref="modules" />
+  
   </body>
 </project>




More information about the JPackage-commits mailing list