/[packages]/cauldron/maven-shared/current/SPECS/maven-shared.spec
ViewVC logotype

Diff of /cauldron/maven-shared/current/SPECS/maven-shared.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 206232 by dmorgan, Mon Jan 9 23:18:33 2012 UTC revision 206233 by gil, Tue Feb 7 23:30:07 2012 UTC
# Line 34  Line 34 
34    
35  %global artifact_resolver_version 1.1  %global artifact_resolver_version 1.1
36    
37  %global common_artifact_filters_version 1.3  
38  %global dependency_analyzer_version 1.2  %global dependency_analyzer_version 1.2
39  %global dependency_tree_version 1.3  %global dependency_tree_version 1.3
40  %global downloader_version 1.2  %global downloader_version 1.2
# Line 62  Line 62 
62  #%global script_beanshell_version 2.1  #%global script_beanshell_version 2.1
63  #%global test_tools_version 1.0  #%global test_tools_version 1.0
64  #%global toolchain_version 1.0  #%global toolchain_version 1.0
65    #lobal common_artifact_filters_version 1.3
66  %global verifier_version 1.3  %global verifier_version 1.3
67    
68  Summary:        Maven Shared Components  Summary:        Maven Shared Components
69  URL:            http://maven.apache.org/shared/  URL:            http://maven.apache.org/shared/
70  Name:           maven-shared  Name:           maven-shared
71  Version:        15  Version:        15
72  Release:        %mkrel 20  Release:        %mkrel 21
73  License:        ASL 2.0  License:        ASL 2.0
74  Group:          Development/Java  Group:          Development/Java
75    
# Line 115  BuildRequires:  maven-surefire-plugin Line 116  BuildRequires:  maven-surefire-plugin
116  BuildRequires:  maven-surefire-report-plugin  BuildRequires:  maven-surefire-report-plugin
117  BuildRequires:  maven-shared-reporting-impl  BuildRequires:  maven-shared-reporting-impl
118  BuildRequires:  maven-shared-file-management  BuildRequires:  maven-shared-file-management
119    BuildRequires:  maven-common-artifact-filters >= 1.4
120  BuildRequires:  maven-test-tools  BuildRequires:  maven-test-tools
121  BuildRequires:  maven-wagon  BuildRequires:  maven-wagon
122  BuildRequires:  modello  BuildRequires:  modello
# Line 214  Runs ant scripts embedded in the POM. Line 216  Runs ant scripts embedded in the POM.
216    
217  #--------------------------------------------------------------------  #--------------------------------------------------------------------
218    
 %package common-artifact-filters  
 Summary:        Maven Common Artifact Filters  
 Group:          Development/Java  
 Version:        %{common_artifact_filters_version}  
 Requires:  %{name} = 0:%{shared_components_version}-%{release}  
 Requires:  %{name}-test-tools >= 0:%{test_tools_version}-%{release}  
 Requires:  junit  
 Requires:  plexus-container-default  
 Requires:  plexus-utils  
 Requires:  maven-project  
 Requires:  maven  
   
 %description common-artifact-filters  
 %{summary}.  
   
 %files common-artifact-filters  
 %{_javadir}/maven-shared/common-artifact-filters*.jar  
 %{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom  
   
 #--------------------------------------------------------------------  
   
219  %package dependency-tree  %package dependency-tree
220  Summary:        Maven Dependency Tree  Summary:        Maven Dependency Tree
221  Group:          Development/Java  Group:          Development/Java
# Line 545  rm -f maven-dependency-analyzer/src/test Line 526  rm -f maven-dependency-analyzer/src/test
526  rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtilsTest.java  rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtilsTest.java
527  rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/AbstractFileTest.java  rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/AbstractFileTest.java
528    
529    sed -i "s|<module>maven-common-artifact-filters</module>|<!--module>maven-common-artifact-filters</module-->|" pom.xml
530    
531  %build  %build
532  export MAVEN_OPTS="-XX:MaxPermSize=256m"  export MAVEN_OPTS="-XX:MaxPermSize=256m"
533  mvn-rpmbuild -X \  mvn-rpmbuild -X \
# Line 617  install -p -m 0644 maven-invoker/target/ Line 600  install -p -m 0644 maven-invoker/target/
600          $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker.jar          $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker.jar
601  %add_maven_depmap -f invoker JPP.%{name}-invoker.pom %{name}/invoker.jar  %add_maven_depmap -f invoker JPP.%{name}-invoker.pom %{name}/invoker.jar
602    
603  install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom  #install -pm 644 maven-common-artifact-filters/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
604  install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar \  #install -p -m 0644 maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar \
605          $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters.jar  #        $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters.jar
606  %add_maven_depmap -f common-artifact-filters JPP.%{name}-common-artifact-filters.pom %{name}/common-artifact-filters.jar  #%add_maven_depmap -f common-artifact-filters JPP.%{name}-common-artifact-filters.pom %{name}/common-artifact-filters.jar
607    
608  install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-ant.pom  install -pm 644 maven-ant/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-ant.pom
609  install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \  install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
Legend:
Removed from v.206232  
changed lines
  Added in v.206233
  ViewVC Help
Powered by ViewVC 1.1.30