[Schmitzm-commits] r2274 - in trunk: schmitzm-parent schmitzm-regex

[scm-commit at wald.intevation.org]

Author: alfonx
Date: 2013-03-12 17:12:36 +0100 (Tue, 12 Mar 2013)
New Revision: 2274

Modified:
   trunk/schmitzm-parent/pom.xml
   trunk/schmitzm-regex/pom.xml
Log:
Neuste, zusammenpassende versionen von log4j und slf-via-log4j

		<dependency>
			<groupId>log4j</groupId>
			<artifactId>log4j</artifactId>
			<version>1.2.17</version>
		</dependency>
		
<!-- SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder". SLF4J: 
			Defaulting to no-operation (NOP) logger implementation SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder 
			for further details. -->
		<dependency>
			<groupId>org.slf4j</groupId>
			<artifactId>slf4j-log4j12</artifactId>
			<version>1.7.2</version>
		</dependency>		

Modified: trunk/schmitzm-parent/pom.xml
===================================================================
--- trunk/schmitzm-parent/pom.xml	2013-03-12 16:05:37 UTC (rev 2273)
+++ trunk/schmitzm-parent/pom.xml	2013-03-12 16:12:36 UTC (rev 2274)
@@ -100,14 +100,21 @@
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
-			<!-- Logging with log4j. Die MVN dependency fuer 1.2.15 ist defekt. downgraded -->
-			<!-- to 1.2.14 http://jira.codehaus.org/browse/MEV-649 -->
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
+			<version>1.2.17</version>
 		</dependency>
+
+		<!-- SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder". SLF4J: 
+			Defaulting to no-operation (NOP) logger implementation SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder 
+			for further details. -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.2</version>
+		</dependency>
+		
 	</dependencies>
 
 	<build>
@@ -289,36 +296,36 @@
 
 	</distributionManagement>
 
-<profiles>
-<profile>
-<id>tweakJdk7Path</id>
+	<profiles>
+		<profile>
+			<id>tweakJdk7Path</id>
 
-<build>
-<plugins>
+			<build>
+				<plugins>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>3.0</version>
+						<configuration>
+							<source>1.7</source>
+							<target>1.7</target>
 
-					<showDeprecation>true</showDeprecation>
-					<showWarnings>true</showWarnings>
-					<executable>/usr/lib/jvm/java-7-oracle/bin/javac</executable>
-					<fork>true</fork>
+							<showDeprecation>true</showDeprecation>
+							<showWarnings>true</showWarnings>
+							<executable>/usr/lib/jvm/java-7-oracle/bin/javac</executable>
+							<fork>true</fork>
 
-					<excludes>
-						<exclude>**/.svn</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
+							<excludes>
+								<exclude>**/.svn</exclude>
+							</excludes>
+						</configuration>
+					</plugin>
+				</plugins>
 
 
-</build>
+			</build>
 
-</profile>
-</profiles>
+		</profile>
+	</profiles>
 </project>

Modified: trunk/schmitzm-regex/pom.xml
===================================================================
--- trunk/schmitzm-regex/pom.xml	2013-03-12 16:05:37 UTC (rev 2273)
+++ trunk/schmitzm-regex/pom.xml	2013-03-12 16:12:36 UTC (rev 2274)
@@ -17,14 +17,6 @@
 	<dependencies>
 
 		<dependency>
-			<!-- Da unten der log4j klram vom solr rausfliegt, müssen wir hier etwas 
-				definieren. -->
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-		</dependency>
-
-		<dependency>
 			<artifactId>solr-core</artifactId>
 			<groupId>org.apache.solr</groupId>
 			<version>4.1.0</version>