[xdoclet-plugins-commits] xdoclet-plugins LICENSE.txt, 1.1, 1.2 pom.xml, 1.11, 1.12

[Konstantin P. <ko...@us...>]

Update of /cvsroot/xdoclet-plugins/xdoclet-plugins
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9889

Modified Files:
	LICENSE.txt pom.xml 
Log Message:
reworked jelly merge, moved taglib from web plugin to generama to provide standard 
merge capabilities


Index: pom.xml
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pom.xml	30 Aug 2006 10:09:39 -0000	1.11
--- pom.xml	24 Sep 2006 11:58:56 -0000	1.12
***************
*** 183,188 ****
              <groupId>xdoclet</groupId>
              <artifactId>xdoclet</artifactId>
!             <version>2.0.5</version>
          </dependency>
          <dependency>
              <groupId>xerces</groupId>
--- 183,194 ----
              <groupId>xdoclet</groupId>
              <artifactId>xdoclet</artifactId>
!             <version>2.0.6-SNAPSHOT</version>
!         </dependency>
!         <dependency>
!             <groupId>commons-jelly</groupId>
!             <artifactId>commons-jelly-tags-xml</artifactId>
!             <version>20050823.222913</version>
          </dependency>
+         <!--
          <dependency>
              <groupId>xerces</groupId>
***************
*** 217,225 ****
          <dependency>
              <groupId>commons-jelly</groupId>
-             <artifactId>commons-jelly-tags-xml</artifactId>
-             <version>20050823.222913</version>
-         </dependency>
-         <dependency>
-             <groupId>commons-jelly</groupId>
              <artifactId>commons-jelly-tags-jsl</artifactId>
              <version>1.0</version>
--- 223,226 ----
***************
*** 250,253 ****
--- 251,256 ----
              <version>3.8.1</version>
          </dependency>
+                 -->
+ 
      </dependencies>
      <repositories>

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/xdoclet-plugins/xdoclet-plugins/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LICENSE.txt	21 Sep 2003 13:59:24 -0000	1.1
--- LICENSE.txt	24 Sep 2006 11:58:56 -0000	1.2
***************
*** 1,3 ****
! Copyright (c) 2003, XDoclet Plugins Team
  All rights reserved.
  
--- 1,3 ----
! Copyright (c) 2003-2006, XDoclet Plugins Team
  All rights reserved.