You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/09/26 23:21:05 UTC
svn commit: r1526701 - in /maven/plugins/trunk/maven-site-plugin/src:
it/MSITE-665/ it/MSITE-665/src/ it/MSITE-665/src/main/
it/MSITE-665/src/main/java/ it/MSITE-665/src/main/java/my/
it/MSITE-665/src/main/java/my/group/ it/MSITE-665/src/main/java/my/g...
Author: rfscholte
Date: Thu Sep 26 21:21:05 2013
New Revision: 1526701
URL: http://svn.apache.org/r1526701
Log:
[MSITE-665] Site plugin version 3.2 seems to modify a project's classpath. Workaround for MPLUGIN-253
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/id/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/id/App.java
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/id/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/id/AppTest.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/invoker.properties?rev=1526701&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/invoker.properties (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/invoker.properties Thu Sep 26 21:21:05 2013
@@ -0,0 +1,18 @@
+# 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 package
\ No newline at end of file
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml?rev=1526701&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml Thu Sep 26 21:21:05 2013
@@ -0,0 +1,92 @@
+<?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>MSITE-665</groupId>
+ <artifactId>MSITE-665</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>MSITE-665</name>
+ <url>http://maven.apache.org/sub-directory</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.5.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/id/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/id/App.java?rev=1526701&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/id/App.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/main/java/my/group/id/App.java Thu Sep 26 21:21:05 2013
@@ -0,0 +1,29 @@
+package my.group.id;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ */
+public class App {
+ public static void main( String[] args ) {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/id/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/id/AppTest.java?rev=1526701&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/id/AppTest.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/src/test/java/my/group/id/AppTest.java Thu Sep 26 21:21:05 2013
@@ -0,0 +1,37 @@
+package my.group.id;
+
+/*
+ * 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.junit.*;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.matchers.JUnitMatchers.*;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest {
+
+ @Test
+ public void testApp() {
+ assertTrue( true );
+ }
+}
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java?rev=1526701&r1=1526700&r2=1526701&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java Thu Sep 26 21:21:05 2013
@@ -31,8 +31,8 @@ import org.apache.maven.plugins.annotati
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.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
-
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -45,7 +45,8 @@ import org.codehaus.plexus.archiver.jar.
* @version $Id$
* @since 2.0-beta-6
*/
-@Mojo( name = "jar", defaultPhase = LifecyclePhase.PACKAGE, requiresReports = true )
+// MSITE-665: requiresDependencyResolution workaround for MPLUGIN-253
+@Mojo( name = "jar", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.TEST )
public class SiteJarMojo
extends SiteMojo
{