You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by jo...@apache.org on 2010/06/15 08:05:43 UTC
svn commit: r954718 - in /incubator/rat/main/trunk: apache-rat-core/pom.xml
apache-rat-plugin/pom.xml pom.xml
Author: jochen
Date: Tue Jun 15 06:05:43 2010
New Revision: 954718
URL: http://svn.apache.org/viewvc?rev=954718&view=rev
Log:
Preparing release of 0.7.
Modified:
incubator/rat/main/trunk/apache-rat-core/pom.xml
incubator/rat/main/trunk/apache-rat-plugin/pom.xml
incubator/rat/main/trunk/pom.xml
Modified: incubator/rat/main/trunk/apache-rat-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/pom.xml?rev=954718&r1=954717&r2=954718&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat-core/pom.xml Tue Jun 15 06:05:43 2010
@@ -53,31 +53,26 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/rat/main/trunk/apache-rat-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/pom.xml?rev=954718&r1=954717&r2=954718&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/pom.xml (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/pom.xml Tue Jun 15 06:05:43 2010
@@ -54,19 +54,6 @@
</includes>
</resource>
</resources>
-<!--
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/it2/src.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- -->
</build>
<dependencies>
@@ -113,12 +100,6 @@
<reporting>
<plugins>
-<!--
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -179,7 +160,6 @@
<id>release</id>
<build>
<plugins>
-<!--
<plugin>
<artifactId>maven-docck-plugin</artifactId>
<executions>
@@ -190,25 +170,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>src/test/it2/src.txt</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
</plugins>
</build>
</profile>
Modified: incubator/rat/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/pom.xml?rev=954718&r1=954717&r2=954718&view=diff
==============================================================================
--- incubator/rat/main/trunk/pom.xml (original)
+++ incubator/rat/main/trunk/pom.xml Tue Jun 15 06:05:43 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-project</artifactId>
@@ -45,24 +45,34 @@ Note that binary compatibility is not ga
</prerequisites>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--
- Website properties allow local staging of the website
- during release operations. For example:
- <profiles>
- <profile>
- <id>main</id>
- <activation>
+ These properties are to allow deployment to another target than
+ the Apache repositories. The default settings are expected to
+ match the settings from the parent POM.
+
+ To override these properties, use something like the following
+ in your settings.xml:
+ <profiles>
+ <profile>
+ <activation>
<activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <rat.www>scp://localhost/www</rat.www>
- <rat.www.id>localhost</rat.www.id>
- ...
+ </activation>
+ <properties>
+ <rat.site.url>file:///C:/temp/my.rat.site</rat.site.url>
+ ...
+ </properties>
+ </profiles>
-->
- <rat.www>scp://people.apache.org/www/incubator.apache.org/rat/</rat.www>
- <rat.www.id>org.apache.rat.incubating</rat.www.id>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javadoc.version>2.6.1</javadoc.version>
+ <rat.site.url>scp://people.apache.org/www/incubator.apache.org/rat/</rat.site.url>
+ <rat.site.name>Apache RAT Website</rat.site.name>
+ <rat.site.id>org.apache.rat.incubating.site</rat.site.id>
+ <rat.releases.id>apache.releases.https</rat.releases.id>
+ <rat.releases.name>Apache Release Distribution Repository</rat.releases.name>
+ <rat.releases.url>https://repository.apache.org/service/local/staging/deploy/maven2</rat.releases.url>
+ <rat.snapshots.id>apache.snapshots.https</rat.snapshots.id>
+ <rat.snapshots.name>${distMgmtSnapshotsName}</rat.snapshots.name> <!-- Parent POM uses these properties -->
+ <rat.snapshots.url>${distMgmtSnapshotsUrl}</rat.snapshots.url>
</properties>
<dependencyManagement>
@@ -78,11 +88,21 @@ Note that binary compatibility is not ga
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
@@ -129,63 +149,54 @@ Note that binary compatibility is not ga
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
-<!--
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
--->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
<build>
-
<pluginManagement>
+ <!--
+ This section is typically used to configure the versions of
+ plugins that we use. Note, that we are inheriting from the
+ parent POM, so we only have to configure version numbers,
+ if ours is different.
+ -->
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -195,66 +206,17 @@ Note that binary compatibility is not ga
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
- <encoding>iso8859-1</encoding>
+ <encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
- <arguments>-Prelease</arguments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
</plugins>
</pluginManagement>
-
</build>
<issueManagement>
@@ -278,66 +240,66 @@ Note that binary compatibility is not ga
</mailingList>
</mailingLists>
<developers>
- <developer>
- <id>bodewig</id>
- <name>Stefan Bodewig</name>
- <email>bodewig@apache.org</email>
- </developer>
- <developer>
- <id>rdonkin</id>
- <name>Robert Burrell Donkin</name>
- <email>rdonkin@apache.org</email>
- </developer>
- <developer>
- <id>gnodet</id>
- <name>Guillaume Nodet</name>
- <email>gnodet@apache.org</email>
- </developer>
<developer>
- <id>pauls</id>
- <name>Karl Pauls</name>
- <email>pauls@apache.org</email>
+ <id>bodewig</id>
+ <name>Stefan Bodewig</name>
+ <email>bodewig@apache.org</email>
+ </developer>
+ <developer>
+ <id>rdonkin</id>
+ <name>Robert Burrell Donkin</name>
+ <email>rdonkin@apache.org</email>
+ </developer>
+ <developer>
+ <id>gnodet</id>
+ <name>Guillaume Nodet</name>
+ <email>gnodet@apache.org</email>
+ </developer>
+ <developer>
+ <id>pauls</id>
+ <name>Karl Pauls</name>
+ <email>pauls@apache.org</email>
+ </developer>
+ <developer>
+ <id>mriou</id>
+ <name>Matthieu Riou</name>
+ <email>mriou@apache.org</email>
+ </developer>
+ <developer>
+ <id>rooneg</id>
+ <name>Garrett Rooney</name>
+ <email>rooneg@apache.org</email>
+ </developer>
+ <developer>
+ <id>jochen</id>
+ <name>Jochen Wiedmann</name>
+ <email>jochen@apache.org</email>
+ </developer>
+ <developer>
+ <id>bayard</id>
+ <name>Henri Yandell</name>
+ <email>bayard@apache.org</email>
+ </developer>
+ <developer>
+ <id>gmcdonald</id>
+ <name>Gavin</name>
+ <email>gmcdonald@apache.org</email>
+ </developer>
+ <developer>
+ <id>brianf</id>
+ <name>Brian Fox</name>
+ <email>brianf@apache.org</email>
</developer>
- <developer>
- <id>rooneg</id>
- <name>Garrett Rooney</name>
- <email>rooneg@apache.org</email>
- </developer>
- <developer>
- <id>mriou</id>
- <name>Matthieu Riou</name>
- <email>mriou@apache.org</email>
- </developer>
- <developer>
- <id>jochen</id>
- <name>Jochen Wiedmann</name>
- <email>jochen@apache.org</email>
- </developer>
- <developer>
- <id>bayard</id>
- <name>Henri Yandell</name>
- <email>bayard@apache.org</email>
- </developer>
- <developer>
- <id>gmcdonald</id>
- <name>Gavin</name>
- <email>gmcdonald@apache.org</email>
- </developer>
- <developer>
- <id>brianf</id>
- <name>Brian Fox</name>
- <email>brianf@apache.org</email>
- </developer>
</developers>
<contributors>
- <contributor>
- <name>Jukka Zitting</name>
- <email>jukka@apache.org</email>
- </contributor>
- <contributor>
- <name>Todd Volkert</name>
- <email>tvolkert+apache@gmail.com</email>
- </contributor>
+ <contributor>
+ <name>Jukka Zitting</name>
+ <email>jukka@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Todd Volkert</name>
+ <email>tvolkert+apache@gmail.com</email>
+ </contributor>
</contributors>
<scm>
@@ -348,20 +310,21 @@ Note that binary compatibility is not ga
<distributionManagement>
<site>
- <id>${rat.www.id}</id>
+ <id>${rat.site.id}</id>
<name>Apache RAT Website</name>
<url>${rat.www}</url>
- </site>
+ </site>
- <repository>
- <id>opencast</id>
- <name>Apache Release Distribution Repository</name>
- <url>http://repository.opencastproject.org/nexus/content/repositories/releases/</url>
+ <repository>
+ <id>${rat.releases.id}</id>
+ <name>${rat.releases.name}</name>
+ <url>${rat.releases.url}</url>
</repository>
+
<snapshotRepository>
- <id>opencast</id>
- <name>Apache Development Snapshot Repository</name>
- <url>http://repository.opencastproject.org/nexus/content/repositories/snapshots/</url>
+ <id>${rat.snapshots.id}</id>
+ <name>${rat.snapshots.name}</name>
+ <url>${rat.snapshots.url}</url>
</snapshotRepository>
</distributionManagement>
@@ -371,90 +334,4 @@ Note that binary compatibility is not ga
<module>apache-rat-tasks</module>
<module>apache-rat</module>
</modules>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <!-- We want to sign the artifact, the POM, and all attached artifacts -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <configuration>
- <passphrase>${gpg.passphrase}</passphrase>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- We want to deploy the artifact to a staging location for perusal -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>create-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- <goal>jar</goal>
- </goals>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>