|
From: <man...@us...> - 2010-11-20 02:10:50
|
Revision: 5974
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5974&view=rev
Author: manningr
Date: 2010-11-20 02:10:44 +0000 (Sat, 20 Nov 2010)
Log Message:
-----------
Refactored poms to prepare for release of "thread-safe" mojos. Fixed scm links and removed groupId and versionId in child poms to let them inherit from parent, which is a best practice. Also, you latest versions of maven plugins to support parallel build option.
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-11-20 02:08:52 UTC (rev 5973)
+++ trunk/maven-plugin-workspace/pom.xml 2010-11-20 02:10:44 UTC (rev 5974)
@@ -1,20 +1,20 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>3</version>
- </parent>
-
+ </parent>
+
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
<version>1.0.4-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
- A place to collect and release maven plugins required or building various SQuirreL
- projects with Maven.
+ A place to collect and release maven plugins required or building various SQuirreL projects with Maven.
</description>
<inceptionYear>2001</inceptionYear>
<developers>
@@ -59,14 +59,61 @@
<module>squirrelsql-version-plugin</module>
</modules>
<properties>
- <compiler-plugin-version>2.0.2</compiler-plugin-version>
- <gpg-plugin-version>1.0</gpg-plugin-version>
+ <compiler-plugin-version>2.3.2</compiler-plugin-version>
+ <gpg-plugin-version>1.1</gpg-plugin-version>
<javac-source-version>1.6</javac-source-version>
<javac-target-version>1.6</javac-target-version>
<maven-plugin-api-version>2.0</maven-plugin-api-version>
<maven-project-version>2.0.2</maven-project-version>
<maven-settings-version>2.0.2</maven-settings-version>
+ <plugin-plugin-version>2.6</plugin-plugin-version>
+ <surefire-plugin-version>2.6</surefire-plugin-version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-plugin-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven-project-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${maven-settings-version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${compiler-plugin-version}</version>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+ <source>${javac-source-version}</source>
+ <target>${javac-target-version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${plugin-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
<id>sign-jar</id>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-11-20 02:08:52 UTC (rev 5973)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-11-20 02:10:44 UTC (rev 5974)
@@ -7,18 +7,16 @@
<version>1.0.4-SNAPSHOT</version>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-update-site-plugin</artifactId>
- <version>1.0.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>SQuirreLSQL Update Site Maven Mojo</name>
<description>
- This project produces the Mojo that can build a proper release.xml for the
- SQuirreLSQL update site, given a directory where the updated jar artifacts are located.
- This plugin accepts a directory in it's configuration and expects to find three sub-directories
- there : core, plugins and i18n. It then categorizes the artifacts found in those directories
- accordingly in the final release.xml file, that is generated in the specified folder.
+ This project produces the Mojo that can build a proper release.xml for the SQuirreLSQL update site,
+ given a directory where the updated jar artifacts are located. This plugin accepts a directory in
+ it's configuration and expects to find three sub-directories there : core, plugins and i18n. It then
+ categorizes the artifacts found in those directories accordingly in the final release.xml file, that
+ is generated in the specified folder.
</description>
<inceptionYear>2001</inceptionYear>
@@ -47,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
@@ -69,7 +67,6 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven-plugin-api-version}</version>
</dependency>
</dependencies>
@@ -78,12 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler-plugin-version}</version>
- <configuration>
- <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
- <source>${javac-source-version}</source>
- <target>${javac-target-version}</target>
- </configuration>
</plugin>
</plugins>
</build>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-11-20 02:08:52 UTC (rev 5973)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-11-20 02:10:44 UTC (rev 5974)
@@ -5,10 +5,10 @@
<artifactId>maven-plugin-workspace</artifactId>
<version>1.0.4-SNAPSHOT</version>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
+
<artifactId>squirrelsql-version-plugin</artifactId>
- <version>1.0.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
+
<name>SQuirreLSQL Version Maven Mojo</name>
<description>
This project produces a maven mojo that can set the System property "squirrelsql.version" so that
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.2</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
@@ -61,17 +61,14 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven-plugin-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${maven-project-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>${maven-settings-version}</version>
</dependency>
</dependencies>
<build>
@@ -79,12 +76,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler-plugin-version}</version>
- <configuration>
- <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
- <source>${javac-source-version}</source>
- <target>${javac-target-version}</target>
- </configuration>
</plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
