[Schmitzm-commits] r1749 - in trunk: schmitzm-adresses schmitzm-gt schmitzm-jfree schmitzm-jfree-gt

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-10-04 14:45:47 +0200 (Tue, 04 Oct 2011)
New Revision: 1749

Modified:
   trunk/schmitzm-adresses/
   trunk/schmitzm-gt/pom.xml
   trunk/schmitzm-jfree-gt/
   trunk/schmitzm-jfree/
Log:
xercesImplt 2.7.1 zu 2.9.1 ge?\195?\164ndert


Property changes on: trunk/schmitzm-adresses
___________________________________________________________________
Name: svn:ignore
   - .settings

.classpath

.project

target

   + .settings

.classpath

.project

target

build


Modified: trunk/schmitzm-gt/pom.xml
===================================================================
--- trunk/schmitzm-gt/pom.xml	2011-10-03 20:47:41 UTC (rev 1748)
+++ trunk/schmitzm-gt/pom.xml	2011-10-04 12:45:47 UTC (rev 1749)
@@ -34,7 +34,7 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-render</artifactId>
@@ -42,7 +42,7 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-epsg-hsql</artifactId>
@@ -57,9 +57,32 @@
 			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
+
+			<exclusions>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis-xerces</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
+		<!-- <dependency> -->
+		<!-- <groupId>apache-xerces</groupId> -->
+		<!-- <artifactId>xml-apis</artifactId> -->
+		<!-- <version>2.0.0</version> -->
+		<!-- </dependency> -->
 		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.9.1</version>
+		</dependency>
+
+
+		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-shapefile-renderer</artifactId>
 			<version>${geotools.version}</version>
@@ -67,13 +90,13 @@
 			<scope>compile</scope>
 		</dependency>
 
-<!--		<dependency>-->
-<!--			<groupId>org.geotools</groupId>-->
-<!--			<artifactId>gt-legacy</artifactId>-->
-<!--			<version>${geotools.version}</version>-->
-<!--			<type>jar</type>-->
-<!--			<scope>compile</scope>-->
-<!--		</dependency>-->
+		<!-- <dependency> -->
+		<!-- <groupId>org.geotools</groupId> -->
+		<!-- <artifactId>gt-legacy</artifactId> -->
+		<!-- <version>${geotools.version}</version> -->
+		<!-- <type>jar</type> -->
+		<!-- <scope>compile</scope> -->
+		<!-- </dependency> -->
 
 		<dependency>
 			<groupId>org.geotools</groupId>
@@ -200,7 +223,8 @@
 									<goal>java</goal>
 								</goals>
 								<configuration>
-									<mainClass>de.schmitzm.lang.ResourceProviderOperator</mainClass>
+									<mainClass>de.schmitzm.lang.ResourceProviderOperator
+									</mainClass>
 									<arguments>
 										<argument>-s</argument>
 										<argument>${basedir}/src/main/resources</argument>


Property changes on: trunk/schmitzm-jfree
___________________________________________________________________
Name: svn:ignore
   - target
.settings
.classpath
.project

   + target
.settings
.classpath
.project

build



Property changes on: trunk/schmitzm-jfree-gt
___________________________________________________________________
Name: svn:ignore
   - target
.settings
.classpath
.project

   + target
.settings
.classpath
.project

build