You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/11/28 05:23:42 UTC
svn commit: r721335 - in /maven/components/trunk/maven-project-builder/src:
main/java/org/apache/maven/project/builder/
test/java/org/apache/maven/project/builder/
Author: sisbell
Date: Thu Nov 27 20:23:42 2008
New Revision: 721335
URL: http://svn.apache.org/viewvc?rev=721335&view=rev
Log:
Merging out 721278.
Removed:
maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/PluginSpecTest.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=721335&r1=721334&r2=721335&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java Thu Nov 27 20:23:42 2008
@@ -385,14 +385,8 @@
public static String phase =
"http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/phase";
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/goals#collection/goal";
- }
+ public static String goals =
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/goals";
public static String inherited =
"http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/inherited";
@@ -456,15 +450,8 @@
}
}
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/goals#collection/goal";
-
- }
+ public static String goals =
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/goals";
public static String inherited =
"http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/inherited";
@@ -511,14 +498,8 @@
public static String phase =
"http://apache.org/maven/project/build/plugins#collection/plugin/executions#collection/execution/phase";
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/build/plugins#collection/plugin/executions#collection/execution/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/build/plugins#collection/plugin/executions#collection/execution/goals#collection/goal";
- }
+ public static String goals =
+ "http://apache.org/maven/project/build/plugins#collection/plugin/executions#collection/execution/goals";
public static String inherited =
"http://apache.org/maven/project/build/plugins#collection/plugin/executions#collection/execution/inherited";
@@ -581,14 +562,8 @@
"http://apache.org/maven/project/build/plugins#collection/plugin/dependencies#collection/dependency/optional";
}
}
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/build/plugins#collection/plugin/goals#collection";
- public static String goal =
- "http://apache.org/maven/project/build/plugins#collection/plugin/goals#collection/goal";
- }
+ public static String goals = "http://apache.org/maven/project/build/plugins#collection/plugin/goals";
public static String inherited =
"http://apache.org/maven/project/build/plugins#collection/plugin/inherited";
@@ -775,14 +750,8 @@
public static String phase =
"http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/phase";
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/goals#collection/goal";
- }
+ public static String goals =
+ "http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/goals";
public static String inherited =
"http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/inherited";
@@ -846,14 +815,8 @@
}
}
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/goal";
- }
+ public static String goals =
+ "http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/goals";
public static String inherited =
"http://apache.org/maven/project/profiles#collection/profile/build/pluginManagement/plugins#collection/plugin/inherited";
@@ -902,14 +865,8 @@
public static String phase =
"http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/executions#collection/execution/phase";
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/executions#collection/execution/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/executions#collection/execution/goals#collection/goal";
- }
+ public static String goals =
+ "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/executions#collection/execution/goals";
public static String inherited =
"http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/executions#collection/execution/inherited";
@@ -973,20 +930,14 @@
}
}
- public static class Goals
- {
- public static String xURI =
- "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/goals#collection";
-
- public static String goal =
- "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/goals#collection/goal";
- }
+ public static String goals =
+ "http://apache.org/maven/project/profiles#collection/profile/build/plugins/plugin/goals";
public static String inherited =
- "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/inherited";
+ "http://apache.org/maven/project/profiles#collection/profile/build/plugins/plugin/inherited";
public static String configuration =
- "http://apache.org/maven/project/profiles#collection/profile/build/plugins#collection/plugin/configuration";
+ "http://apache.org/maven/project/profiles#collection/profile/build/plugins/plugin/configuration";
}
}
}
Modified: maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java?rev=721335&r1=721334&r2=721335&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java (original)
+++ maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java Thu Nov 27 20:23:42 2008
@@ -12,7 +12,7 @@
public class EnforcerPomTest
{
- @org.junit.Test
+ @org.junit.Test
public void dependencyManagementWithScopeAndClassifier() throws IOException
{
List<ModelProperty> mp = new ArrayList<ModelProperty>();