[Jpackage-commits] dist/slf4j/JPP-6 .cvsignore, NONE, 1.1 slf4j-1.5.6-integration-tests-current-only.patch, 1.1, NONE slf4j-1.5.8-skip-integration-tests.patch, 1.1, NONE slf4j-bootstrap.patch, NONE, 1.1 slf4j-integration.patch, NONE, 1.1 slf4j-jpp-depmap.xml, 1.2, 1.3 slf4j-pom.patch, NONE, 1.1 slf4j-pom_xml.patch, 1.1, NONE slf4j-settings.xml, 1.1, 1.2 slf4j.spec, 1.19, 1.20 sources, 1.3, 1.4

David Walluck david at ryu.zarb.org
Tue Dec 21 09:47:55 CET 2010


Update of /home/projects/jpackage/cvs/dist/slf4j/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv5817

Modified Files:
	slf4j-jpp-depmap.xml slf4j-settings.xml slf4j.spec sources 
Added Files:
	.cvsignore slf4j-bootstrap.patch slf4j-integration.patch 
	slf4j-pom.patch 
Removed Files:
	slf4j-1.5.6-integration-tests-current-only.patch 
	slf4j-1.5.8-skip-integration-tests.patch slf4j-pom_xml.patch 
Log Message:
- 1.6.1
- fix maven depmap entries
- fix short-circuit
- add bootstrap mode


--- NEW FILE: .cvsignore ---
slf4j-1.6.1.tar.gz

--- slf4j-1.5.8-skip-integration-tests.patch DELETED ---

Index: slf4j-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/slf4j/JPP-6/slf4j-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** slf4j-jpp-depmap.xml	10 Feb 2009 22:58:05 -0000	1.2
--- slf4j-jpp-depmap.xml	21 Dec 2010 08:47:53 -0000	1.3
***************
*** 12,38 ****
     </jpp>
   </dependency>
   <dependency>
     <maven>
!      <groupId>javassist</groupId>
!      <artifactId>javassist</artifactId>
!      <version>3.4.GA</version>
     </maven>
     <jpp>
       <groupId>JPP</groupId>
!      <artifactId>javassist</artifactId>
!      <version>3.9.0</version>
!    </jpp>
!  </dependency>
!  <dependency>
!    <maven>
!      <groupId>ant</groupId>
!      <artifactId>ant-junit</artifactId>
!      <version>1.6.5</version>
!    </maven>
!    <jpp>
!      <groupId>JPP/ant</groupId>
!      <artifactId>ant-junit</artifactId>
!      <version>1.7.1</version>
     </jpp>
   </dependency>
  </dependencies>
--- 12,28 ----
     </jpp>
   </dependency>
+ 
   <dependency>
     <maven>
!      <groupId>org.mortbay.jetty</groupId>
!      <artifactId>servlet-api</artifactId>
!      <version>2.5-20081211</version>
     </maven>
     <jpp>
       <groupId>JPP</groupId>
!      <artifactId>servlet_2_5_api</artifactId>
!      <version>2.5</version>
     </jpp>
   </dependency>
+ 
  </dependencies>

--- slf4j-pom_xml.patch DELETED ---

Index: slf4j-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/slf4j/JPP-6/slf4j-settings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** slf4j-settings.xml	6 Jul 2008 13:24:22 -0000	1.1
--- slf4j-settings.xml	21 Dec 2010 08:47:53 -0000	1.2
***************
*** 1,47 ****
  <settings>
! 	<profiles>
! 		<profile>
! 			<id>JPP</id>
! 			<repositories>
! 				<repository>
! 					<id>internal</id>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>external</id>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>local</id>
! 					<layout>jpp</layout>
! 					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
! 				</repository>
! 			</repositories>
! 			<pluginRepositories>
! 				<pluginRepository>
! 					<id>plugins-internal</id>
! 					<name>plugins-internal</name>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-external</id>
! 					<name>plugins-external</name>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-maven</id>
! 					<name>plugins-maven</name>
! 					<layout>jpp</layout>
! 					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
! 				</pluginRepository>
! 			</pluginRepositories>
! 		</profile>
! 	</profiles>
! 	<activeProfiles>
! 		<activeProfile>JPP</activeProfile>
! 	</activeProfiles>
  </settings>
--- 1,47 ----
  <settings>
!     <profiles>
!         <profile>
!             <id>JPP</id>
!             <repositories>
!                 <repository>
!                     <id>internal</id>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>external</id>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>local</id>
!                     <layout>jpp</layout>
!                     <url>__MAVENREPO_DIR_PLACEHOLDER__</url>
!                 </repository>
!             </repositories>
!             <pluginRepositories>
!                 <pluginRepository>
!                     <id>plugins-internal</id>
!                     <name>plugins-internal</name>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-external</id>
!                     <name>plugins-external</name>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-maven</id>
!                     <name>plugins-maven</name>
!                     <layout>jpp</layout>
!                     <url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
!                 </pluginRepository>
!             </pluginRepositories>
!         </profile>
!     </profiles>
!     <activeProfiles>
!         <activeProfile>JPP</activeProfile>
!     </activeProfiles>
  </settings>

Index: slf4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/slf4j/JPP-6/slf4j.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** slf4j.spec	9 Jan 2010 20:08:36 -0000	1.19
--- slf4j.spec	21 Dec 2010 08:47:53 -0000	1.20
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 34,37 ****
--- 34,39 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
+ %bcond_with bootstrap
+ %bcond_with gcj_support
  %bcond_without repolib
  
***************
*** 40,50 ****
  %define repodirsrc %{repodir}/src
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! %define section         free
  
  Name:           slf4j
! Version:        1.5.8
! Release:	2%{?dist}
  Epoch:          0
  Summary:        Simple Logging Facade for Java
--- 42,56 ----
  %define repodirsrc %{repodir}/src
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
! %define section free
  
  Name:           slf4j
! Version:        1.6.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Simple Logging Facade for Java
***************
*** 52,67 ****
  License:        MIT
  URL:            http://www.slf4j.org/
! Source0:        http://www.slf4j.org/dist/slf4j-1.5.8.tar.gz
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
  Source3:        slf4j-component-info.xml
! Patch0:         %{name}-pom_xml.patch
! Patch1:         slf4j-1.5.8-skip-integration-tests.patch
  Requires(post): jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit >= 0:1.6.5
  BuildRequires:  javassist >= 0:3.4
  BuildRequires:  junit >= 0:3.8.2
--- 58,76 ----
  License:        MIT
  URL:            http://www.slf4j.org/
! Source0:        http://www.slf4j.org/dist/slf4j-%{version}.tar.gz
  Source1:        %{name}-settings.xml
  Source2:        %{name}-jpp-depmap.xml
  Source3:        slf4j-component-info.xml
! Patch0:         slf4j-pom.patch
! Patch1:         slf4j-integration.patch
! Patch2:         slf4j-bootstrap.patch
  Requires(post): jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
+ Requires:       jpackage-utils
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit >= 0:1.6.5
+ BuildRequires:  cal10n >= 0:0.7.4
  BuildRequires:  javassist >= 0:3.4
  BuildRequires:  junit >= 0:3.8.2
***************
*** 69,72 ****
--- 78,82 ----
  BuildRequires:  maven2-plugin-antrun
  BuildRequires:  maven2-plugin-compiler
+ BuildRequires:  maven2-plugin-deploy
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
***************
*** 80,83 ****
--- 90,96 ----
  BuildRequires:  log4j
  BuildRequires:  jakarta-commons-logging
+ %if %without bootstrap
+ #BuildRequires:  %{name} = %{epoch}:%{version}
+ %endif
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 102,105 ****
--- 115,119 ----
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
+ Requires:       jpackage-utils
  
  %description javadoc
***************
*** 126,132 ****
  %prep
  %setup -q
! %patch0 -p0
! %patch1 -p1
! find . -name "*.jar" | xargs rm
  cp -p %{SOURCE1} settings.xml
  
--- 140,154 ----
  %prep
  %setup -q
! %patch0 -p0 -b .sav0
! %patch1 -p0 -b .sav1
! %if %with bootstrap
! %patch2 -p0 -b .sav2
! %endif
! 
! %{_bindir}/find -type f -name "*.jar" | %{_bindir}/xargs -t %{__rm}
! %{_bindir}/find -type f -name "*.css" -o -type f -name "*.js" -o -type f -name "*.txt" | %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
! # FIXME: needs felix 2.x
! rm -r integration/src/test/
! 
  cp -p %{SOURCE1} settings.xml
  
***************
*** 140,238 ****
  ln -s %{_javadir} external_repo/JPP
  
- export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
- mkdir -p $MAVEN_REPO_LOCAL/org.slf4j
- ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-api.jar
- ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-simple.jar
- ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-log4j12.jar
- ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-nop.jar
- 
- %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
- 
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mvn-jpp \
          -e \
          -s $(pwd)/settings.xml \
-         -Dmaven2.jpp.mode=true \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jars
! install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! 
! #install -m 644 jcl104-over-slf4j/target/jcl104-over-slf4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl104-over-slf4j-%{version}.jar
! ln -sf jcl-over-slf4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl104-over-slf4j-%{version}.jar
! install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-over-slf4j-%{version}.jar
! install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jul-to-slf4j-%{version}.jar
! install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j-over-slf4j-%{version}.jar
! install -m 644 slf4j-api/target/%{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/api-%{version}.jar
! install -m 644 slf4j-api/target/%{name}-api-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/api-tests-%{version}.jar
! install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/ext-%{version}.jar
! install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-%{version}.jar
! install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jdk14-%{version}.jar
! install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j12-%{version}.jar
! install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/migrator-%{version}.jar
! install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/nop-%{version}.jar
! install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/simple-%{version}.jar
! 
! (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
! 
! %add_to_maven_depmap org.slf4j jcl104-over-slf4j %{version} JPP/slf4j jcl104-over-slf4j
! %add_to_maven_depmap org.slf4j jcl-over-slf4j %{version} JPP/slf4j jcl-over-slf4j
! %add_to_maven_depmap org.slf4j jul-to-slf4j %{version} JPP/slf4j jul-to-slf4j
! %add_to_maven_depmap org.slf4j log4j-over-slf4j %{version} JPP/slf4j log4j-over-slf4j
! %add_to_maven_depmap org.slf4j %{name}-parent %{version} JPP/slf4j parent
! %add_to_maven_depmap org.slf4j %{name}-api %{version} JPP/slf4j api
! %add_to_maven_depmap org.slf4j %{name}-ext %{version} JPP/slf4j ext
! %add_to_maven_depmap org.slf4j %{name}-jcl %{version} JPP/slf4j jcl
! %add_to_maven_depmap org.slf4j %{name}-jdk14 %{version} JPP/slf4j jdk14
! %add_to_maven_depmap org.slf4j %{name}-log4j12 %{version} JPP/slf4j log4j12
! %add_to_maven_depmap org.slf4j %{name}-migrator %{version} JPP/slf4j migrator
! %add_to_maven_depmap org.slf4j %{name}-nop %{version} JPP/slf4j nop
! %add_to_maven_depmap org.slf4j %{name}-simple %{version} JPP/slf4j simple
  
  # poms
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
! install -pm 644 jcl104-over-slf4j/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jcl104-over-slf4j.pom
! install -pm 644 jcl-over-slf4j/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jcl-over-slf4j.pom
! install -pm 644 jul-to-slf4j/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jul-to-slf4j.pom
! install -pm 644 log4j-over-slf4j/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-log4j-over-slf4j.pom
! install -pm 644 slf4j-api/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-api.pom
! install -pm 644 slf4j-ext/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ext.pom
! install -pm 644 slf4j-jcl/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jcl.pom
! install -pm 644 slf4j-jdk14/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jdk14.pom
! install -pm 644 slf4j-log4j12/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-log4j12.pom
! install -pm 644 slf4j-migrator/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-migrator.pom
! install -pm 644 slf4j-nop/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-nop.pom
! install -pm 644 slf4j-simple/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-simple.pom
  
  # javadoc
! install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! rm -rf target/site/api*
  
  # manual
! install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
! install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
  
  %if %with repolib
--- 162,273 ----
  ln -s %{_javadir} external_repo/JPP
  
  %build
+ %if 0
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! %endif
! %{_bindir}/mvn-jpp \
          -e \
          -s $(pwd)/settings.xml \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
!         -DaltDeploymentRepository=oss-releases::default::file://$(pwd)/maven2-brew \
!         -Dmaven.test.failure.ignore=false \
!         deploy javadoc:javadoc
  
  %install
! rm -rf %{buildroot}
  
  # jars
! install -d -m 0755 %{buildroot}%{_javadir}/%{name}
! cp -p maven2-brew/org/slf4j/integration/%{version}/integration-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/integration/%{version}/integration-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! %if %without bootstrap
! cp -p maven2-brew/org/slf4j/jcl-over-slf4j/%{version}/jcl-over-slf4j-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/jcl-over-slf4j/%{version}/jcl-over-slf4j-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! %endif
! cp -p maven2-brew/org/slf4j/jul-to-slf4j/%{version}/jul-to-slf4j-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/jul-to-slf4j/%{version}/jul-to-slf4j-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! %if %without bootstrap
! cp -p maven2-brew/org/slf4j/log4j-over-slf4j/%{version}/log4j-over-slf4j-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/log4j-over-slf4j/%{version}/log4j-over-slf4j-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! %endif
! cp -p maven2-brew/org/slf4j/slf4j-api/%{version}/slf4j-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-api/%{version}/slf4j-api-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-api/%{version}/slf4j-api-%{version}-tests.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-ext/%{version}/slf4j-ext-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-ext/%{version}/slf4j-ext-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-jcl/%{version}/slf4j-jcl-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-jcl/%{version}/slf4j-jcl-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! %if %without bootstrap
! cp -p maven2-brew/org/slf4j/slf4j-jdk14/%{version}/slf4j-jdk14-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-jdk14/%{version}/slf4j-jdk14-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! %endif
! cp -p maven2-brew/org/slf4j/slf4j-log4j12/%{version}/slf4j-log4j12-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-log4j12/%{version}/slf4j-log4j12-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-migrator/%{version}/slf4j-migrator-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-migrator/%{version}/slf4j-migrator-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-nop/%{version}/slf4j-nop-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-nop/%{version}/slf4j-nop-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-simple/%{version}/slf4j-simple-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-simple/%{version}/slf4j-simple-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-site/%{version}/slf4j-site-%{version}.jar %{buildroot}%{_javadir}/%{name}/
! cp -p maven2-brew/org/slf4j/slf4j-site/%{version}/slf4j-site-%{version}-sources.jar %{buildroot}%{_javadir}/%{name}/
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar | sed "s|-%{version}||g"`; done)
  
  # poms
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! cp -p maven2-brew/org/slf4j/integration/%{version}/integration-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-integration.pom
! %if %without bootstrap
! cp -p maven2-brew/org/slf4j/jcl-over-slf4j/%{version}/jcl-over-slf4j-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-jcl-over-slf4j.pom
! %endif
! cp -p maven2-brew/org/slf4j/jul-to-slf4j/%{version}/jul-to-slf4j-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-jul-to-slf4j.pom
! %if %without bootstrap
! cp -p maven2-brew/org/slf4j/log4j-over-slf4j/%{version}/log4j-over-slf4j-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-log4j-over-slf4j.pom
! %endif
! cp -p maven2-brew/org/slf4j/slf4j-api/%{version}/slf4j-api-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-api.pom
! cp -p maven2-brew/org/slf4j/slf4j-ext/%{version}/slf4j-ext-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-ext.pom
! cp -p maven2-brew/org/slf4j/slf4j-jcl/%{version}/slf4j-jcl-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-jcl.pom
! %if %without bootstrap
! cp -p maven2-brew/org/slf4j/slf4j-jdk14/%{version}/slf4j-jdk14-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-jdk14.pom
! %endif
! cp -p maven2-brew/org/slf4j/slf4j-log4j12/%{version}/slf4j-log4j12-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-log4j12.pom
! cp -p maven2-brew/org/slf4j/slf4j-migrator/%{version}/slf4j-migrator-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-migrator.pom
! cp -p maven2-brew/org/slf4j/slf4j-nop/%{version}/slf4j-nop-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-nop.pom
! cp -p maven2-brew/org/slf4j/slf4j-parent/%{version}/slf4j-parent-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-parent.pom
! cp -p maven2-brew/org/slf4j/slf4j-simple/%{version}/slf4j-simple-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-simple.pom
! cp -p maven2-brew/org/slf4j/slf4j-site/%{version}/slf4j-site-%{version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-site.pom
! 
! %add_to_maven_depmap org.slf4j integration %{version} JPP/%{name} integration
! %if %without bootstrap
! %add_to_maven_depmap org.slf4j jcl-over-slf4j %{version} JPP/%{name} jcl-over-slf4j
! %endif
! %add_to_maven_depmap org.slf4j jul-to-slf4j %{version} JPP/%{name} jul-to-slf4j
! %if %without bootstrap
! %add_to_maven_depmap org.slf4j log4j-over-slf4j %{version} JPP/%{name} log4j-over-slf4j
! %endif
! %add_to_maven_depmap org.slf4j slf4j-api %{version} JPP/%{name} slf4j-api
! %add_to_maven_depmap org.slf4j slf4j-ext %{version} JPP/%{name} slf4j-ext
! %add_to_maven_depmap org.slf4j slf4j-jcl %{version} JPP/%{name} slf4j-jcl
! %if %without bootstrap
! %add_to_maven_depmap org.slf4j slf4j-jdk14 %{version} JPP/%{name} slf4j-jdk14
! %endif
! %add_to_maven_depmap org.slf4j slf4j-log4j12 %{version} JPP/%{name} slf4j-log4j12
! %add_to_maven_depmap org.slf4j slf4j-migrator %{version} JPP/%{name} slf4j-migrator
! %add_to_maven_depmap org.slf4j log4j-over-slf4j %{version} JPP/%{name} log4j-over-slf4j
! %add_to_maven_depmap org.slf4j slf4j-nop %{version} JPP/%{name} slf4j-nop
! %add_to_maven_depmap org.slf4j slf4j-parent %{version} JPP/%{name} slf4j-parent
! %add_to_maven_depmap org.slf4j slf4j-simple %{version} JPP/%{name} slf4j-simple
! %add_to_maven_depmap org.slf4j slf4j-site %{version} JPP/%{name} slf4j-site
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  # manual
! install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
! cp -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}/
! cp -p LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
! rm -r %{buildroot}%{_docdir}/%{name}-%{version}/apidocs
  
  %if %with repolib
***************
*** 249,253 ****
  %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{PATCH1} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_javadir}/%{name}/api-%{version}.jar %{buildroot}%{repodirlib}/slf4j-api.jar
  %endif
  
--- 284,297 ----
  %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
  %{__install} -p -m 644 %{PATCH1} %{buildroot}%{repodirsrc}
! %if %with bootstrap
! %{__install} -p -m 644 %{PATCH2} %{buildroot}%{repodirsrc}
! %endif
! %{__cp} -p %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-slf4j-api.pom %{buildroot}%{repodirlib}/slf4j-api.pom
! %{__cp} -p %{buildroot}%{_javadir}/%{name}/slf4j-api-%{version}.jar %{buildroot}%{repodirlib}/slf4j-api.jar
! %endif
! 
! %if %with repolib
! %{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
! %{__cp} -pr maven2-brew/* %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
  %endif
  
***************
*** 257,261 ****
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
--- 301,305 ----
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %post
***************
*** 281,287 ****
  %dir %{_docdir}/%{name}-%{version}
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %{_javadir}/%{name}
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 325,409 ----
  %dir %{_docdir}/%{name}-%{version}
  %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %dir %{_javadir}*/%{name}
! %{_javadir}*/%{name}/integration-%{version}-sources.jar
! %{_javadir}*/%{name}/integration-%{version}.jar
! %{_javadir}*/%{name}/integration-sources.jar
! %{_javadir}*/%{name}/integration.jar
! %if %without bootstrap
! %{_javadir}*/%{name}/jcl-over-slf4j-%{version}-sources.jar
! %{_javadir}*/%{name}/jcl-over-slf4j-%{version}.jar
! %{_javadir}*/%{name}/jcl-over-slf4j-sources.jar
! %{_javadir}*/%{name}/jcl-over-slf4j.jar
! %endif
! %{_javadir}*/%{name}/jul-to-slf4j-%{version}-sources.jar
! %{_javadir}*/%{name}/jul-to-slf4j-%{version}.jar
! %{_javadir}*/%{name}/jul-to-slf4j-sources.jar
! %{_javadir}*/%{name}/jul-to-slf4j.jar
! %if %without bootstrap
! %{_javadir}*/%{name}/log4j-over-slf4j-%{version}-sources.jar
! %{_javadir}*/%{name}/log4j-over-slf4j-%{version}.jar
! %{_javadir}*/%{name}/log4j-over-slf4j-sources.jar
! %{_javadir}*/%{name}/log4j-over-slf4j.jar
! %endif
! %{_javadir}*/%{name}/slf4j-api-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-api-%{version}-tests.jar
! %{_javadir}*/%{name}/slf4j-api-%{version}.jar
! %{_javadir}*/%{name}/slf4j-api-sources.jar
! %{_javadir}*/%{name}/slf4j-api-tests.jar
! %{_javadir}*/%{name}/slf4j-api.jar
! %{_javadir}*/%{name}/slf4j-ext-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-ext-%{version}.jar
! %{_javadir}*/%{name}/slf4j-ext-sources.jar
! %{_javadir}*/%{name}/slf4j-ext.jar
! %{_javadir}*/%{name}/slf4j-jcl-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-jcl-%{version}.jar
! %{_javadir}*/%{name}/slf4j-jcl-sources.jar
! %if %without bootstrap
! %{_javadir}*/%{name}/slf4j-jdk14-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-jdk14-%{version}.jar
! %{_javadir}*/%{name}/slf4j-jdk14-sources.jar
! %endif
! %{_javadir}*/%{name}/slf4j-jcl.jar
! %{_javadir}*/%{name}/slf4j-log4j12-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-log4j12-%{version}.jar
! %{_javadir}*/%{name}/slf4j-log4j12-sources.jar
! %{_javadir}*/%{name}/slf4j-log4j12.jar
! %{_javadir}*/%{name}/slf4j-migrator-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-migrator-%{version}.jar
! %{_javadir}*/%{name}/slf4j-migrator-sources.jar
! %{_javadir}*/%{name}/slf4j-migrator.jar
! %{_javadir}*/%{name}/slf4j-nop-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-nop-%{version}.jar
! %{_javadir}*/%{name}/slf4j-nop-sources.jar
! %{_javadir}*/%{name}/slf4j-nop.jar
! %{_javadir}*/%{name}/slf4j-simple-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-simple-%{version}.jar
! %{_javadir}*/%{name}/slf4j-simple-sources.jar
! %{_javadir}*/%{name}/slf4j-simple.jar
! %{_javadir}*/%{name}/slf4j-site-%{version}-sources.jar
! %{_javadir}*/%{name}/slf4j-site-%{version}.jar
! %{_javadir}*/%{name}/slf4j-site-sources.jar
! %{_javadir}*/%{name}/slf4j-site.jar
! %{_datadir}/maven2/poms/JPP.%{name}-integration.pom
! %if %without bootstrap
! %{_datadir}/maven2/poms/JPP.%{name}-jcl-over-slf4j.pom
! %endif
! %{_datadir}/maven2/poms/JPP.%{name}-jul-to-slf4j.pom
! %if %without bootstrap
! %{_datadir}/maven2/poms/JPP.%{name}-log4j-over-slf4j.pom
! %endif
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-api.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-ext.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-jcl.pom
! %if %without bootstrap
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-jdk14.pom
! %endif
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-log4j12.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-migrator.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-nop.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-parent.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-simple.pom
! %{_datadir}/maven2/poms/JPP.%{name}-slf4j-site.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 296,308 ****
  %files manual
  %defattr(0644,root,root,0755)
! %{_docdir}/%{name}-%{version}/site
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
  * Sat Jan 09 2010 Will Tatam <will.tatam at red61.com> 1.5.8-2
  - Auto rebuild for JPackage 6 in centos5 mock
--- 418,439 ----
  %files manual
  %defattr(0644,root,root,0755)
! %dir %{_docdir}/%{name}-%{version}
! %{_docdir}/%{name}-%{version}/*
! %exclude %{_docdir}/%{name}-%{version}/LICENSE.txt
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
! %dir %{_javadir}*/
! %{_javadir}*/repository.jboss.com
  %endif
  
  %changelog
+ * Tue Dec 21 2010 David Walluck <dwalluck at redhat.com> 0:1.6.1-1
+ - 1.6.1
+ - fix maven depmap entries
+ - fix short-circuit
+ - add bootstrap mode
+ 
  * Sat Jan 09 2010 Will Tatam <will.tatam at red61.com> 1.5.8-2
  - Auto rebuild for JPackage 6 in centos5 mock

--- slf4j-1.5.6-integration-tests-current-only.patch DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/slf4j/JPP-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	29 Jul 2009 03:06:31 -0000	1.3
--- sources	21 Dec 2010 08:47:53 -0000	1.4
***************
*** 1 ****
! a50d4b793d2e7c6c1e901f364a74a10f  slf4j-1.5.8.tar.gz
--- 1 ----
! 289d4ce9b710269614e97f1ae6a27906  slf4j-1.6.1.tar.gz

--- NEW FILE: slf4j-pom.patch ---
--- pom.xml.sav0	2010-07-05 16:24:16.000000000 -0400
+++ pom.xml	2010-12-21 03:13:47.101426572 -0500
@@ -178,7 +178,7 @@
 
 
       <!-- as suggested in http://bugzilla.slf4j.org/show_bug.cgi?id=152 -->
-      <plugin>
+      <!--<plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
@@ -189,7 +189,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>-->
     </plugins>
 
 	</build>
@@ -349,4 +349,4 @@
 
 	</distributionManagement>
   
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: slf4j-integration.patch ---
--- integration/build.xml.sav2	2010-05-08 06:29:51.000000000 -0400
+++ integration/build.xml	2010-12-21 02:50:13.068263563 -0500
@@ -110,7 +110,7 @@
 
 	<target name="testMissingSingletonMethod">
 
-    <junit printsummary="yes" fork="no" haltonfailure="yes">
+    <junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="path142Binding" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports"
@@ -118,7 +118,7 @@
             name="org.slf4j.MissingSingletonMethodAssertionTest" />
 		</junit>
 
-    <junit printsummary="yes" fork="no" haltonfailure="yes">
+    <junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="path150Binding" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" 
@@ -130,7 +130,7 @@
 
 	<target name="testMismatch">
 
-    <junit printsummary="yes" fork="no" haltonfailure="yes">
+    <junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="path1511API" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" 
@@ -139,7 +139,7 @@
 		</junit>
 
 
-    <junit printsummary="yes" fork="no" haltonfailure="yes">
+    <junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="path1511Binding" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" 
@@ -150,7 +150,7 @@
 	</target>
 
 	<target name="testMatch">
-		<junit printsummary="yes" fork="no" haltonfailure="yes">
+		<junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="pathCurrent" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" 
@@ -160,7 +160,7 @@
 	</target>
 
 	<target name="testMultiBinding">
-		<junit printsummary="yes" fork="no" haltonfailure="yes">
+		<junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="multiBinding" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" 
@@ -170,7 +170,7 @@
 	</target>
 
 	<target name="testFuture_16Series">
-		<junit printsummary="yes" fork="no" haltonfailure="yes">
+		<junit printsummary="yes" fork="no" haltonfailure="no">
 			<classpath refid="binding1699" />
 			<formatter type="plain" />
 			<test fork="yes" todir="target/unit-reports" 
@@ -179,7 +179,7 @@
 		</junit>
 
     
-    <junit printsummary="yes" fork="no" haltonfailure="yes">
+    <junit printsummary="yes" fork="no" haltonfailure="no">
       <classpath refid="api1699" />
       <formatter type="plain" />
       <test fork="yes" todir="target/unit-reports" 
@@ -188,4 +188,4 @@
 		</junit>
 
 	</target>
-</project>
\ No newline at end of file
+</project>
--- integration/pom.xml.sav2	2010-07-05 16:24:16.000000000 -0400
+++ integration/pom.xml	2010-12-21 02:55:27.472890309 -0500
@@ -40,11 +40,11 @@
 
 
 	<!-- some test run Felix in hosted mode -->
-    <dependency>
+    <!--<dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.main</artifactId>
       <version>2.0.2</version>
-    </dependency>
+    </dependency>-->
   </dependencies>
 
   <build>
@@ -82,7 +82,7 @@
               <goal>run</goal>
             </goals>
           </execution>
-          <execution>
+          <!--<execution>
             <id>ant-osgi-test</id>
             <phase>package</phase>
             <configuration>
@@ -96,7 +96,7 @@
             <goals>
               <goal>run</goal>
             </goals>
-          </execution>
+          </execution>-->
 
         </executions>
       </plugin>
@@ -118,4 +118,4 @@
 
   </build>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: slf4j-bootstrap.patch ---
--- pom.xml.sav0	2010-07-05 16:24:16.000000000 -0400
+++ pom.xml	2010-12-21 03:13:47.101426572 -0500
@@ -37,12 +37,12 @@
 		<module>slf4j-api</module>
     <module>slf4j-simple</module>  
     <module>slf4j-nop</module>
-		<module>slf4j-jdk14</module>
+		<!--<module>slf4j-jdk14</module>-->
     <module>slf4j-log4j12</module>
     <module>slf4j-jcl</module>
     <module>slf4j-ext</module>  
-    <module>jcl-over-slf4j</module>
-    <module>log4j-over-slf4j</module>
+    <!--<module>jcl-over-slf4j</module>-->
+    <!--<module>log4j-over-slf4j</module>-->
     <module>jul-to-slf4j</module>
     <module>integration</module>
     <module>slf4j-site</module>




More information about the JPackage-commits mailing list