Compare commits
2 Commits
master
...
maven-plug
| Author | SHA1 | Date |
|---|---|---|
Robert Scholte
|
9107632fe9 | |
|
Robert Scholte
|
42758eef07 |
|
|
@ -1 +0,0 @@
|
|||
asfMavenStdBuild(javaVersions:['8','7'])
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-annotations</artifactId>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
|
@ -264,7 +264,6 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-plugin-plugin</artifactId>
|
||||
<version>3.5</version>
|
||||
<!-- will use previous maven-plugin-plugin release to build current maven-plugin-plugin as configured in parent -->
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ under the License.
|
|||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<!-- pom properties values not taken into account since invoker defines properties -->
|
||||
<!-- that override what's defined in pom -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
</properties>
|
||||
|
|
@ -72,11 +70,7 @@ under the License.
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<configuration>
|
||||
<source>1.8</source><!-- avoid ${maven.compiler.source} since value is not as expected -->
|
||||
<target>1.8</target><!-- avoid ${maven.compiler.target} since value is not as expected -->
|
||||
</configuration>
|
||||
<version>2.4</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
package fr.ca;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
public interface TestInterface {
|
||||
|
||||
/**
|
||||
* Java 8 required to support such default method implementation
|
||||
*/
|
||||
public default void foo(){
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -21,9 +21,6 @@ package fr.ca;
|
|||
|
||||
public interface TestInterface {
|
||||
|
||||
/**
|
||||
* Java 8 required to support such default method implementation
|
||||
*/
|
||||
public default void foo(){
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
# 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.
|
||||
|
||||
invoker.goals = clean plugin:report
|
||||
invoker.mavenOpts = -Duser.language=en -Duser.country=US -Duser.variant=US
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
<?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.
|
||||
-->
|
||||
|
||||
<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/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.apache.maven.plugins.its.plugin</groupId>
|
||||
<artifactId>report-since</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<packaging>maven-plugin</packaging>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-plugin-api</artifactId>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-plugin-plugin</artifactId>
|
||||
<version>@project.version@</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>@sitePluginVersion@</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
<report>index</report>
|
||||
</reports>
|
||||
</reportSet>
|
||||
</reportSets>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-plugin-plugin</artifactId>
|
||||
<version>@project.version@</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
</project>
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
package org;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import org.apache.maven.plugin.AbstractMojo;
|
||||
|
||||
/**
|
||||
* Does nothing.
|
||||
*
|
||||
* @goal noop
|
||||
* @phase process-sources
|
||||
* @requiresDependencyResolution test
|
||||
* @requiresDirectInvocation true
|
||||
* @requiresOnline
|
||||
* @inheritByDefault false
|
||||
* @execute phase="compile"
|
||||
* @aggregator
|
||||
* @since 1.0
|
||||
*
|
||||
* @deprecated You don't use test goals, do you?
|
||||
*/
|
||||
public class MyMojo
|
||||
extends AbstractMojo
|
||||
{
|
||||
|
||||
/**
|
||||
* This is a test.
|
||||
*
|
||||
* @parameter
|
||||
* @required
|
||||
*/
|
||||
@SuppressWarnings( "unused" )
|
||||
private String required;
|
||||
|
||||
/**
|
||||
* This is a test.
|
||||
*
|
||||
* @parameter expression="${string}" default-value="${project.version}/</markup-must-be-escaped>"
|
||||
* @deprecated Just testing.
|
||||
* @since 1.1
|
||||
*/
|
||||
@SuppressWarnings( "unused" )
|
||||
private String string;
|
||||
|
||||
public void execute()
|
||||
{
|
||||
// intentional do nothing
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
assert new File( basedir, 'target/generated-site' ).exists()
|
||||
|
||||
content = new File( basedir, 'target/generated-site/xdoc/noop-mojo.xml' ).text
|
||||
|
||||
assert content.contains( '<li><strong>Since</strong>: <code>1.0</code></li>' )
|
||||
assert content.contains( '<li><strong>Since</strong>: <code>1.1</code></li>' )
|
||||
|
||||
return true
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
# 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.
|
||||
|
||||
invoker.goals = process-classes javadoc:javadoc
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
<?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.
|
||||
-->
|
||||
|
||||
<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/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.apache.maven.plugins.plugin.its</groupId>
|
||||
<artifactId>mplugin3224</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<packaging>maven-plugin</packaging>
|
||||
|
||||
<description>
|
||||
Generation javadoc for private methods should be valid
|
||||
</description>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-plugin-api</artifactId>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-utils</artifactId>
|
||||
<version>3.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-annotations</artifactId>
|
||||
<version>@project.version@</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.0-M1</version>
|
||||
<configuration>
|
||||
<level>private</level>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-plugin-plugin</artifactId>
|
||||
<version>@project.version@</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-descriptor</id>
|
||||
<phase>process-classes</phase>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>help-goal</id>
|
||||
<goals>
|
||||
<goal>helpmojo</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
package test;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import org.apache.maven.plugin.AbstractMojo;
|
||||
import org.apache.maven.plugins.annotations.Mojo;
|
||||
import org.apache.maven.plugins.annotations.Parameter;
|
||||
|
||||
/**
|
||||
* MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
|
||||
* inline link to {@link org.apache.maven.plugin.AbstractMojo}.
|
||||
*
|
||||
* @deprecated As of 1.0, use the "quoted" goal instead.
|
||||
* @since 2.1
|
||||
*/
|
||||
@Mojo( name= "test" )
|
||||
public class MyMojo
|
||||
extends AbstractMojo
|
||||
{
|
||||
|
||||
/**
|
||||
* This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
|
||||
* escaped in Java string literals.
|
||||
*
|
||||
* @since 2.0
|
||||
*/
|
||||
@Parameter( defaultValue = "escape\\backslash" )
|
||||
private String defaultParam;
|
||||
|
||||
/**
|
||||
* This parameter is deprecated.
|
||||
*
|
||||
* @deprecated As of version 1.0, use the {@link #defaultParam} instead.
|
||||
*/
|
||||
@Parameter
|
||||
private String deprecatedParam;
|
||||
|
||||
@Parameter( property = "test.undocumented", required = true )
|
||||
private String undocumentedParam;
|
||||
|
||||
/**
|
||||
* Readonly parameter: should not be proposed for configuration.
|
||||
*/
|
||||
@Parameter( defaultValue = "not for configuration", readonly = true )
|
||||
private String readonly;
|
||||
|
||||
public void execute()
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -19,24 +19,10 @@ package org.apache.maven.plugin.plugin;
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.maven.artifact.Artifact;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
|
||||
import org.apache.maven.artifact.versioning.VersionRange;
|
||||
import org.apache.maven.doxia.sink.Sink;
|
||||
import org.apache.maven.doxia.siterenderer.Renderer;
|
||||
import org.apache.maven.execution.RuntimeInformation;
|
||||
import org.apache.maven.model.Plugin;
|
||||
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
|
||||
import org.apache.maven.plugin.descriptor.MojoDescriptor;
|
||||
|
|
@ -47,7 +33,6 @@ import org.apache.maven.plugins.annotations.Execute;
|
|||
import org.apache.maven.plugins.annotations.LifecyclePhase;
|
||||
import org.apache.maven.plugins.annotations.Mojo;
|
||||
import org.apache.maven.plugins.annotations.Parameter;
|
||||
import org.apache.maven.plugins.plugin.descriptor.MNG6109PluginDescriptorBuilder;
|
||||
import org.apache.maven.project.MavenProject;
|
||||
import org.apache.maven.reporting.AbstractMavenReport;
|
||||
import org.apache.maven.reporting.AbstractMavenReportRenderer;
|
||||
|
|
@ -65,6 +50,17 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
|
|||
import org.codehaus.plexus.util.StringUtils;
|
||||
import org.codehaus.plexus.util.xml.Xpp3Dom;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Generates the Plugin's documentation report: <code>plugin-info.html</code> plugin overview page,
|
||||
* and one <code><i>goal</i>-mojo.html</code> per goal.
|
||||
|
|
@ -190,12 +186,6 @@ public class PluginReport
|
|||
*/
|
||||
@Parameter( defaultValue = "${localRepository}", required = true, readonly = true )
|
||||
protected ArtifactRepository local;
|
||||
|
||||
/**
|
||||
* @since 3.5.1
|
||||
*/
|
||||
@Component
|
||||
private RuntimeInformation rtInfo;
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
|
|
@ -260,8 +250,7 @@ public class PluginReport
|
|||
private PluginDescriptor extractPluginDescriptor()
|
||||
throws MavenReportException
|
||||
{
|
||||
PluginDescriptorBuilder builder = getPluginDescriptorBuilder();
|
||||
|
||||
PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
|
||||
try
|
||||
{
|
||||
return builder.build( new FileReader( new File( project.getBuild().getOutputDirectory(),
|
||||
|
|
@ -330,38 +319,6 @@ public class PluginReport
|
|||
return pluginDescriptor;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the pluginDescriptorBuilder to use based on the Maven version: either use the original from the
|
||||
* maven-plugin-api or a patched version for Maven versions before the MNG-6109 fix
|
||||
* (because of Maven MNG-6109 bug that won't give accurate 'since' info when reading plugin.xml).
|
||||
*
|
||||
* @return the proper pluginDescriptorBuilder
|
||||
* @see https://issues.apache.org/jira/browse/MNG-6109
|
||||
* @see https://issues.apache.org/jira/browse/MPLUGIN-319
|
||||
*/
|
||||
private PluginDescriptorBuilder getPluginDescriptorBuilder()
|
||||
{
|
||||
PluginDescriptorBuilder pluginDescriptorBuilder;
|
||||
try
|
||||
{
|
||||
VersionRange versionRange = VersionRange.createFromVersionSpec( "(3.3.9,)" );
|
||||
if ( versionRange.containsVersion( rtInfo.getApplicationVersion() ) )
|
||||
{
|
||||
pluginDescriptorBuilder = new PluginDescriptorBuilder();
|
||||
}
|
||||
else
|
||||
{
|
||||
pluginDescriptorBuilder = new MNG6109PluginDescriptorBuilder();
|
||||
}
|
||||
}
|
||||
catch ( InvalidVersionSpecificationException e )
|
||||
{
|
||||
return new MNG6109PluginDescriptorBuilder();
|
||||
}
|
||||
|
||||
return pluginDescriptorBuilder;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
package org.apache.maven.plugins.plugin.descriptor;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import org.apache.maven.plugin.descriptor.MojoDescriptor;
|
||||
import org.apache.maven.plugin.descriptor.Parameter;
|
||||
import org.apache.maven.plugin.descriptor.PluginDescriptor;
|
||||
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
|
||||
import org.codehaus.plexus.configuration.PlexusConfiguration;
|
||||
import org.codehaus.plexus.configuration.PlexusConfigurationException;
|
||||
|
||||
/**
|
||||
* Reads the plugin descriptor and adds the fix for MNG-6109 when using Maven-3.3.9 and before.
|
||||
* Class can be removed once Maven 3.5.0 is the prerequisite for this plugin.
|
||||
*
|
||||
* @author Robert Scholte
|
||||
* @since 3.5.1
|
||||
*/
|
||||
public class MNG6109PluginDescriptorBuilder extends PluginDescriptorBuilder
|
||||
{
|
||||
|
||||
@Override
|
||||
public MojoDescriptor buildComponentDescriptor( PlexusConfiguration c, PluginDescriptor pluginDescriptor )
|
||||
throws PlexusConfigurationException
|
||||
{
|
||||
MojoDescriptor mojoDescriptor = super.buildComponentDescriptor( c, pluginDescriptor );
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// Parameters
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
PlexusConfiguration[] parameterConfigurations = c.getChild( "parameters" ).getChildren( "parameter" );
|
||||
|
||||
for ( PlexusConfiguration d : parameterConfigurations )
|
||||
{
|
||||
String parameterName = d.getChild( "name" ).getValue();
|
||||
Parameter pd = (Parameter) mojoDescriptor.getParameterMap().get( parameterName );
|
||||
|
||||
String parameterSince = d.getChild( "since" ).getValue();
|
||||
pd.setSince( parameterSince );
|
||||
}
|
||||
|
||||
return mojoDescriptor;
|
||||
}
|
||||
}
|
||||
|
|
@ -94,7 +94,7 @@ Using Plugin Tools Java5 Annotations
|
|||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-annotations</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<optional>true</optional> <!-- annotations are not used at runtime because @Retention(value=CLASS), they are needed only to build the plugin -->
|
||||
<scope>provided</scope><!-- annotations are needed only to build the plugin -->
|
||||
</dependency>
|
||||
</dependencies>
|
||||
...
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ under the License.
|
|||
<href>http://maven.apache.org/</href>
|
||||
</bannerLeft>
|
||||
<bannerRight>
|
||||
<src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
|
||||
<src>http://maven.apache.org/images/maventxt_logo_200.gif</src>
|
||||
</bannerRight>
|
||||
|
||||
<skin>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-annotations</artifactId>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ public class TestAnnotationsReader
|
|||
MojoAnnotationsScanner mojoAnnotationsScanner = (MojoAnnotationsScanner) lookup( MojoAnnotationsScanner.ROLE );
|
||||
|
||||
MojoAnnotationsScannerRequest request = new MojoAnnotationsScannerRequest();
|
||||
request.setClassesDirectories( Collections.singletonList( new File( getBasedir(), "target/test-classes" ) ) );
|
||||
request.setClassesDirectories( Collections.singletonList( new File( "target/test-classes" ) ) );
|
||||
request.setIncludePatterns( Arrays.asList( "**/FooMojo.class" ) );
|
||||
request.setProject( new MavenProject() );
|
||||
|
||||
|
|
|
|||
|
|
@ -23,17 +23,17 @@ import static org.easymock.EasyMock.*;
|
|||
|
||||
import java.io.File;
|
||||
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
import org.codehaus.plexus.logging.Logger;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class DefaultMojoAnnotationsScannerTest
|
||||
extends PlexusTestCase
|
||||
extends TestCase
|
||||
{
|
||||
private DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner();
|
||||
|
||||
public void testSkipModuleInfoClassInArchive() throws Exception
|
||||
{
|
||||
scanner.scanArchive( new File( getBasedir(), "target/test-classes/java9-module.jar"), null, false );
|
||||
scanner.scanArchive( new File( "src/test/resources/java9-module.jar"), null, false );
|
||||
}
|
||||
|
||||
public void testJava8Annotations() throws Exception
|
||||
|
|
@ -42,7 +42,7 @@ public class DefaultMojoAnnotationsScannerTest
|
|||
expect( logger.isDebugEnabled() ).andReturn( false );
|
||||
replay( logger );
|
||||
scanner.enableLogging( logger );
|
||||
scanner.scanArchive( new File( getBasedir(), "target/test-classes/java8-annotations.jar"), null, false );
|
||||
scanner.scanArchive( new File( "src/test/resources/java8-annotations.jar"), null, false );
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-api</artifactId>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-generators</artifactId>
|
||||
|
|
|
|||
|
|
@ -473,9 +473,9 @@ public class PluginXdocGenerator
|
|||
{
|
||||
Parameter parameter = parameters.next();
|
||||
|
||||
w.startElement( "h4" );
|
||||
w.startElement( "p" );
|
||||
w.writeMarkup( format( "pluginxdoc.mojodescriptor.parameter.name_internal", parameter.getName() ) );
|
||||
w.endElement();
|
||||
w.endElement(); //p
|
||||
|
||||
if ( StringUtils.isNotEmpty( parameter.getDeprecated() ) )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ public class HelpMojo
|
|||
* @param indentSize The size of each indentation, must not be negative.
|
||||
* @param lineLength The length of the line, must not be negative.
|
||||
* @return The sequence of display lines, never <code>null</code>.
|
||||
* @throws NegativeArraySizeException if <code>indent < 0</code>
|
||||
* @throws NegativeArraySizeException if <code>indent < 0</code>
|
||||
*/
|
||||
private static List<String> toLines( String text, int indent, int indentSize, int lineLength )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ pluginxdoc.mojodescriptor.inheritedByDefault=Is NOT inherited by default in mult
|
|||
pluginxdoc.mojodescriptor.parameter.details=Parameter Details
|
||||
pluginxdoc.mojodescriptor.parameter.deprecated=<strong>Deprecated.</strong> {0}
|
||||
pluginxdoc.mojodescriptor.parameter.name=Name
|
||||
pluginxdoc.mojodescriptor.parameter.name_link=<code><a href="#{0}"><{0}></a></code>
|
||||
pluginxdoc.mojodescriptor.parameter.name_internal=<strong><a name="{0}"><{0}></a></strong>
|
||||
pluginxdoc.mojodescriptor.parameter.name_link=<strong><a href="#{0}">{0}</a></strong>
|
||||
pluginxdoc.mojodescriptor.parameter.name_internal=<strong><a name="{0}">{0}</a>:</strong>
|
||||
pluginxdoc.mojodescriptor.parameter.description=Description
|
||||
pluginxdoc.mojodescriptor.parameter.type=Type
|
||||
pluginxdoc.mojodescriptor.parameter.since=Since
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ pluginxdoc.mojodescriptor.inheritedByDefault=N'est PAS h\u00e9rit\u00e9 par d\u0
|
|||
pluginxdoc.mojodescriptor.parameter.details=D\u00e9tails des param\u00e8tres
|
||||
pluginxdoc.mojodescriptor.parameter.deprecated=<strong>Obsol\u00e8te.</strong> {0}
|
||||
pluginxdoc.mojodescriptor.parameter.name=Nom
|
||||
pluginxdoc.mojodescriptor.parameter.name_internal=<strong><a name="{0}">{0}</a> :</strong>
|
||||
pluginxdoc.mojodescriptor.parameter.description=Description
|
||||
pluginxdoc.mojodescriptor.parameter.type=Type
|
||||
pluginxdoc.mojodescriptor.parameter.since=Depuis
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-java</artifactId>
|
||||
|
|
|
|||
|
|
@ -233,28 +233,4 @@ public class JavaMojoDescriptorExtractorTest
|
|||
assertEquals( 1, results.size() );
|
||||
}
|
||||
|
||||
public void testSingleTypeImportWithFullyQualifiedClassName()
|
||||
throws Exception
|
||||
{
|
||||
List<MojoDescriptor> results = extract( "MPLUGIN-314" );
|
||||
|
||||
assertEquals( 1, results.size() );
|
||||
}
|
||||
|
||||
public void testMethodReferenceInEnumConstructor()
|
||||
throws Exception
|
||||
{
|
||||
List<MojoDescriptor> results = extract( "MPLUGIN-320" );
|
||||
|
||||
assertNull( results );
|
||||
}
|
||||
|
||||
public void testEnumWithRegexPattern()
|
||||
throws Exception
|
||||
{
|
||||
List<MojoDescriptor> results = extract( "MPLUGIN-290" );
|
||||
|
||||
assertNull( results );
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public enum Test
|
||||
{
|
||||
|
||||
Test( Pattern.compile( "a" ) );
|
||||
|
||||
private Test( Pattern p )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?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.
|
||||
-->
|
||||
|
||||
<plugin>
|
||||
<name></name>
|
||||
<description></description>
|
||||
<groupId></groupId>
|
||||
<artifactId></artifactId>
|
||||
<version></version>
|
||||
<goalPrefix>test</goalPrefix>
|
||||
<isolatedRealm>false</isolatedRealm>
|
||||
<inheritedByDefault>true</inheritedByDefault>
|
||||
<mojos/>
|
||||
<dependencies/>
|
||||
</plugin>
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import org.apache.maven.artifact.resolver.ArtifactResolver;
|
||||
import org.apache.maven.plugin.AbstractMojo;
|
||||
|
||||
/**
|
||||
* Tests that using an import and the same fully qualified class name results in a correct requirement role generated.
|
||||
*
|
||||
* @goal test
|
||||
*/
|
||||
public class MyMojo
|
||||
extends AbstractMojo
|
||||
{
|
||||
|
||||
/**
|
||||
* @component
|
||||
*/
|
||||
private org.apache.maven.artifact.resolver.ArtifactResolver resolver;
|
||||
|
||||
public void execute()
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
<?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.
|
||||
-->
|
||||
|
||||
<plugin>
|
||||
<name></name>
|
||||
<description></description>
|
||||
<groupId></groupId>
|
||||
<artifactId></artifactId>
|
||||
<version></version>
|
||||
<goalPrefix>test</goalPrefix>
|
||||
<isolatedRealm>false</isolatedRealm>
|
||||
<inheritedByDefault>true</inheritedByDefault>
|
||||
<mojos>
|
||||
<mojo>
|
||||
<goal>test</goal>
|
||||
<description>Tests that using an import and the same fully qualified class name results in a correct requirement role generated.</description>
|
||||
<requiresDirectInvocation>false</requiresDirectInvocation>
|
||||
<requiresProject>true</requiresProject>
|
||||
<requiresReports>false</requiresReports>
|
||||
<aggregator>false</aggregator>
|
||||
<requiresOnline>false</requiresOnline>
|
||||
<inheritedByDefault>true</inheritedByDefault>
|
||||
<implementation>MyMojo</implementation>
|
||||
<language>java</language>
|
||||
<instantiationStrategy>per-lookup</instantiationStrategy>
|
||||
<executionStrategy>once-per-session</executionStrategy>
|
||||
<threadSafe>false</threadSafe>
|
||||
<parameters/>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
|
||||
<field-name>resolver</field-name>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</mojo>
|
||||
</mojos>
|
||||
<dependencies/>
|
||||
</plugin>
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public enum Exceptions {
|
||||
NPE(NullPointerException::new),
|
||||
IAE(IllegalArgumentException::new);
|
||||
|
||||
private final Supplier<? extends Exception> supplier;
|
||||
|
||||
<T extends Exception> Exceptions(Supplier<T> supplier) {
|
||||
this.supplier = supplier;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?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.
|
||||
-->
|
||||
|
||||
<plugin>
|
||||
<name></name>
|
||||
<description></description>
|
||||
<groupId></groupId>
|
||||
<artifactId></artifactId>
|
||||
<version></version>
|
||||
<goalPrefix>test</goalPrefix>
|
||||
<isolatedRealm>false</isolatedRealm>
|
||||
<inheritedByDefault>true</inheritedByDefault>
|
||||
<mojos/>
|
||||
<dependencies/>
|
||||
</plugin>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-javadoc</artifactId>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-script</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-ant</artifactId>
|
||||
|
|
|
|||
|
|
@ -19,16 +19,6 @@ package org.apache.maven.tools.plugin.extractor.ant;
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import junit.framework.TestCase;
|
||||
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
|
||||
import org.apache.maven.plugin.descriptor.MojoDescriptor;
|
||||
import org.apache.maven.plugin.descriptor.Parameter;
|
||||
|
|
@ -39,6 +29,18 @@ import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
|
|||
import org.apache.maven.tools.plugin.PluginToolsRequest;
|
||||
import org.apache.maven.tools.plugin.extractor.ExtractionException;
|
||||
import org.codehaus.plexus.component.repository.ComponentRequirement;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.net.URL;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class AntMojoDescriptorExtractorTest
|
||||
extends TestCase
|
||||
|
|
@ -98,47 +100,39 @@ public class AntMojoDescriptorExtractorTest
|
|||
assertEquals( "Mojo descriptor: " + desc.getGoal() + " is missing 'PathTranslator' component requirement.", PathTranslator.class.getName(), req.getRole() );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private Map buildTestMap( String resourceDirName )
|
||||
{
|
||||
try
|
||||
Map result = new HashMap();
|
||||
|
||||
ClassLoader cloader = Thread.currentThread().getContextClassLoader();
|
||||
URL mojosXmlUrl = cloader.getResource( resourceDirName + "/test.mojos.xml" );
|
||||
|
||||
if ( mojosXmlUrl == null )
|
||||
{
|
||||
Map result = new HashMap();
|
||||
|
||||
ClassLoader cloader = Thread.currentThread().getContextClassLoader();
|
||||
URL mojosXmlUrl = cloader.getResource( resourceDirName + "/test.mojos.xml" );
|
||||
|
||||
if ( mojosXmlUrl == null )
|
||||
{
|
||||
fail( "No classpath resource named: '" + resourceDirName + "/test.mojos.xml' could be found." );
|
||||
}
|
||||
|
||||
// TODO As of JDK 7, replace with Paths.get( resource.toURI() ).toFile()
|
||||
File mojosXml = new File( mojosXmlUrl.toURI() );
|
||||
File dir = mojosXml.getParentFile();
|
||||
|
||||
Set scripts = new HashSet();
|
||||
String[] listing = dir.list();
|
||||
for ( int i = 0; listing != null && i < listing.length; i++ )
|
||||
{
|
||||
if ( listing[i].endsWith( ".mojos.xml" ) )
|
||||
{
|
||||
File f = new File( dir, listing[i] ).getAbsoluteFile();
|
||||
|
||||
scripts.add( f );
|
||||
}
|
||||
}
|
||||
|
||||
result.put( dir.getAbsolutePath(), scripts );
|
||||
|
||||
return result;
|
||||
fail( "No classpath resource named: '" + resourceDirName + "/test.mojos.xml' could be found." );
|
||||
}
|
||||
catch ( final URISyntaxException e )
|
||||
|
||||
File mojosXml = new File( StringUtils.replace( mojosXmlUrl.getPath(), "%20", " " ) );
|
||||
File dir = mojosXml.getParentFile();
|
||||
|
||||
Set scripts = new HashSet();
|
||||
String[] listing = dir.list();
|
||||
for ( int i = 0; listing != null && i < listing.length; i++ )
|
||||
{
|
||||
throw new AssertionError( e );
|
||||
if ( listing[i].endsWith( ".mojos.xml" ) )
|
||||
{
|
||||
File f = new File( dir, listing[i] ).getAbsoluteFile();
|
||||
|
||||
scripts.add( f );
|
||||
}
|
||||
}
|
||||
|
||||
result.put( dir.getAbsolutePath(), scripts );
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
// TODO
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-script</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-beanshell</artifactId>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-script</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin-tools-model</artifactId>
|
||||
|
|
|
|||
|
|
@ -78,9 +78,6 @@ public class PluginMetadataParser
|
|||
descriptors.add( descriptor );
|
||||
}
|
||||
}
|
||||
|
||||
reader.close();
|
||||
reader = null;
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,12 +19,16 @@ package org.apache.maven.tools.plugin.extractor.model;
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import org.apache.maven.plugin.descriptor.MojoDescriptor;
|
||||
import org.apache.maven.tools.plugin.extractor.model.PluginMetadataParseException;
|
||||
import org.apache.maven.tools.plugin.extractor.model.PluginMetadataParser;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.util.Set;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import org.apache.maven.plugin.descriptor.MojoDescriptor;
|
||||
|
||||
public class PluginMetadataParserTest
|
||||
extends TestCase
|
||||
|
|
@ -55,24 +59,16 @@ public class PluginMetadataParserTest
|
|||
assertTrue( desc.getImplementation().endsWith( ":test2" ) );
|
||||
assertEquals( "test2", desc.getGoal() );
|
||||
}
|
||||
|
||||
|
||||
private File getMetadataFile( String name )
|
||||
{
|
||||
try
|
||||
URL resource = Thread.currentThread().getContextClassLoader().getResource( name );
|
||||
if ( resource == null )
|
||||
{
|
||||
URL resource = Thread.currentThread().getContextClassLoader().getResource( name );
|
||||
if ( resource == null )
|
||||
{
|
||||
fail( "Cannot find classpath resource: '" + name + "'." );
|
||||
}
|
||||
|
||||
// TODO As of JDK 7, replace with Paths.get( resource.toURI() ).toFile()
|
||||
return new File( resource.toURI() );
|
||||
}
|
||||
catch ( final URISyntaxException e )
|
||||
{
|
||||
throw new AssertionError( e );
|
||||
fail( "Cannot find classpath resource: '" + name + "'." );
|
||||
}
|
||||
|
||||
return new File( StringUtils.replace( resource.getPath(), "%20", " " ) );
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ under the License.
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-script</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-script-ant</artifactId>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@ package org.apache.maven.script.ant;
|
|||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
import static org.easymock.EasyMock.createMock;
|
||||
import static org.easymock.EasyMock.expect;
|
||||
import static org.easymock.EasyMock.replay;
|
||||
import static org.easymock.EasyMock.verify;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
|
|
@ -25,14 +29,13 @@ import java.io.IOException;
|
|||
import java.io.InputStreamReader;
|
||||
import java.io.PrintStream;
|
||||
import java.io.Reader;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.apache.maven.artifact.Artifact;
|
||||
import org.apache.maven.execution.MavenSession;
|
||||
import org.apache.maven.model.Build;
|
||||
|
|
@ -56,10 +59,9 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
|
|||
import org.codehaus.plexus.logging.Logger;
|
||||
import org.codehaus.plexus.logging.console.ConsoleLogger;
|
||||
import org.codehaus.plexus.util.IOUtil;
|
||||
import static org.easymock.EasyMock.createMock;
|
||||
import static org.easymock.EasyMock.expect;
|
||||
import static org.easymock.EasyMock.replay;
|
||||
import static org.easymock.EasyMock.verify;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class AntMojoWrapperTest
|
||||
extends TestCase
|
||||
|
|
@ -67,7 +69,7 @@ public class AntMojoWrapperTest
|
|||
|
||||
public void test2xStylePlugin()
|
||||
throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
|
||||
ComponentConfigurationException, ArchiverException, URISyntaxException
|
||||
ComponentConfigurationException, ArchiverException
|
||||
{
|
||||
String pluginXml = "META-INF/maven/plugin-2.1.xml";
|
||||
|
||||
|
|
@ -87,7 +89,7 @@ public class AntMojoWrapperTest
|
|||
|
||||
public void test20StylePlugin()
|
||||
throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
|
||||
ComponentConfigurationException, ArchiverException, URISyntaxException
|
||||
ComponentConfigurationException, ArchiverException
|
||||
{
|
||||
String pluginXml = "META-INF/maven/plugin-2.0.xml";
|
||||
|
||||
|
|
@ -126,7 +128,7 @@ public class AntMojoWrapperTest
|
|||
|
||||
private List<String> run( String pluginXml, boolean includeImplied )
|
||||
throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
|
||||
ComponentConfigurationException, ArchiverException, URISyntaxException
|
||||
ComponentConfigurationException, ArchiverException
|
||||
{
|
||||
StackTraceElement stack = new Throwable().getStackTrace()[1];
|
||||
System.out.println( "\n\nRunning: " + stack.getMethodName() + "\n\n" );
|
||||
|
|
@ -144,8 +146,6 @@ public class AntMojoWrapperTest
|
|||
{
|
||||
reader = new InputStreamReader( resource.openStream() );
|
||||
pd = new PluginDescriptorBuilder().build( reader, pluginXml );
|
||||
reader.close();
|
||||
reader = null;
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
@ -168,8 +168,7 @@ public class AntMojoWrapperTest
|
|||
|
||||
if ( includeImplied )
|
||||
{
|
||||
// TODO As of JDK 7, replace with Paths.get( resource.toURI() ).toFile()
|
||||
File pluginXmlFile = new File( resource.toURI() );
|
||||
File pluginXmlFile = new File( StringUtils.replace( resource.getPath(), "%20", " " ) );
|
||||
|
||||
File jarFile = File.createTempFile( "AntMojoWrapperTest.", ".test.jar" );
|
||||
jarFile.deleteOnExit();
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ under the License.
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-script</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-script-beanshell</artifactId>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ under the License.
|
|||
<parent>
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-script</artifactId>
|
||||
|
|
|
|||
68
pom.xml
68
pom.xml
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||
<artifactId>maven-plugin-tools</artifactId>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
<version>3.5</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Maven Plugin Tools</name>
|
||||
|
|
@ -74,10 +74,9 @@
|
|||
</modules>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-plugin-tools.git</connection>
|
||||
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-plugin-tools.git</developerConnection>
|
||||
<url>https://github.com/apache/maven-plugin-tools/tree/${project.scm.tag}</url>
|
||||
<tag>HEAD</tag>
|
||||
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.5</connection>
|
||||
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.5</developerConnection>
|
||||
<url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-3.5</url>
|
||||
</scm>
|
||||
<issueManagement>
|
||||
<system>jira</system>
|
||||
|
|
@ -98,7 +97,7 @@
|
|||
<pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
|
||||
<mavenVersion>2.2.1</mavenVersion>
|
||||
<antVersion>1.7.1</antVersion>
|
||||
<mavenInvokerPluginVersion>3.0.1</mavenInvokerPluginVersion>
|
||||
<mavenInvokerPluginVersion>1.10</mavenInvokerPluginVersion>
|
||||
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
|
||||
</properties>
|
||||
|
||||
|
|
@ -215,7 +214,7 @@
|
|||
<dependency>
|
||||
<groupId>com.thoughtworks.qdox</groupId>
|
||||
<artifactId>qdox</artifactId>
|
||||
<version>2.0-M5</version>
|
||||
<version>2.0-M4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -399,34 +398,33 @@
|
|||
<activation>
|
||||
<jdk>[1.9,)</jdk>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>enforce-bytecode-version</id>
|
||||
<configuration>
|
||||
<rules>
|
||||
<enforceBytecodeVersion>
|
||||
<ignoreClasses>
|
||||
<ignoreClass>module-info</ignoreClass>
|
||||
</ignoreClasses>
|
||||
</enforceBytecodeVersion>
|
||||
</rules>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>extra-enforcer-rules</artifactId>
|
||||
<version>1.0-beta-5</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<!-- chicken-egg problem. Can only be built with Java9 once maven-plugin-plugin 3.5 is available -->
|
||||
<!-- <build> -->
|
||||
<!-- <plugins> -->
|
||||
<!-- <plugin> -->
|
||||
<!-- <artifactId>maven-enforcer-plugin</artifactId> -->
|
||||
<!-- <executions> -->
|
||||
<!-- <execution> -->
|
||||
<!-- <id>enforce-bytecode-version</id> -->
|
||||
<!-- <configuration> -->
|
||||
<!-- <rules> -->
|
||||
<!-- <enforceBytecodeVersion> -->
|
||||
<!-- <maxJdkVersion>1.9</maxJdkVersion> -->
|
||||
<!-- </enforceBytecodeVersion> -->
|
||||
<!-- </rules> -->
|
||||
<!-- </configuration> -->
|
||||
<!-- </execution> -->
|
||||
<!-- </executions> -->
|
||||
<!-- <dependencies> -->
|
||||
<!-- <dependency> -->
|
||||
<!-- <groupId>org.codehaus.mojo</groupId> -->
|
||||
<!-- <artifactId>extra-enforcer-rules</artifactId> -->
|
||||
<!-- <version>1.0-beta-5</version> -->
|
||||
<!-- </dependency> -->
|
||||
<!-- </dependencies> -->
|
||||
<!-- </plugin> -->
|
||||
<!-- </plugins> -->
|
||||
<!-- </build> -->
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ under the License.
|
|||
<href>https://maven.apache.org/</href>
|
||||
</bannerLeft>
|
||||
<bannerRight>
|
||||
<src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
|
||||
<src>https://maven.apache.org/images/maventxt_logo_200.gif</src>
|
||||
</bannerRight>
|
||||
|
||||
<skin>
|
||||
|
|
|
|||
Loading…
Reference in New Issue