|
From: <man...@us...> - 2011-03-26 21:15:45
|
Revision: 6212
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6212&view=rev
Author: manningr
Date: 2011-03-26 21:15:39 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
dependency needed by the app once installed for the FirebirdManager plugin to work properly.
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-26 18:53:14 UTC (rev 6211)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-03-26 21:15:39 UTC (rev 6212)
@@ -76,6 +76,20 @@
<version>10.5.3.0_1</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
+ <artifactId>jaybird</artifactId>
+ <version>2.1.6</version>
+ <classifier>jdk16</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-connector</artifactId>
+ <version>1.5-rc4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>package</defaultGoal>
@@ -185,20 +199,6 @@
<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>
@@ -487,38 +487,106 @@
</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>-->
+ <profile>
+ <id>testInstallers</id>
+ <activation>
+ <property>
+ <name>testInstallers</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>copy-derby-driver-for-test</id>
+ <phase>integration-test</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>
+ <execution>
+ <id>copy-firebird-driver-for-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional/lib</outputDirectory>
+ <includeGroupIds>net.sf.squirrel-sql.thirdparty-non-maven</includeGroupIds>
+ <includeArtifactIds>jaybird</includeArtifactIds>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-j2ee-spec-driver-for-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/squirrel-sql-${squirrelsql.version}-optional/lib</outputDirectory>
+ <includeGroupIds>geronimo-spec</includeGroupIds>
+ <includeArtifactIds>geronimo-spec-j2ee-connector</includeArtifactIds>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>launch-squirrel-for-connect-test</id>
+ <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>
+ <argument>-s</argument>
+ <argument>20</argument>
+ </arguments>
+ </configuration>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>find-errors-in-logfile</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </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.
|
