[Jpackage-commits] dist/maven22/devel maven2-2.2.1-enable-bootstrap-repo.patch, 1.1, 1.2 maven2-2.2.1-jpp.patch, 1.1, 1.2 maven2-JPackageRepositoryLayout.java, 1.1, 1.2 maven2-RELEASE.patch, 1.1, 1.2 maven2-empty-dep.pom, 1.1, 1.2 maven22.spec, 1.5, 1.6

David Walluck david at ryu.zarb.org
Sat Oct 15 05:00:55 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven22/devel
In directory ryu.zarb.org:/tmp/cvs-serv738

Modified Files:
	maven2-2.2.1-enable-bootstrap-repo.patch 
	maven2-2.2.1-jpp.patch maven2-JPackageRepositoryLayout.java 
	maven2-RELEASE.patch maven2-empty-dep.pom maven22.spec 
Log Message:
- use /usr/share/maven22 where appropriate

Index: maven2-RELEASE.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven2-RELEASE.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-RELEASE.patch	11 Oct 2011 20:23:31 -0000	1.1
--- maven2-RELEASE.patch	15 Oct 2011 03:00:53 -0000	1.2
***************
*** 9,13 ****
  +                String version;
  +				if (System.getProperty("maven2.ignore.versions") != null)  
! +					version = "2.0.8";
  +				else
  +					version = resolveVersion( artifact, localRepository, remoteRepositories );
--- 9,13 ----
  +                String version;
  +				if (System.getProperty("maven2.ignore.versions") != null)  
! +					version = "2.2.1";
  +				else
  +					version = resolveVersion( artifact, localRepository, remoteRepositories );

Index: maven2-JPackageRepositoryLayout.java
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven2-JPackageRepositoryLayout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-JPackageRepositoryLayout.java	11 Oct 2011 20:23:31 -0000	1.1
--- maven2-JPackageRepositoryLayout.java	15 Oct 2011 03:00:53 -0000	1.2
***************
*** 102,106 ****
  		// but that is fine because if the pom is not there, there is 
  		// a serious problem anyways..
! 		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
  		//System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
  		if (!f.exists()) {
--- 102,106 ----
  		// but that is fine because if the pom is not there, there is 
  		// a serious problem anyways..
! 		f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven22/repository") + "/" + path.toString());
  		//System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
  		if (!f.exists()) {

Index: maven2-2.2.1-enable-bootstrap-repo.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven2-2.2.1-enable-bootstrap-repo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-2.2.1-enable-bootstrap-repo.patch	11 Oct 2011 20:23:31 -0000	1.1
--- maven2-2.2.1-enable-bootstrap-repo.patch	15 Oct 2011 03:00:53 -0000	1.2
***************
*** 9,13 ****
  +      <name>Maven Bootstrap Repository</name>
  +      <layout>default</layout>
! +      <url>file:///usr/share/maven2/bootstrap_repo</url>
  +      <snapshots>
  +        <enabled>true</enabled>
--- 9,13 ----
  +      <name>Maven Bootstrap Repository</name>
  +      <layout>default</layout>
! +      <url>file:///usr/share/maven22/bootstrap_repo</url>
  +      <snapshots>
  +        <enabled>true</enabled>
***************
*** 25,29 ****
  +      <name>Maven Bootstrap Repository</name>
  +      <layout>default</layout>
! +      <url>file:///usr/share/maven2/bootstrap_repo</url>
  +      <snapshots>
  +        <enabled>true</enabled>
--- 25,29 ----
  +      <name>Maven Bootstrap Repository</name>
  +      <layout>default</layout>
! +      <url>file:///usr/share/maven22/bootstrap_repo</url>
  +      <snapshots>
  +        <enabled>true</enabled>

Index: maven22.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven22.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** maven22.spec	15 Oct 2011 02:05:42 -0000	1.5
--- maven22.spec	15 Oct 2011 03:00:53 -0000	1.6
***************
*** 74,77 ****
--- 74,78 ----
  BuildRequires:  zip
  %else
+ BuildRequires:  maven22 = %{epoch}:%{version}
  BuildRequires:  maven2-common-poms
  BuildRequires:  apache-resource-bundles
***************
*** 115,119 ****
  BuildRequires:  maven-shared-downloader
  BuildRequires:  maven-shared-filtering
! BuildRequires:  maven-shared-reporting-api
  BuildRequires:  maven-site-plugin
  BuildRequires:  maven-surefire-maven-plugin
--- 116,120 ----
  BuildRequires:  maven-shared-downloader
  BuildRequires:  maven-shared-filtering
! BuildRequires:  maven-reporting-api
  BuildRequires:  maven-site-plugin
  BuildRequires:  maven-surefire-maven-plugin
***************
*** 394,403 ****
  
  ##################
! # javadir/maven2 #
  #*################
  install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
  
  #######################
! # javadir/maven2/poms #
  #*#####################
  ln -s %{_datadir}/%{name}/poms $RPM_BUILD_ROOT%{_javadir}/%{name}/poms
--- 395,404 ----
  
  ##################
! # javadir/%%{name} #
  #*################
  install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
  
  #######################
! # javadir/%%{name}/poms #
  #*#####################
  ln -s %{_datadir}/%{name}/poms $RPM_BUILD_ROOT%{_javadir}/%{name}/poms

Index: maven2-empty-dep.pom
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven2-empty-dep.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-empty-dep.pom	11 Oct 2011 20:23:31 -0000	1.1
--- maven2-empty-dep.pom	15 Oct 2011 03:00:53 -0000	1.2
***************
*** 4,8 ****
    <groupId>JPP/maven2</groupId>
    <artifactId>empty-dep</artifactId>
!   <version>2.0.4</version>
    <name>Empty dependency</name>
    <description>This is an empty dependency. For use in jpp mode when one or more dependencies need elimination.</description>
--- 4,8 ----
    <groupId>JPP/maven2</groupId>
    <artifactId>empty-dep</artifactId>
!   <version>2.2.1</version>
    <name>Empty dependency</name>
    <description>This is an empty dependency. For use in jpp mode when one or more dependencies need elimination.</description>

Index: maven2-2.2.1-jpp.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven2-2.2.1-jpp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven2-2.2.1-jpp.patch	11 Oct 2011 20:23:31 -0000	1.1
--- maven2-2.2.1-jpp.patch	15 Oct 2011 03:00:53 -0000	1.2
***************
*** 316,320 ****
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven2/repository-signed</url>
  +      <snapshots>
  +        <enabled>true</enabled>
--- 316,320 ----
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven22/repository-signed</url>
  +      <snapshots>
  +        <enabled>true</enabled>
***************
*** 325,329 ****
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven2/repository</url>
  +      <snapshots>
  +        <enabled>true</enabled>
--- 325,329 ----
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven22/repository</url>
  +      <snapshots>
  +        <enabled>true</enabled>
***************
*** 341,345 ****
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven2/repository-signed</url>
  +      <snapshots>
  +        <enabled>true</enabled>
--- 341,345 ----
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven22/repository-signed</url>
  +      <snapshots>
  +        <enabled>true</enabled>
***************
*** 353,357 ****
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven2/repository</url>
  +      <snapshots>
  +        <enabled>true</enabled>
--- 353,357 ----
  +      <name>JPackage Maven Repository</name>
  +      <layout>jpp</layout>
! +      <url>file:///usr/share/maven22/repository</url>
  +      <snapshots>
  +        <enabled>true</enabled>




More information about the JPackage-commits mailing list