Author: [EMAIL PROTECTED]
Date: Thu Sep 25 09:35:55 2008
New Revision: 2720
Modified:
trunk/assembly/assembly-generic.xml
trunk/pom.xml
Log:
Made some modifications to the Maven POM and the assembly descriptor that
make a generic distributable very similar to the Ant-built one possible to
build using Maven. I think some of the dependencies need to be double
checked, but otherwise, this is one step closer to getting the Architect
build process Maven-ized
Modified: trunk/assembly/assembly-generic.xml
==============================================================================
--- trunk/assembly/assembly-generic.xml (original)
+++ trunk/assembly/assembly-generic.xml Thu Sep 25 09:35:55 2008
@@ -26,13 +26,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>lib</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>jdbc_drivers</directory>
<outputDirectory>jdbc</outputDirectory>
<includes>
@@ -40,4 +33,13 @@
</includes>
</fileSet>
</fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib/</outputDirectory>
+ <outputFileNameMapping>
+ ${artifact.artifactId}-${artifact.version}.${artifact.extension}
+ </outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Sep 25 09:35:55 2008
@@ -5,7 +5,7 @@
<groupId>ca.sqlpower</groupId>
<artifactId>power-architect</artifactId>
<packaging>jar</packaging>
- <version>0.9.11-SNAPSHOT</version>
+ <version>0.9.12-SNAPSHOT</version>
<name>power-architect</name>
<url>http://code.google.com/p/power-architect</url>
@@ -52,7 +52,7 @@
<configuration>
<verbose>true</verbose>
<fork>true</fork>
- <!-- You must set this if your default JDK
is not Java 5 -->
+ <!-- You MUST set this if your default JDK
is not Java 5 -->
<!--<executable>${JAVA_5_HOME}/bin/javac</executable> -->
<compilerVersion>1.5</compilerVersion>
<source>1.5</source>
@@ -81,10 +81,27 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>assembly/assembly-generic.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <descriptorRefs>
-
<descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+
<mainClass>ca.sqlpower.architect.swingui.ArchitectFrame</mainClass>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ <manifestEntries>
+ <Class-Path>jdbc/</Class-Path>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
@@ -108,6 +125,7 @@
<groupId>ca.sqlpower</groupId>
<artifactId>sqlpower-library</artifactId>
<version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -160,6 +178,13 @@
</dependency>
<dependency>
+ <groupId>mondrian</groupId>
+ <artifactId>mondrian</artifactId>
+ <version>3.0.3.11016</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>jfree</groupId>
<artifactId>jcommon</artifactId>
<version>1.0.0</version>
@@ -202,36 +227,18 @@
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.5</version>
- </dependency>
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-507.jdbc3</version>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.6</version>
+ <scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
<version>2.0.1</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.6</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>ca.sqlpower</groupId>
