creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joc...@apache.org
Subject svn commit: r1706450 - in /creadur/rat/branches/0.12-release/apache-rat-plugin: pom.xml pom.xml.next src/it/it1/pom.xml src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
Date Fri, 02 Oct 2015 17:09:47 GMT
Author: jochen
Date: Fri Oct  2 17:09:46 2015
New Revision: 1706450

URL: http://svn.apache.org/viewvc?rev=1706450&view=rev
Log:
Preparing 0.12 release: Fixing minor test problems.

Added:
    creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml.next
Modified:
    creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml
    creadur/rat/branches/0.12-release/apache-rat-plugin/src/it/it1/pom.xml
    creadur/rat/branches/0.12-release/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java

Modified: creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml?rev=1706450&r1=1706449&r2=1706450&view=diff
==============================================================================
--- creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml (original)
+++ creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml Fri Oct  2 17:09:46 2015
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>apache-rat-project</artifactId>
     <groupId>org.apache.rat</groupId>
-    <version>0.12-SNAPSHOT</version>
+    <version>0.12</version>
   </parent>
   <artifactId>apache-rat-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -116,7 +116,7 @@
         						</goals>
         					</pluginExecutionFilter>
         					<action>
-        						<ignore></ignore>
+        						<ignore />
         					</action>
         				</pluginExecution>
         			</pluginExecutions>
@@ -301,4 +301,10 @@
     </profile>
   </profiles>
 -->
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/creadur/rat/tags/0.13-SNAPSHOT</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/creadur/rat/tags/0.13-SNAPSHOT</developerConnection>
+    <url>http://svn.apache.org/repos/asf/creadur/rat/tags/0.13-SNAPSHOT</url>
+  </scm>
 </project>

Added: creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml.next
URL: http://svn.apache.org/viewvc/creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml.next?rev=1706450&view=auto
==============================================================================
--- creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml.next (added)
+++ creadur/rat/branches/0.12-release/apache-rat-plugin/pom.xml.next Fri Oct  2 17:09:46 2015
@@ -0,0 +1,304 @@
+<?xml version="1.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.
+-->
+<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>
+  <parent>
+    <artifactId>apache-rat-project</artifactId>
+    <groupId>org.apache.rat</groupId>
+    <version>0.13-SNAPSHOT</version>
+  </parent>
+  <artifactId>apache-rat-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>Apache Creadur Rat::Plugin4Maven</name>
+  <description>A plugin for Apache Maven that runs Apache Rat
+   to audit the source to be distributed.</description>
+  <inceptionYear>2007</inceptionYear>
+  <prerequisites>
+    <maven>${mavenVersion}</maven>
+  </prerequisites>
+  <properties>
+    <currentVersion>${project.version}</currentVersion>
+    <doxiaVersion>1.6</doxiaVersion>
+    <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
+  </properties>
+  <build>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filtered-resources</directory>
+      </resource>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>RELEASE_NOTES.txt</include>
+        </includes>
+      </resource>
+    </resources>
+    <pluginManagement>
+      <plugins>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <configuration>
+            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+          </configuration>
+          <executions>
+            <execution>
+              <id>mojo-descriptor</id>
+              <goals>
+                <goal>descriptor</goal>
+              </goals>
+            </execution>
+            <!-- to generate help goal -->
+            <execution>
+              <id>help-goal</id>
+              <goals>
+                <goal>helpmojo</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <!-- These files does not have license headers because they are used to
test license headers -->
+              <exclude>src/it/it1/src.apt</exclude>
+              <exclude>src/test/resources/unit/it2/src.txt</exclude>
+              <exclude>src/test/resources/unit/it3/src.apt</exclude>
+              <exclude>**/*.iml</exclude>
+              <!-- RAT-171: needs to be added since SCM ignores are only parsed in project
root -->
+              <exclude>**/.bzrignore</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It
has no influence on the Maven build itself.-->
+        <plugin>
+        	<groupId>org.eclipse.m2e</groupId>
+        	<artifactId>lifecycle-mapping</artifactId>
+        	<version>1.0.0</version>
+        	<configuration>
+        		<lifecycleMappingMetadata>
+        			<pluginExecutions>
+        				<pluginExecution>
+        					<pluginExecutionFilter>
+        						<groupId>
+        							org.apache.maven.plugins
+        						</groupId>
+        						<artifactId>
+        							maven-plugin-plugin
+        						</artifactId>
+        						<versionRange>[3.4,)</versionRange>
+        						<goals>
+        							<goal>descriptor</goal>
+        							<goal>helpmojo</goal>
+        						</goals>
+        					</pluginExecutionFilter>
+        					<action>
+        						<ignore />
+        					</action>
+        				</pluginExecution>
+        			</pluginExecutions>
+        		</lifecycleMappingMetadata>
+        	</configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <version>1.10</version>
+        <configuration>
+          <projectsDirectory>src/it</projectsDirectory>
+          <cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
+          <pomIncludes>
+            <pomInclude>*/pom.xml</pomInclude>
+          </pomIncludes>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <postBuildHookScript>verify</postBuildHookScript>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.rat</groupId>
+      <artifactId>apache-rat-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>${mavenPluginPluginVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>${doxiaVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+      <version>${doxiaSitetoolsVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>${doxiaSitetoolsVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.0.21</version>
+    </dependency>
+  </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>${mavenPluginPluginVersion}</version>
+      </plugin>
+    </plugins>
+  </reporting>
+  <developers>
+    <developer>
+      <id>jochen</id>
+      <name>Jochen Wiedmann</name>
+      <email>jochen.wiedmann@gmail.com</email>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Bernd Bohmann</name>
+      <email>bommel@apache.org</email>
+    </contributor>
+    <contributor>
+      <name>Lars Trieloff</name>
+      <email>lars@trieloff.net</email>
+    </contributor>
+    <contributor>
+      <name>Jukka Zitting</name>
+      <email>jukka@apache.org</email>
+    </contributor>
+  </contributors>
+  <!--
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-docck-plugin</artifactId>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>check</goal>
+                  </goals>
+                </execution>
+              </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+-->
+</project>

Modified: creadur/rat/branches/0.12-release/apache-rat-plugin/src/it/it1/pom.xml
URL: http://svn.apache.org/viewvc/creadur/rat/branches/0.12-release/apache-rat-plugin/src/it/it1/pom.xml?rev=1706450&r1=1706449&r2=1706450&view=diff
==============================================================================
--- creadur/rat/branches/0.12-release/apache-rat-plugin/src/it/it1/pom.xml (original)
+++ creadur/rat/branches/0.12-release/apache-rat-plugin/src/it/it1/pom.xml Fri Oct  2 17:09:46
2015
@@ -35,7 +35,7 @@
               <licenseFamilyCategory>YAL__</licenseFamilyCategory>
               <licenseFamilyName>Yet Another Software License</licenseFamilyName>
               <notes></notes>
-              <patterns>
+ss              <patterns>
                 <pattern>Yet Another License</pattern>
               </patterns>
             </license>

Modified: creadur/rat/branches/0.12-release/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
URL: http://svn.apache.org/viewvc/creadur/rat/branches/0.12-release/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java?rev=1706450&r1=1706449&r2=1706450&view=diff
==============================================================================
--- creadur/rat/branches/0.12-release/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
(original)
+++ creadur/rat/branches/0.12-release/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java
Fri Oct  2 17:09:46 2015
@@ -66,8 +66,14 @@ public class RatCheckMojoTest extends Ab
         final File testBaseDir = getSourceDirectory(getBasedir(), pDir,
                 pCreateCopy, baseDir);
         File testPom = new File(testBaseDir, "pom.xml");
-        AbstractRatMojo mojo = (AbstractRatMojo) lookupMojo(pGoal, testPom);
-        assertNotNull(mojo);
+        AbstractRatMojo mojo;
+        if ("check".equals(pGoal)) {
+            mojo = new RatCheckMojo();
+        } else {
+            throw new IllegalStateException("Invalid goal: " + pGoal);
+        }
+        configureMojo(mojo, "apache-rat-plugin", testPom);
+        
         final File buildDirectory = new File(new File(baseDir, "target/test"),
                 pDir);
         setVariableValueToObject(mojo, "basedir", testBaseDir);



Mime
View raw message