[Jpackage-commits] dist/docbkx/devel docbkx-jpp-depmap.xml, 1.4, 1.5 docbkx-settings.xml, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Nov 18 00:24:46 CET 2010


Update of /home/projects/jpackage/cvs/dist/docbkx/devel
In directory ryu.zarb.org:/tmp/cvs-serv26134

Modified Files:
	docbkx-jpp-depmap.xml docbkx-settings.xml 
Log Message:
- clean up xml

Index: docbkx-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/docbkx/devel/docbkx-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** docbkx-jpp-depmap.xml	17 Nov 2010 22:42:51 -0000	1.4
--- docbkx-jpp-depmap.xml	17 Nov 2010 23:24:43 -0000	1.5
***************
*** 1,189 ****
  <dependencies>
-   <dependency>
- 	<maven>
- 	  <groupId>antlr</groupId>
- 	  <artifactId>stringtemplate</artifactId>
- 	  <version>2.2</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>stringtemplate22</artifactId>
- 	  <version>2.2</version>
- 	</jpp>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>saxon</groupId>
- 	  <artifactId>saxon</artifactId>
- 	  <version>6.5.3</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>saxon</artifactId>
- 	  <version>6.5.3</version>
- 	</jpp>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>xml-resolver</groupId>
- 	  <artifactId>xml-resolver</artifactId>
- 	  <version>1.1</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>xml-commons-resolver11</artifactId>
- 	  <version>1.1</version>
- 	</jpp>
-   </dependency>
  
    <dependency>
! 	<maven>
! 	  <groupId>commons-el</groupId>
! 	  <artifactId>commons-el</artifactId>
! 	  <version>1.0</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP</groupId>
! 	  <artifactId>commons-el</artifactId>
! 	  <version>1.0</version>
! 	</jpp>
!   </dependency>
! 
!   <dependency>
! 	<maven>
! 	  <groupId>javax.servlet</groupId>
! 	  <artifactId>servlet-api</artifactId>
! 	  <version>2.5</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP</groupId>
! 	  <artifactId>servlet_2_5_api</artifactId>
! 	  <version>2.5</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>javax.servlet.jsp</groupId>
! 	  <artifactId>jsp-api</artifactId>
! 	  <version>2.0</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP</groupId>
! 	  <artifactId>jsp_2_0_api</artifactId>
! 	  <version>2.0</version>
! 	</jpp>
    </dependency>
  
    <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-extension</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>extension</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-gvt</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>gvt</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-awt-util</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>awt-util</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-ext</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>ext</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-svg-dom</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>svg-dom</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-bridge</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>bridge</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
!   </dependency>
!   <dependency>
! 	<maven>
! 	  <groupId>batik</groupId>
! 	  <artifactId>batik-transcoder</artifactId>
! 	  <version>1.6</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/batik</groupId>
! 	  <artifactId>transcoder</artifactId>
! 	  <version>1.6</version>
! 	</jpp>
    </dependency>
  
    <dependency>
! 	<maven>
! 	  <groupId>xml-apis</groupId>
! 	  <artifactId>xml-apis-ext</artifactId>
! 	  <version>1.3.04</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP/maven2</groupId>
! 	  <artifactId>empty-dep</artifactId>
! 	  <version>2.0.8</version>
! 	</jpp>
    </dependency>
  
    <dependency>
! 	<maven>
! 	  <groupId>xalan</groupId>
! 	  <artifactId>serializer</artifactId>
! 	  <version>2.7.0</version>
! 	</maven>
! 	<jpp>
! 	  <groupId>JPP</groupId>
! 	  <artifactId>xalan-j2-serializer</artifactId>
! 	  <version>2.7.1</version>
! 	</jpp>
    </dependency>
  
--- 1,54 ----
  <dependencies>
  
    <dependency>
!     <maven>
!       <groupId>saxon</groupId>
!       <artifactId>saxon</artifactId>
!       <version>6.5.3</version>
!     </maven>
!     <jpp>
!       <groupId>JPP</groupId>
!       <artifactId>saxon</artifactId>
!       <version>6.5.3</version>
!     </jpp>
    </dependency>
  
    <dependency>
!     <maven>
!       <groupId>xml-resolver</groupId>
!       <artifactId>xml-resolver</artifactId>
!       <version>1.1</version>
!     </maven>
!     <jpp>
!       <groupId>JPP</groupId>
!       <artifactId>xml-commons-resolver11</artifactId>
!       <version>1.1</version>
!     </jpp>
    </dependency>
  
    <dependency>
!     <maven>
!       <groupId>javax.servlet.jsp</groupId>
!       <artifactId>jsp-api</artifactId>
!       <version>2.0</version>
!     </maven>
!     <jpp>
!       <groupId>JPP</groupId>
!       <artifactId>jsp_2_0_api</artifactId>
!       <version>2.0</version>
!     </jpp>
    </dependency>
  
    <dependency>
!     <maven>
!       <groupId>xalan</groupId>
!       <artifactId>serializer</artifactId>
!       <version>2.7.0</version>
!     </maven>
!     <jpp>
!       <groupId>JPP</groupId>
!       <artifactId>xalan-j2-serializer</artifactId>
!       <version>2.7.1</version>
!     </jpp>
    </dependency>
  

Index: docbkx-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/docbkx/devel/docbkx-settings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** docbkx-settings.xml	28 May 2008 18:04:04 -0000	1.1
--- docbkx-settings.xml	17 Nov 2010 23:24:43 -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>




More information about the JPackage-commits mailing list