[picocontainer-scm] [scm-git][6/12] Merge branch 'master' of github.com:picocontainer/picocontainer
Michael Rimov <git-yCVjj/[email protected]> Thu, 8 Aug 2013 23:09:33 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--ababfcf457398d13ea59eedc919fb3356bc7bb4b Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline commit a326c23b19a2badb66ed96ad197fcd3888a9ba31=0AMerge: 2c4d126 8e0a5e3=0A= Author: Michael Rimov <[email protected]>=0AAuthorDate: Tue, 30= Jul 2013 15:09:27 -0700=0ACommit: Michael Rimov <mike.rimov@centercomp= .com>=0ACommitDate: Tue, 30 Jul 2013 15:09:27 -0700=0A=0A Merge branch '= master' of github.com:picocontainer/picocontainer=0A =0A Conflicts:= =0A pom.xml=0A=0Adiff --cc pom.xml=0Aindex e5a588d,7d88ff6..c5a3f82=0A-= -- a/pom.xml=0A+++ b/pom.xml=0A@@@ -2,19 -3,19 +2,20 @@@=0A <parent>=0A = <groupId>org.codehaus</groupId>=0A <artifactId>codehaus-parent</artifa= ctId>=0A - <version>3</version>=0A - <relativePath></relativePath>=0A + = <version>4</version>=0A + <relativePath/>=0A </parent>=0A - <modelVer= sion>4.0.0</modelVersion>=0A - <groupId>com.picocontainer</groupId><arti= factId>picocontainer-root</artifactId>=0A - <name>PicoContainer Root</na= me>=0A - <version>3.0-SNAPSHOT</version>=0A - <packaging>pom</packagi= ng>=0A - <url>http://www.picocontainer.org</url>=0A - <properties>=0A= + <modelVersion>4.0.0</modelVersion>=0A + <groupId>com.picocontainer</grou= pId>=0A + <artifactId>picocontainer-root</artifactId>=0A + <name>PicoContai= ner Root</name>=0A + <version>3.0-SNAPSHOT</version>=0A + <packaging>pom</p= ackaging>=0A + <url>http://www.picocontainer.org</url>=0A + <properties>=0A= - <paranamer-version>2.5.1</paranamer-version>=0A+ <paranamer-version>2= .5.5</paranamer-version>=0A - <jtype-version>0.1.1</jtype-version> =0A - = <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> =0A++ = <jtype-version>0.1.3</jtype-version> =0A + <project.build.sourceEncoding= >UTF-8</project.build.sourceEncoding>=0A </properties>=0A <organization= >=0A <name>Codehaus</name>=0AChanged files:=0A=0AM modules/pico-module-m= aven-plugin/pom.xml=0AM pico/container-debug/pom.xml=0AM pico/container/pom= .xml=0AM pico/examples/pom.xml=0AM pico/gems/pom.xml=0AM pom.xml=0AM pico/e= xamples/security-manager-example/pom.xml=0A=0A=0A=0A=0A= --ababfcf457398d13ea59eedc919fb3356bc7bb4b Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w= 3.org/TR/REC-html40/loose.dtd">=0A<html style=3D"font-size: 12px;">=0A<head= ><meta http-equiv=3D"Content-type" content=3D"text/html; charset=3Dutf-8"><= /head>=0A<body style=3D"font-size: 12px;">=0A<style type=3D"text/css">=0Adt= :after { content: ':' !important; }=0A></style>=0A<dl class=3D"title" style= =3D"font-size: 12px; font-family: Verdana; background-color: #ddd; padding:= 10px;">=0A<dt style=3D"font-size: 12px; float: left; font-weight: bold; mi= n-width: 6em;">Commit</dt>=0A<dd style=3D"font-size: 12px;">a326c23b19a2bad= b66ed96ad197fcd3888a9ba31</dd>=0A<dt style=3D"font-size: 12px; float: left;= font-weight: bold; min-width: 6em;">Branch</dt>=0A<dd style=3D"font-size: = 12px;">master</dd>=0A<dt style=3D"font-size: 12px; float: left; font-weight= : bold; min-width: 6em;">Author</dt>=0A<dd style=3D"font-size: 12px;">Micha= el Rimov <[email protected]></dd>=0A<dt style=3D"font-size: 1= 2px; float: left; font-weight: bold; min-width: 6em;">Date</dt>=0A<dd style= =3D"font-size: 12px;">Tue, 30 Jul 2013 15:09:27 -0700</dd>=0A<dt style=3D"f= ont-size: 12px; float: left; font-weight: bold; min-width: 6em;">Message</d= t>=0A<dd class=3D"multi-line" style=3D"font-size: 12px; clear: both; margin= -left: 0; padding-top: 1em;">Merge branch 'master' of github.com:picocontai= ner/picocontainer<br style=3D"font-size: 12px;"><br style=3D"font-size: 12p= x;">Conflicts:<br style=3D"font-size: 12px;">pom.xml</dd>=0A</dl>Changed fi= les:<br style=3D"font-size: 12px;"><br style=3D"font-size: 12px;">M modules= /pico-module-maven-plugin/pom.xml<br style=3D"font-size: 12px;">M pico/cont= ainer-debug/pom.xml<br style=3D"font-size: 12px;">M pico/container/pom.xml<= br style=3D"font-size: 12px;">M pico/examples/pom.xml<br style=3D"font-size= : 12px;">M pico/gems/pom.xml<br style=3D"font-size: 12px;">M pom.xml<br sty= le=3D"font-size: 12px;">M pico/examples/security-manager-example/pom.xml<br= style=3D"font-size: 12px;"><br style=3D"font-size: 12px;">=0A</body>=0A</h= tml>=0A= --ababfcf457398d13ea59eedc919fb3356bc7bb4b--