[jbosstools-commits] JBoss Tools SVN: r42077 - in trunk/maven/plugins: org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet and 2 other directories.

[jbosstools-commits at lists.jboss.org]

Author: fbricon
Date: 2012-06-19 04:02:13 -0400 (Tue, 19 Jun 2012)
New Revision: 42077

Modified:
   trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
   trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java
   trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
   trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
JBIDE-12111 : dynamically set the maven-compiler-plugin for seam projects, in order to avoid constraint violation occurring when mavenizing seam 2.3 projects

Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java	2012-06-19 07:47:24 UTC (rev 42076)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java	2012-06-19 08:02:13 UTC (rev 42077)
@@ -708,7 +708,7 @@
 		resource = resource2;
 	}
 
-	public static void addCompilerPlugin(Build build, IProject project) {
+	public static void addCompilerPlugin(List<org.apache.maven.model.Plugin> plugins, IProject project) {
 		String compilerLevel = JavaFacetUtil.getCompilerLevel(project);
 		if (compilerLevel == null || DEFAULT_COMPILER_LEVEL.equals(compilerLevel)) {
 			return;
@@ -716,7 +716,7 @@
 		org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin();
 		plugin.setGroupId("org.apache.maven.plugins"); //$NON-NLS-1$
 		plugin.setArtifactId("maven-compiler-plugin"); //$NON-NLS-1$
-		plugin.setVersion("2.5");
+		plugin.setVersion("2.5.1");
 		Xpp3Dom configuration = new Xpp3Dom( "configuration" ); //$NON-NLS-1$
 		Xpp3Dom source = new Xpp3Dom("source"); //$NON-NLS-1$
 		source.setValue(compilerLevel); //$NON-NLS-1$
@@ -725,7 +725,7 @@
 		target.setValue(compilerLevel); //$NON-NLS-1$
 		configuration.addChild(target);
 		plugin.setConfiguration(configuration);
-		build.getPlugins().add(plugin);
+		plugins.add(plugin);
 	}
 	
 	public static PomResourceImpl loadResource(IFile pomFile)

Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java	2012-06-19 07:47:24 UTC (rev 42076)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java	2012-06-19 08:02:13 UTC (rev 42077)
@@ -114,7 +114,7 @@
 				}
 				IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet(SEAM_FACET_ID);
 				if (!"pom".equals(packaging) && !fpwc.hasProjectFacet(seamFacet)) {
-					MavenCoreActivator.addCompilerPlugin(build, project);
+					MavenCoreActivator.addCompilerPlugin(build.getPlugins(), project);
 				}
 
 				if (!pom.exists()) {

Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml	2012-06-19 07:47:24 UTC (rev 42076)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml	2012-06-19 08:02:13 UTC (rev 42077)
@@ -499,18 +499,10 @@
    </repositories>
    
 	<build>
+	  <pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.7.2</version>
 				<configuration>
@@ -518,5 +510,6 @@
         		</configuration> 
 			</plugin>
 		</plugins>
+	  </pluginManagement>
 	</build>
 </project>
\ No newline at end of file

Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java	2012-06-19 07:47:24 UTC (rev 42076)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java	2012-06-19 08:02:13 UTC (rev 42077)
@@ -912,6 +912,9 @@
 			webProjectName = seamFacetModel.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
 			
 			IProject seamWebProject = ResourcesPlugin.getWorkspace().getRoot().getProject(webProjectName);
+			
+			MavenCoreActivator.addCompilerPlugin(model.getBuild().getPluginManagement().getPlugins(), seamWebProject);
+			
 			IPath location = seamWebProject.getLocation().removeLastSegments(1);
 			location = location.append(parentProjectName);
 			MavenCoreActivator.createMavenProject(parentProjectName, null, model, false, location);