[Schmitzm-commits] r2230 - in trunk: schmitzm-core schmitzm-parent

[scm-commit at wald.intevation.org]

Author: alfonx
Date: 2013-02-14 18:43:14 +0100 (Thu, 14 Feb 2013)
New Revision: 2230

Modified:
   trunk/schmitzm-core/pom.xml
   trunk/schmitzm-parent/pom.xml
Log:
Java 1.7 wird ?\195?\188ber env.JAVA_HOME f?\195?\188r schmitzm in der schmitz-parent definiert.

Modified: trunk/schmitzm-core/pom.xml
===================================================================
--- trunk/schmitzm-core/pom.xml	2013-02-14 17:36:17 UTC (rev 2229)
+++ trunk/schmitzm-core/pom.xml	2013-02-14 17:43:14 UTC (rev 2230)
@@ -121,20 +121,6 @@
 	</dependencies>
 
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<excludes>
-						<exclude>**/.svn</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
 
 		<pluginManagement>
 			<plugins>

Modified: trunk/schmitzm-parent/pom.xml
===================================================================
--- trunk/schmitzm-parent/pom.xml	2013-02-14 17:36:17 UTC (rev 2229)
+++ trunk/schmitzm-parent/pom.xml	2013-02-14 17:43:14 UTC (rev 2230)
@@ -138,10 +138,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-<!--
-
-					<source>1.6</source>
-					<target>1.6</target>-->
+					<!-- <source>1.6</source> <target>1.6</target> -->
 					<excludes>
 						<exclude>**/.svn</exclude>
 					</excludes>
@@ -199,6 +196,24 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.5.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+
+					<showDeprecation>true</showDeprecation>
+					<showWarnings>true</showWarnings>
+					<executable>${env.JAVA_HOME}/bin/javac</executable>
+					<fork>true</fork>
+
+					<excludes>
+						<exclude>**/.svn</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -236,6 +251,13 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+
+
+
+
+
+
+
 	</build>
 
 
@@ -279,28 +301,4 @@
 
 	</distributionManagement>
 
-
-	<profiles>
-	  <profile>
-	    <id>ms_kallisto</id>
-	    <build>
-		<plugins>
-		    <plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-compiler-plugin</artifactId>
-			<version>2.5.1</version>
-			<configuration>
-			    <source>1.7</source>
-			    <target>1.7</target>
-			    <showDeprecation>true</showDeprecation>
-			    <showWarnings>true</showWarnings>
-			    <executable>${env.JAVA_HOME}/bin/javac</executable>
-			    <fork>true</fork>
-			</configuration>
-		    </plugin>
-		</plugins>
-	    </build>
-	  </profile>
-	</profiles>
-
 </project>