Author: jvanzyl
Date: Wed Oct 1 06:13:51 2008
New Revision: 700761
URL: http://svn.apache.org/viewvc?rev=700761&view=rev
Log:
o prepare the compat module for dynamic component generation
Modified:
maven/components/trunk/maven-compat/pom.xml
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Modified: maven/components/trunk/maven-compat/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=700761&r1=700760&r2=700761&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Wed Oct 1 06:13:51 2008
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under
- the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE
+ file distributed with this work for additional information regarding
copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language
+ governing permissions and limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
@@ -26,11 +21,31 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
+ <artifactId>maven-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
</dependency>
</dependencies>
-</project>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=700761&r1=700760&r2=700761&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Wed Oct 1 06:13:51 2008
@@ -21,6 +21,7 @@
import org.apache.maven.model.*;
import org.apache.maven.project.ModelUtils;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -34,16 +35,10 @@
import java.util.StringTokenizer;
import java.util.TreeMap;
-/**
- * @author Jason van Zyl
- * @version $Id: DefaultModelInheritanceAssembler.java,v 1.4 2004/08/23
20:24:54
- * jdcasey Exp $
- * @todo generate this with modello to keep it in sync with changes in the
model.
- */
[EMAIL PROTECTED](role = ModelInheritanceAssembler.class)
public class DefaultModelInheritanceAssembler
implements ModelInheritanceAssembler
{
-
// TODO: Remove this!
@SuppressWarnings("unchecked")
public void assembleBuildInheritance( Build childBuild, Build parentBuild,
boolean handleAsInheritance )
