[picocontainer-scm] [scm-git][5/7] Removed duplicate xwork dependency.
Michael Rimov <git-yCVjj/[email protected]> Thu, 20 Jun 2013 18:38:59 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
--614af77e1bf60467aadc4b7f8ce70152df9e2504 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline commit 7b2f01e7f966cb93a976671aa024098c35352d80=0AAuthor: Michael Rimov= <[email protected]>=0AAuthorDate: Thu, 20 Jun 2013 14:35:40 -0700= =0ACommit: Michael Rimov <[email protected]>=0ACommitDate: Thu,= 20 Jun 2013 14:35:40 -0700=0A=0A Removed duplicate xwork dependency.=0A= =0Adiff --git a/web/web-struts2/pom.xml b/web/web-struts2/pom.xml=0Aindex 9= a92b97..bb17d66 100644=0A--- a/web/web-struts2/pom.xml=0A+++ b/web/web-stru= ts2/pom.xml=0A@@ -16,9 +16,6 @@=0A <optional>false</optional>= =0A </dependency>=0A <dependency>=0A- <groupId>c= om.opensymphony</groupId><artifactId>xwork</artifactId><version>2.1.3</vers= ion>=0A- </dependency>=0A- <dependency>=0A <group= Id>org.apache.struts</groupId><artifactId>struts2-core</artifactId><version= >2.3.14.3</version>=0A </dependency>=0A </dependencies>=0A=0A= =0A=0A= --614af77e1bf60467aadc4b7f8ce70152df9e2504 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;">7b2f01e7f966cb9= 3a976671aa024098c35352d80</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;">Thu, 20 Jun 2013 14:35:40 -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"" style=3D"font-size: 12px;">Removed duplicate xwork depe= ndency.</dd>=0A</dl>=0A<h2 id=3D"web/web-struts2/pom.xml" style=3D"font-siz= e: 12px; font-family: Verdana; font-weight: bold; line-height: 25px; margin= -bottom: 2px; padding-left: 5px; background-color: #bbb;">Changed file web/= web-struts2/pom.xml</h2>=0A=0A<table style=3D"font-size: 12px; width: 100%;= border-collapse: collapse;">=0A<tr style=3D"font-size: 12px;">=0A<td class= =3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; b= ackground-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">16</td>=0A<td clas= s=3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Ver= a Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; = background-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">16</td>=0A<td sty= le=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono'= ,'Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<optional>false</optional><= /td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"= font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mona= co','Courier',monospace; width: 23px; text-align: right; background-color: = #ccc;" align=3D"right" bgcolor=3D"#ccc">17</td>=0A<td class=3D"ln" style=3D= "font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Mon= aco','Courier',monospace; width: 23px; text-align: right; background-color:= #ccc;" align=3D"right" bgcolor=3D"#ccc">17</td>=0A<td style=3D"font-size: = 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courie= r',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</d= ependency></td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D= "ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sa= ns Mono','Monaco','Courier',monospace; width: 23px; text-align: right; back= ground-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">18</td>=0A<td class= =3D"ln" style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera= Sans Mono','Monaco','Courier',monospace; width: 23px; text-align: right; b= ackground-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">18</td>=0A<td styl= e=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono',= 'Monaco','Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0<dependency></td>=0A</tr>=0A<tr class=3D"r" style=3D"font= -size: 12px; background-color: #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" = style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mo= no','Monaco','Courier',monospace; width: 23px; text-align: right; backgroun= d-color: #ccc;" align=3D"right" bgcolor=3D"#ccc">19</td>=0A<td class=3D"ln"= style=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans M= ono','Monaco','Courier',monospace; width: 23px; text-align: right; backgrou= nd-color: #ccc;" align=3D"right" bgcolor=3D"#ccc"></td>=0A<td style=3D"font= -size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco',= 'Courier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0<groupId>com.opensymphony</groupId>&= lt;artifactId>xwork</artifactId><version>2.1.3</version&g= t;</td>=0A</tr>=0A<tr class=3D"r" style=3D"font-size: 12px; background-colo= r: #fdd;" bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-size: 12px; co= lor: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monos= pace; width: 23px; text-align: right; background-color: #ccc;" align=3D"rig= ht" bgcolor=3D"#ccc">20</td>=0A<td class=3D"ln" style=3D"font-size: 12px; c= olor: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mono= space; width: 23px; text-align: right; background-color: #ccc;" align=3D"ri= ght" bgcolor=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; color: #000; fo= nt-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</dependency></td>=0A= </tr>=0A<tr class=3D"r" style=3D"font-size: 12px; background-color: #fdd;" = bgcolor=3D"#fdd">=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000;= font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; widt= h: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcolo= r=3D"#ccc">21</td>=0A<td class=3D"ln" style=3D"font-size: 12px; color: #000= ; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace; wid= th: 23px; text-align: right; background-color: #ccc;" align=3D"right" bgcol= or=3D"#ccc"></td>=0A<td style=3D"font-size: 12px; color: #000; font-family:= 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<dependency></td>=0A</tr>=0A<t= r style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size: 12px; = color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mon= ospace; width: 23px; text-align: right; background-color: #ccc;" align=3D"r= ight" bgcolor=3D"#ccc">22</td>=0A<td class=3D"ln" style=3D"font-size: 12px;= color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',mo= nospace; width: 23px; text-align: right; background-color: #ccc;" align=3D"= right" bgcolor=3D"#ccc">19</td>=0A<td style=3D"font-size: 12px; color: #000= ; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospace;">= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0<groupId>org.apache.struts</groupId><artifactId>struts= 2-core</artifactId><version>2.3.14.3</version></td>=0A</t= r>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style=3D"font-size:= 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Couri= er',monospace; width: 23px; text-align: right; background-color: #ccc;" ali= gn=3D"right" bgcolor=3D"#ccc">23</td>=0A<td class=3D"ln" style=3D"font-size= : 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Cour= ier',monospace; width: 23px; text-align: right; background-color: #ccc;" al= ign=3D"right" bgcolor=3D"#ccc">20</td>=0A<td style=3D"font-size: 12px; colo= r: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Courier',monospa= ce;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</dependency&= gt;</td>=0A</tr>=0A<tr style=3D"font-size: 12px;">=0A<td class=3D"ln" style= =3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','= Monaco','Courier',monospace; width: 23px; text-align: right; background-col= or: #ccc;" align=3D"right" bgcolor=3D"#ccc">24</td>=0A<td class=3D"ln" styl= e=3D"font-size: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono',= 'Monaco','Courier',monospace; width: 23px; text-align: right; background-co= lor: #ccc;" align=3D"right" bgcolor=3D"#ccc">21</td>=0A<td style=3D"font-si= ze: 12px; color: #000; font-family: 'Bitstream Vera Sans Mono','Monaco','Co= urier',monospace;">=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</dependencies></td>= =0A</tr>=0A</table>=0A<br style=3D"font-size: 12px;"><br style=3D"font-size= : 12px;">=0A</body>=0A</html>=0A= --614af77e1bf60467aadc4b7f8ce70152df9e2504--