[Arakhnę-Dev] [242] * Prepare for Maven 3

[ Thread Index | Date Index | More arakhne.org/dev Archives ]


Revision: 242
Author:   galland
Date:     2011-08-13 14:55:52 +0200 (Sat, 13 Aug 2011)
Log Message:
-----------
* Prepare for Maven 3

Modified Paths:
--------------
    trunk/arakhneLog4J/pom.xml
    trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java

Modified: trunk/arakhneLog4J/pom.xml
===================================================================
--- trunk/arakhneLog4J/pom.xml	2011-08-13 12:55:41 UTC (rev 241)
+++ trunk/arakhneLog4J/pom.xml	2011-08-13 12:55:52 UTC (rev 242)
@@ -37,21 +37,6 @@
 
 	<build>
 		<!--
-			Configure the source files as resources to be filtered into a custom
-			target directory
-		-->
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<filtering>true</filtering>
-				<targetPath>${project.build.directory}/generated-sources/java</targetPath>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<!--
 			Overrule the default pom source directory to match our generated
 			sources so the compiler will pick them up
 		-->
@@ -98,9 +83,17 @@
 				<artifactId>tag-replacer</artifactId>
 				<executions>
 					<execution>
+						<id>source_generation</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generatesrc</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>property_preparation</id>
 						<phase>process-resources</phase>
 						<goals>
-							<goal>replacesrc</goal>
+							<goal>replaceresource</goal>
 						</goals>
 					</execution>
 				</executions>

Modified: trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java
===================================================================
--- trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java	2011-08-13 12:55:41 UTC (rev 241)
+++ trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java	2011-08-13 12:55:52 UTC (rev 242)
@@ -1,7 +1,7 @@
 /* 
  * $Id$
  * 
- * Copyright (C) 2004-2009 St&eacute;phane GALLAND and Nicolas GAUD
+ * Copyright (C) 2004-2009 Stephane GALLANDcolas GAUD
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * Log4J.
  * 
  * @author $Author: galland$
- * @version $Name$ $Revision$ $Date$
+ * @version $FullVersion$
  * @mavengroupid $GroupId$
  * @mavenartifactid $ArtifactId$
  * @see Logger


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/