[Jpackage-commits] rpms/free/sisu-guice sisu-guice-core-pom.patch, NONE, 1.1 sisu-guice-extensions-pom.patch, NONE, 1.1 sisu-guice-jpp-depmap.xml, 1.1, 1.2 sisu-guice-pom.patch, 1.1, 1.2 sisu-guice.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Thu Oct 20 00:50:27 CEST 2011


Update of /home/projects/jpackage/cvs/rpms/free/sisu-guice
In directory ryu.zarb.org:/tmp/SN31uzniuw/rpms/free/sisu-guice

Modified Files:
	sisu-guice-jpp-depmap.xml sisu-guice-pom.patch sisu-guice.spec 
Added Files:
	sisu-guice-core-pom.patch sisu-guice-extensions-pom.patch 
Log Message:
2.9.2-3.jpp6

Index: sisu-guice-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/sisu-guice/sisu-guice-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sisu-guice-jpp-depmap.xml	23 Dec 2010 20:46:06 -0000	1.1
--- sisu-guice-jpp-depmap.xml	19 Oct 2011 22:50:25 -0000	1.2
***************
*** 2,5 ****
--- 2,32 ----
     <dependency>
        <maven>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+          <version>2.2.1</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>cglib</artifactId>
+          <version>2.2.1</version>
+       </jpp>
+    </dependency>
+ 
+    <dependency>
+       <maven>
+          <groupId>org.sonatype.sisu.inject</groupId>
+          <artifactId>cglib</artifactId>
+          <version>2.2.1</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>cglib</artifactId>
+          <version>2.2.1</version>
+       </jpp>
+    </dependency>
+ 
+ <!--
+    <dependency>
+       <maven>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>servlet-api</artifactId>
***************
*** 38,41 ****
--- 65,82 ----
        </jpp>
     </dependency>
+ -->
+ 
+    <dependency>
+       <maven>
+          <groupId>org.hsqldb</groupId>
+          <artifactId>hsqldb-j5</artifactId>
+          <version>2.0.0</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>hsqldb</artifactId>
+          <version>1.8.0.10</version>
+       </jpp>
+    </dependency>
  
     <dependency>

--- NEW FILE: sisu-guice-core-pom.patch ---
--- core/pom.xml.sav1	2010-12-23 09:07:05.000000000 +0100
+++ core/pom.xml	2011-10-16 17:54:30.000000000 +0200
@@ -125,6 +125,8 @@
       </activation>
       <build>
         <plugins>
+          <!--
+          -->
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>munge-maven-plugin</artifactId>
@@ -136,6 +138,7 @@
                   <goal>munge-fork</goal>
                 </goals>
                 <configuration>
+                  <mungedDirectory>${project.build.directory}/munged</mungedDirectory>
                   <symbols>NO_AOP</symbols>
                   <excludes>
                     **/InterceptorBinding.java,
@@ -168,9 +171,11 @@
                 <configuration>
                   <classesDirectory>${project.build.directory}/munged/classes</classesDirectory>
                   <classifier>no_aop</classifier>
+<!--
                   <archive>
                     <manifestFile>${project.build.directory}/munged/classes/META-INF/MANIFEST.MF</manifestFile>
                   </archive>
+-->
                 </configuration>
               </execution>
             </executions>

Index: sisu-guice-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/sisu-guice/sisu-guice-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sisu-guice-pom.patch	23 Dec 2010 20:46:06 -0000	1.1
--- sisu-guice-pom.patch	19 Oct 2011 22:50:25 -0000	1.2
***************
*** 1,245 ****
! --- pom.xml.sav0	2010-12-23 03:07:05.000000000 -0500
! +++ pom.xml	2010-12-23 14:41:21.721155038 -0500
! @@ -89,9 +89,9 @@
!      <module>extensions</module>
     </modules>
   
! -  <prerequisites>
! +  <!--<prerequisites>
!      <maven>3.0</maven>
! -  </prerequisites>
! +  </prerequisites>-->
   
     <properties>
!      <!--
! @@ -114,13 +114,13 @@
!      <!--
!       | Run tests with TestNG
!      -->
! -    <dependency>
! +    <!--<dependency>
!        <groupId>org.testng</groupId>
!        <artifactId>testng</artifactId>
!        <version>5.11</version>
!        <classifier>jdk15</classifier>
!        <scope>test</scope>
! -    </dependency>
! +    </dependency>-->
!    </dependencies>
!  
!    <build>
! @@ -156,7 +156,7 @@
!          <!--
!           | Make sure we only use Java5 methods
!          -->
! -        <plugin>
! +        <!--<plugin>
!            <groupId>org.codehaus.mojo</groupId>
!            <artifactId>animal-sniffer-maven-plugin</artifactId>
!            <version>1.6</version>
! @@ -176,11 +176,11 @@
!                </goals>
!              </execution>
!            </executions>
! -        </plugin>
! +        </plugin>-->
!          <!--
!           | Shared JarJar configuration
!          -->
! -        <plugin>
! +        <!--<plugin>
!            <groupId>org.sonatype.plugins</groupId>
!            <artifactId>jarjar-maven-plugin</artifactId>
!            <version>1.3</version>
! @@ -218,9 +218,6 @@
!                </keep>
!              </rules>
!            </configuration>
! -          <!--
! -           | JarJar all classes before running tests
! -          -->
!            <executions>
!              <execution>
!                <id>jarjar-classes</id>
! @@ -243,7 +240,7 @@
!                </configuration>
!              </execution>
!            </executions>
! -        </plugin>
! +        </plugin>-->
!          <plugin>
!            <artifactId>maven-surefire-plugin</artifactId>
!            <version>2.5</version>
! @@ -297,7 +294,7 @@
             <version>2.3.1</version>
             <configuration>
               <archive>
! -              <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
! +              <!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>-->
               </archive>
             </configuration>
             <executions>
! --- core/pom.xml.sav0	2010-12-23 03:07:05.000000000 -0500
! +++ core/pom.xml	2010-12-23 14:42:41.891415605 -0500
! @@ -39,34 +39,34 @@
!        <optional>true</optional>
!      </dependency>
!      <dependency>
! -      <groupId>org.sonatype.sisu.inject</groupId>
! +      <groupId>cglib</groupId>
!        <artifactId>cglib</artifactId>
!        <version>${cglib.version}</version>
!      </dependency>
! -    <dependency>
! +    <!--<dependency>
!        <groupId>javax.inject</groupId>
!        <artifactId>javax.inject-tck</artifactId>
!        <version>1</version>
!        <scope>test</scope>
! -    </dependency>
! -    <dependency>
! +    </dependency>-->
! +    <!--<dependency>
!        <groupId>org.springframework</groupId>
!        <artifactId>spring-beans</artifactId>
!        <version>3.0.5.RELEASE</version>
!        <scope>test</scope>
! -    </dependency>
! -    <dependency>
! +    </dependency>-->
! +    <!--<dependency>
!        <groupId>biz.aQute</groupId>
!        <artifactId>bnd</artifactId>
!        <version>0.0.384</version>
!        <scope>test</scope>
! -    </dependency>
! -    <dependency>
! +    </dependency>-->
! +    <!--<dependency>
!        <groupId>org.apache.felix</groupId>
!        <artifactId>org.apache.felix.framework</artifactId>
!        <version>3.0.5</version>
!        <scope>test</scope>
! -    </dependency>
! +    </dependency>-->
!    </dependencies>
!  
!    <build>
! @@ -74,10 +74,10 @@
!        <!--
!         | Enable Java5 conformance checks
!        -->
! -      <plugin>
! +      <!--<plugin>
!          <groupId>org.codehaus.mojo</groupId>
!          <artifactId>animal-sniffer-maven-plugin</artifactId>
! -      </plugin>
! +      </plugin>-->
!        <plugin>
!          <artifactId>maven-surefire-plugin</artifactId>
!          <version>2.6</version>
! @@ -125,7 +125,7 @@
!        </activation>
!        <build>
!          <plugins>
! -          <plugin>
! +          <!--<plugin>
!              <groupId>org.sonatype.plugins</groupId>
!              <artifactId>munge-maven-plugin</artifactId>
!              <version>1.0</version>
! @@ -152,7 +152,7 @@
!                  </configuration>
!                </execution>
!              </executions>
! -          </plugin>
! +          </plugin>-->
!            <!--
!             | Package the no-AOP build with its own OSGi manifest and attach using "no_aop" classifier
!            -->
! @@ -169,7 +169,7 @@
!                    <classesDirectory>${project.build.directory}/munged/classes</classesDirectory>
!                    <classifier>no_aop</classifier>
!                    <archive>
! -                    <manifestFile>${project.build.directory}/munged/classes/META-INF/MANIFEST.MF</manifestFile>
! +                    <!--<manifestFile>${project.build.directory}/munged/classes/META-INF/MANIFEST.MF</manifestFile>-->
!                    </archive>
!                  </configuration>
!                </execution>
! @@ -193,16 +193,16 @@
!          <!--
!           | Mark as optional: embedded by JarJar
!          -->
! -        <dependency>
! +        <!--<dependency>
!            <groupId>org.sonatype.sisu.inject</groupId>
!            <artifactId>cglib</artifactId>
!            <version>${cglib.version}</version>
!            <optional>true</optional>
! -        </dependency>
! +        </dependency>-->
!        </dependencies>
!        <build>
!          <plugins>
! -          <plugin>
! +          <!--<plugin>
!              <groupId>org.sonatype.plugins</groupId>
!              <artifactId>jarjar-maven-plugin</artifactId>
!              <configuration>
! @@ -211,7 +211,7 @@
!                  <include>*:cglib</include>
!                </includes>
!              </configuration>
! -          </plugin>
! +          </plugin>-->
!            <plugin>
!              <!--
!               | Package the original non-JarJar'd classes so extensions can compile against them
! --- extensions/persist/pom.xml.orig	2010-12-23 03:07:05.000000000 -0500
! +++ extensions/persist/pom.xml	2010-12-23 14:48:23.872012755 -0500
! @@ -32,18 +32,18 @@
!        <version>1.6.1</version>
!        <scope>test</scope>
!      </dependency>
! -    <dependency>
! +    <!--<dependency>
!        <groupId>org.hibernate</groupId>
!        <artifactId>hibernate-entitymanager</artifactId>
!        <version>3.4.0.GA</version>
!        <scope>test</scope>
! -    </dependency>
! -    <dependency>
! +    </dependency>-->
! +    <!--<dependency>
!        <groupId>org.hsqldb</groupId>
!        <artifactId>hsqldb-j5</artifactId>
!        <version>2.0.0</version>
!        <scope>test</scope>
! -    </dependency>
! +    </dependency>-->
!    </dependencies>
!  
!    <build>
! --- extensions/pom.xml.sav0	2010-12-23 03:07:05.000000000 -0500
! +++ extensions/pom.xml	2010-12-23 14:50:03.692171683 -0500
! @@ -24,7 +24,7 @@
!      <module>persist</module>
!      <module>servlet</module>
!      <module>spring</module>
! -    <module>struts2</module>
! +    <!--<module>struts2</module>-->
!      <module>throwingproviders</module>
!  <!--
!   |  not yet promoted...
! @@ -60,10 +60,10 @@
!        <!--
!         | Enable Java5 conformance checks
!        -->
! -      <plugin>
! +      <!--<plugin>
!          <groupId>org.codehaus.mojo</groupId>
!          <artifactId>animal-sniffer-maven-plugin</artifactId>
! -      </plugin>
! +      </plugin>-->
!        <!--
!         | Add OSGi manifest: extensions are fragments that attach to the core
!        -->
--- 1,23 ----
! --- pom.xml.sav0	2010-12-23 09:07:05.000000000 +0100
! +++ pom.xml	2011-10-16 13:00:08.000000000 +0200
! @@ -90,7 +90,7 @@
     </modules>
   
!    <prerequisites>
! -    <maven>3.0</maven>
! +    <maven>2.0</maven>
!    </prerequisites>
   
     <properties>
! @@ -296,9 +296,11 @@
!            <artifactId>maven-jar-plugin</artifactId>
             <version>2.3.1</version>
             <configuration>
+ +<!--
               <archive>
!                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
               </archive>
+ +-->
             </configuration>
             <executions>
!              <execution>

Index: sisu-guice.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/sisu-guice/sisu-guice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sisu-guice.spec	10 Jan 2011 19:20:14 -0000	1.2
--- sisu-guice.spec	19 Oct 2011 22:50:25 -0000	1.3
***************
*** 49,53 ****
  Name:           sisu-guice
  Version:        2.9.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Sisu Guice
--- 49,53 ----
  Name:           sisu-guice
  Version:        2.9.2
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Sisu Guice
***************
*** 59,82 ****
  Source1:        %{name}-jpp-depmap.xml
  Patch0:         sisu-guice-pom.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
! Requires:       aopalliance
! Requires:       atinject
! Requires:       jpackage-utils
  BuildRequires:  aopalliance
  BuildRequires:  apache-commons-parent
  BuildRequires:  atinject
  BuildRequires:  cglib
  BuildRequires:  forge-parent >= 0:5
  BuildRequires:  google-guice >= 0:2.0
  BuildRequires:  jpa_3_0_api
  BuildRequires:  maven-plugin-bundle
  BuildRequires:  maven2-plugin-deploy
  BuildRequires:  maven-shared-filtering
! BuildRequires:  maven-surefire-provider-junit4
  BuildRequires:  servlet_2_5_api
  BuildRequires:  slf4j >= 0:1.6.1
  # FIXME: should be spring3
  BuildRequires:  spring2-beans
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 59,99 ----
  Source1:        %{name}-jpp-depmap.xml
  Patch0:         sisu-guice-pom.patch
+ Patch1:         sisu-guice-core-pom.patch
+ Patch2:         sisu-guice-extensions-pom.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
! Requires:  aopalliance
! Requires:  apache-felix-framework
! Requires:  atinject
! Requires:  cglib
! Requires:  jpa_3_0_api
! Requires:  jpackage-utils
! BuildRequires:  animal-sniffer
  BuildRequires:  aopalliance
  BuildRequires:  apache-commons-parent
+ BuildRequires:  apache-felix-framework
  BuildRequires:  atinject
+ BuildRequires:  atinject-tck
  BuildRequires:  cglib
  BuildRequires:  forge-parent >= 0:5
+ BuildRequires:  glassfish-persistence-1.0b-api
  BuildRequires:  google-guice >= 0:2.0
+ BuildRequires:  hibernate3-entitymanager
  BuildRequires:  jpa_3_0_api
+ BuildRequires:  jarjar-maven-plugin
  BuildRequires:  maven-plugin-bundle
  BuildRequires:  maven2-plugin-deploy
  BuildRequires:  maven-shared-filtering
! BuildRequires:  maven-surefire-provider-testng
! BuildRequires:  mojo-parent
! BuildRequires:  mojo-signatures
! BuildRequires:  munge-maven-plugin
! BuildRequires:  oss-parent
  BuildRequires:  servlet_2_5_api
  BuildRequires:  slf4j >= 0:1.6.1
+ BuildRequires:  sonatype-plugins-parent
  # FIXME: should be spring3
  BuildRequires:  spring2-beans
+ BuildRequires:  testng
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
***************
*** 116,127 ****
  %setup -q
  %patch0 -p0 -b .sav0
! 
  %build
  %{_bindir}/mvn-jpp \
          -e \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
!         -Dmaven.test.skip=true \
!         -Dguice.with.jarjar=false \
          deploy \
          javadoc:aggregate \
--- 133,150 ----
  %setup -q
  %patch0 -p0 -b .sav0
! %patch1 -p0 -b .sav1
! %patch2 -p0 -b .sav2
! for j in $(find . -name "*.java" -exec grep -l 'com\.google\.inject\.internal\.util' {} \;); do
!     sed -i -e 's|com\.google\.inject\.internal\.util|com.google.inject.internal|' $j
! done
  %build
+ MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  %{_bindir}/mvn-jpp \
          -e \
          -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven.test.failure.ignore=true \
!         -Dguice.with.jarjar=true \
          deploy \
          javadoc:aggregate \
***************
*** 154,157 ****
--- 177,181 ----
  cp -p org/sonatype/sisu/inject/guice-throwingproviders/%{namedversion}/guice-throwingproviders-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/
  cp -p org/sonatype/sisu/inject/guice-throwingproviders/%{namedversion}/guice-throwingproviders-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/
+ cp -p org/sonatype/sisu/sisu-guice/%{namedversion}/sisu-guice-%{namedversion}-no_deps.jar %{buildroot}%{_javadir}/%{name}/
  cp -p org/sonatype/sisu/sisu-guice/%{namedversion}/sisu-guice-%{namedversion}-no_aop.jar %{buildroot}%{_javadir}/%{name}/
  cp -p org/sonatype/sisu/sisu-guice/%{namedversion}/sisu-guice-%{namedversion}-tests.jar %{buildroot}%{_javadir}/%{name}/
***************
*** 255,258 ****
--- 279,284 ----
  %{_javadir}*/%{name}/guice-throwingproviders-%{namedversion}.jar
  %{_javadir}*/%{name}/guice-throwingproviders.jar
+ %{_javadir}*/%{name}/sisu-guice-%{namedversion}-no_deps.jar
+ %{_javadir}*/%{name}/sisu-guice-no_deps.jar
  %{_javadir}*/%{name}/sisu-guice-%{namedversion}-no_aop.jar
  %{_javadir}*/%{name}/sisu-guice-no_aop.jar
***************
*** 294,297 ****
--- 320,328 ----
  
  %changelog
+ * Wed Oct 20 2011 Ralph Apel <r.apel at r-apel.de> 0:2.9.2-3
+ - Must use -Dmaven.repo.local=$MAVEN_REPO_LOCAL 
+ - Add -no_deps jarjarred
+ - Add (B)Rs
+ 
  * Thu Jan 06 2011 David Walluck <dwalluck at redhat.com> 0:2.9.2-2
  - fix maven depmap entries

--- NEW FILE: sisu-guice-extensions-pom.patch ---
--- extensions/pom.xml.sav	2011-10-16 14:05:06.000000000 +0200
+++ extensions/pom.xml	2011-10-16 14:05:23.000000000 +0200
@@ -24,7 +24,9 @@
     <module>persist</module>
     <module>servlet</module>
     <module>spring</module>
+<!--
     <module>struts2</module>
+-->
     <module>throwingproviders</module>
 <!--
  |  not yet promoted...




More information about the JPackage-commits mailing list