You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/04/08 01:03:25 UTC
svn commit: r1585615 - in /maven/plugins/trunk/maven-doap-plugin: pom.xml
src/it/MDOAP-38/verify.groovy
src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Author: hboutemy
Date: Mon Apr 7 23:03:24 2014
New Revision: 1585615
URL: http://svn.apache.org/r1585615
Log:
updated parent pom
Modified:
maven/plugins/trunk/maven-doap-plugin/pom.xml
maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1585615&r1=1585614&r2=1585615&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-doap-plugin/pom.xml Mon Apr 7 23:03:24 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -60,7 +60,6 @@ under the License.
<mavenVersion>2.2.0</mavenVersion>
<scmVersion>1.7</scmVersion>
<mavenPluginVersion>3.2</mavenPluginVersion>
- <maven.site.path>plugins-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
<dependencies>
@@ -78,7 +77,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${mavenPluginVersion}</version>
<scope>provided</scope>
</dependency>
@@ -172,14 +170,6 @@ under the License.
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.4.1</version>
- <configuration>
- <useJava5>true</useJava5>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -273,7 +263,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.7</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
Modified: maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy?rev=1585615&r1=1585614&r2=1585615&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/it/MDOAP-38/verify.groovy Mon Apr 7 23:03:24 2014
@@ -1,24 +1,24 @@
-
-/*
- * 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.
- */
-def logFile = new File( basedir, 'build.log' )
-assert logFile.exists()
-content = logFile.text
-
-assert content.contains( 'The <doapOptions><shortdesc/></doapOptions> first sentence is too long maximum words number is 10.' )
+
+/*
+ * 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.
+ */
+def logFile = new File( basedir, 'build.log' )
+assert logFile.exists()
+content = logFile.text
+
+assert content.contains( 'The <doapOptions><shortdesc/></doapOptions> first sentence is too long maximum words number is 10.' )
Modified: maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=1585615&r1=1585614&r2=1585615&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java Mon Apr 7 23:03:24 2014
@@ -730,15 +730,15 @@ public class DoapMojo
writeReleases( writer, project );
// Developers
- @SuppressWarnings( "unchecked" ) List<Contributor> developers = project.getDevelopers();
+ List<Contributor> developers = project.getDevelopers();
writeContributors( writer, developers );
// Contributors
- @SuppressWarnings( "unchecked" ) List<Contributor> contributors = project.getContributors();
+ List<Contributor> contributors = project.getContributors();
writeContributors( writer, contributors );
// Extra DOAP
- @SuppressWarnings( "unchecked" ) Map<String, String> map = doapOptions.getExtra();
+ Map<Object, String> map = doapOptions.getExtra();
writeExtra( writer, project, "Extra DOAP vocabulary.", map, doapOptions.getXmlnsPrefix() );
// ASFext
@@ -2040,7 +2040,7 @@ public class DoapMojo
writeASFImplements( writer );
- @SuppressWarnings( "unchecked" ) Map<String, String> map = asfExtOptions.getExtra();
+ Map<Object, String> map = asfExtOptions.getExtra();
writeExtra( writer, project, "Extra ASFExt vocabulary.", map, asfExtOptions.getXmlnsPrefix() );
}
@@ -2357,7 +2357,7 @@ public class DoapMojo
* @param xmlnsPrefix not null
* @since 1.1
*/
- private void writeExtra( XMLWriter writer, MavenProject project, String comment, Map<String, String> map,
+ private void writeExtra( XMLWriter writer, MavenProject project, String comment, Map<Object, String> map,
String xmlnsPrefix )
{
if ( map == null || map.isEmpty() )
@@ -2366,9 +2366,9 @@ public class DoapMojo
}
boolean addComment = false;
- for ( Map.Entry<String, String> entry : map.entrySet() )
+ for ( Map.Entry<Object, String> entry : map.entrySet() )
{
- String key = entry.getKey();
+ String key = (String)entry.getKey();
String value = entry.getValue();
if ( value == null )
@@ -2416,7 +2416,7 @@ public class DoapMojo
for ( ExtOptions extOption : extOptions )
{
- @SuppressWarnings( "unchecked" ) Map<String, String> map = extOption.getExtensions();
+ Map<Object, String> map = extOption.getExtensions();
writeExtra( writer, project, "Other extension vocabulary.", map, extOption.getXmlnsPrefix() );
}
}