Update of /cvsroot/squirrel-sql/mavenize/squirrelsql-plugins-parent-pom
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25781/squirrelsql-plugins-parent-pom
Modified Files:
pom.xml
Log Message:
maven plugins need versions (best practice for portable builds). Added scm connection information which is claimed to be needed by the maven release plugin for tagging. Also, added javadoc plugin activation by profile. Updated the template pom.
Index: pom.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/squirrelsql-plugins-parent-pom/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pom.xml 20 Sep 2009 00:12:33 -0000 1.9
--- pom.xml 26 Sep 2009 17:52:49 -0000 1.10
***************
*** 45,49 ****
<url>http://www.squirrelsql.org/</url>
<scm>
! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins</url>
</scm>
<issueManagement>
--- 45,51 ----
<url>http://www.squirrelsql.org/</url>
<scm>
! <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
! <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
! <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
</scm>
<issueManagement>
***************
*** 58,104 ****
<dependencies>
<dependency>
! <groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
! <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
! <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
! <version>3.1.0-SNAPSHOT</version>
! </dependency>
! <dependency>
! <groupId>junit</groupId>
! <artifactId>junit</artifactId>
! <version>4.6</version>
! <scope>test</scope>
! </dependency>
! <dependency>
! <groupId>org.easymock</groupId>
! <artifactId>easymock</artifactId>
! <version>2.4</version>
! <scope>test</scope>
! </dependency>
! <dependency>
! <groupId>org.easymock</groupId>
! <artifactId>easymockclassextension</artifactId>
! <version>2.4</version>
! <scope>test</scope>
</dependency>
<dependency>
! <groupId>gsbase</groupId>
! <artifactId>gsbase</artifactId>
! <version>2.0.1</version>
<scope>test</scope>
! </dependency>
<dependency>
! <groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
! <version>3.1.0-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
! <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
! <version>3.1.0-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
--- 60,89 ----
<dependencies>
<dependency>
! <groupId>${project.groupId}</groupId>
<artifactId>fw</artifactId>
! <version>${project.version}</version>
</dependency>
<dependency>
! <groupId>${project.groupId}</groupId>
<artifactId>squirrel-sql</artifactId>
! <version>${project.version}</version>
</dependency>
<dependency>
! <groupId>${project.groupId}</groupId>
! <artifactId>squirrelsql-test-utils</artifactId>
! <version>${project.version}</version>
! <type>pom</type>
<scope>test</scope>
! </dependency>
<dependency>
! <groupId>${project.groupId}</groupId>
<artifactId>fw</artifactId>
! <version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
! <groupId>${project.groupId}</groupId>
<artifactId>squirrel-sql</artifactId>
! <version>${project.version}</version>
<type>test-jar</type>
</dependency>
***************
*** 129,133 ****
<plugin>
<artifactId>maven-source-plugin</artifactId>
! <version>2.1</version>
<configuration>
<outputDirectory>target</outputDirectory>
--- 114,118 ----
<plugin>
<artifactId>maven-source-plugin</artifactId>
! <version>${source-plugin-version}</version>
<configuration>
<outputDirectory>target</outputDirectory>
***************
*** 155,158 ****
--- 140,144 ----
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <version>${jar-plugin-version}</version>
<configuration>
<archive>
***************
*** 178,187 ****
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<dependencies>
<dependency>
! <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
! <version>3.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
--- 164,189 ----
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${assembly-plugin-version}</version>
<dependencies>
<dependency>
! <groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
! <version>${project.version}</version>
</dependency>
</dependencies>
***************
*** 206,209 ****
--- 208,212 ----
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
+ <version>${gpg-plugin-version}</version>
<executions>
<execution>
***************
*** 233,247 ****
</configuration>
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- <configuration>
- </configuration>
- </plugin>
- </plugins>
</build>
<reporting>
--- 236,248 ----
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle-plugin-version}</version>
+ <configuration>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<reporting>
|
