|
From: <man...@us...> - 2011-03-08 03:22:16
|
Revision: 6180
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6180&view=rev
Author: manningr
Date: 2011-03-08 03:22:07 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Made the rpm build dependent on whether or not /usr/bin/rpmbuild is available.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-03-08 03:06:23 UTC (rev 6179)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-03-08 03:22:07 UTC (rev 6180)
@@ -1,4 +1,5 @@
-<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>
@@ -68,6 +69,13 @@
<artifactId>squirrelsql-update-site</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.5.3.0_1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>package</defaultGoal>
@@ -102,7 +110,7 @@
<plugin>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-dependency-plugin</artifactId>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -177,6 +185,20 @@
<outputDirectory>${staging.dir}/update-site</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-derby-driver-for-test</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/derby-driver</outputDirectory>
+ <includeGroupIds>org.apache.derby</includeGroupIds>
+ <includeArtifactIds>derby</includeArtifactIds>
+
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -218,7 +240,7 @@
<goals>
<goal>exec</goal>
</goals>
- <phase>integration-test</phase>
+ <phase>pre-integration-test</phase>
<configuration>
<executable>java</executable>
<arguments>
@@ -233,7 +255,7 @@
<goals>
<goal>exec</goal>
</goals>
- <phase>integration-test</phase>
+ <phase>pre-integration-test</phase>
<configuration>
<executable>java</executable>
<arguments>
@@ -248,7 +270,7 @@
<goals>
<goal>exec</goal>
</goals>
- <phase>integration-test</phase>
+ <phase>pre-integration-test</phase>
<configuration>
<executable>java</executable>
<arguments>
@@ -273,155 +295,168 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-1</version>
- <executions>
- <execution>
- <configuration>
- <name>squirrel-sql</name>
- <version>${squirrelsql.rpm.version}</version>
- <copyright>LGPL</copyright>
- <distribution>Red Hat Linux</distribution>
- <group>Development/Tools</group>
- <packager>Rob Manning <robert [DOT] m [DOT] manning [AT] gmail.com></packager>
- <prefix>/opt</prefix>
- <summary>A database front-end written in Java</summary>
- <url>http://squirrelsql.org</url>
- <requires>
- <require>java-1.6.0-openjdk</require>
- </requires>
- <mappings>
- <mapping>
- <!--
- The "/opt" prefix is necessary here. It is where we install by default, when the rpm is
- installed without being relocated.
- -->
- <directory>/opt/SQuirreLSQLClient/doc</directory>
- <filemode>777</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/doc</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient/icons</directory>
- <filemode>777</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/icons</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient/lib</directory>
- <filemode>777</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/lib</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient/plugins</directory>
- <filemode>777</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/plugins</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient</directory>
- <filemode>777</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.sh</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient/update</directory>
- <filemode>777</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/update</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient</directory>
- <filemode>666</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/log4j.properties</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient</directory>
- <filemode>666</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.jar</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/SQuirreLSQLClient</directory>
- <filemode>666</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>target/squirrel-sql-${squirrelsql.version}-base/update-log4j.properties</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- <postinstallScriptlet>
- <scriptFile>src/main/resources/postinstall.sh</scriptFile>
- <fileEncoding>utf-8</fileEncoding>
- </postinstallScriptlet>
- <postremoveScriptlet>
- <scriptFile>src/main/resources/postremove.sh</scriptFile>
- <fileEncoding>utf-8</fileEncoding>
- </postremoveScriptlet>
- <keyname>${gpg.keyname}</keyname>
- <keyPassphrase>
- <passphrase>${gpg.passphrase}</passphrase>
- </keyPassphrase>
- </configuration>
- <goals>
- <goal>rpm</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
<profile>
+ <id>build-rpm</id>
<activation>
+ <file>
+ <exists>/usr/bin/rpmbuild</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-1</version>
+ <executions>
+ <execution>
+ <configuration>
+ <name>squirrel-sql</name>
+ <version>${squirrelsql.rpm.version}</version>
+ <copyright>LGPL</copyright>
+ <distribution>Red Hat Linux</distribution>
+ <group>Development/Tools</group>
+ <packager>Rob Manning <robert [DOT] m [DOT] manning [AT] gmail.com></packager>
+ <prefix>/opt</prefix>
+ <summary>A database front-end written in Java</summary>
+ <url>http://squirrelsql.org</url>
+ <requires>
+ <require>java-1.6.0-openjdk</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <!--
+ The "/opt" prefix is necessary here. It is where we install by default, when the rpm is
+ installed without being relocated.
+ -->
+ <directory>/opt/SQuirreLSQLClient/doc</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/doc</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/icons</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/icons</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/lib</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/lib</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/plugins</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/plugins</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.sh</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient/update</directory>
+ <filemode>777</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/update</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>666</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/log4j.properties</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>666</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.jar</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/SQuirreLSQLClient</directory>
+ <filemode>666</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>target/squirrel-sql-${squirrelsql.version}-base/update-log4j.properties</location>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ <postinstallScriptlet>
+ <scriptFile>src/main/resources/postinstall.sh</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postinstallScriptlet>
+ <postremoveScriptlet>
+ <scriptFile>src/main/resources/postremove.sh</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postremoveScriptlet>
+ <keyname>${gpg.keyname}</keyname>
+ <keyPassphrase>
+ <passphrase>${gpg.passphrase}</passphrase>
+ </keyPassphrase>
+ </configuration>
+ <goals>
+ <goal>rpm</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>updateInstallers</id>
+ <activation>
<property>
<name>uploadInstallers</name>
</property>
@@ -452,5 +487,38 @@
</plugins>
</build>
</profile>
+<!-- <profile>-->
+<!-- <id>testInstallers</id>-->
+<!-- <activation>-->
+<!-- <property>-->
+<!-- <name>testInstallers</name>-->
+<!-- </property>-->
+<!-- </activation>-->
+<!-- <build>-->
+<!-- <plugins>-->
+<!-- <plugin>-->
+<!-- <groupId>org.codehaus.mojo</groupId>-->
+<!-- <artifactId>exec-maven-plugin</artifactId>-->
+<!-- <version>1.2</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <configuration>-->
+<!-- <executable>${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional/squirrel-sql.sh</executable>-->
+<!-- <arguments>-->
+<!---->
+<!-- <argument>-userdir</argument>-->
+<!-- <argument>${project.build.directory}/test-classes/user-settings-dir</argument>-->
+<!-- </arguments>-->
+<!-- </configuration>-->
+<!-- <phase>integration-test</phase>-->
+<!-- <goals>-->
+<!-- <goal>exec</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- </plugins>-->
+<!-- </build>-->
+<!-- </profile>-->
</profiles>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
