[jsword-svn] r2078 - in trunk: . common-swing jsword jsword-web
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Sat Feb 12 08:48:04 MST 2011
Author: ChrisBurrell
Date: 2011-02-12 08:48:03 -0700 (Sat, 12 Feb 2011)
New Revision: 2078
Removed:
trunk/jsword/pom-common.xml
Modified:
trunk/common-swing/pom.xml
trunk/jsword-web/pom.xml
trunk/jsword/pom.xml
trunk/pom.xml
Log:
fixing the maven build - although jdom dependency still makes it break
Modified: trunk/common-swing/pom.xml
===================================================================
--- trunk/common-swing/pom.xml 2011-02-11 20:40:00 UTC (rev 2077)
+++ trunk/common-swing/pom.xml 2011-02-12 15:48:03 UTC (rev 2078)
@@ -1,49 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <parent>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-base</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-common-swing</artifactId>
- <packaging>jar</packaging>
- <version>${parent.version}</version>
- <name>jsword-common-swing</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.plugin</include>
- <include>**/*.png</include>
- <include>**/*.gif</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- </includes>
- </resource>
- </resources>
+<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">
+ <parent>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword-base</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword-common-swing</artifactId>
+ <packaging>jar</packaging>
+ <version>1.6.1-SNAPSHOT</version>
+ <name>jsword-common-swing</name>
+ <url>http://maven.apache.org</url>
- </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.plugin</include>
+ <include>**/*.png</include>
+ <include>**/*.gif</include>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ </includes>
+ </resource>
+ </resources>
+
+ </build>
</project>
Deleted: trunk/jsword/pom-common.xml
===================================================================
--- trunk/jsword/pom-common.xml 2011-02-11 20:40:00 UTC (rev 2077)
+++ trunk/jsword/pom-common.xml 2011-02-12 15:48:03 UTC (rev 2078)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <parent>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-base</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-common</artifactId>
- <packaging>jar</packaging>
- <version>${parent.version}</version>
- <name>jsword-common</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.plugin</include>
- <include>**/*.png</include>
- <include>**/*.gif</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.plugin</include>
- <include>**/*.png</include>
- <include>**/*.gif</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- </includes>
- </testResource>
- </testResources>
-
- </build>
-</project>
Modified: trunk/jsword/pom.xml
===================================================================
--- trunk/jsword/pom.xml 2011-02-11 20:40:00 UTC (rev 2077)
+++ trunk/jsword/pom.xml 2011-02-12 15:48:03 UTC (rev 2078)
@@ -1,68 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <parent>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-base</artifactId>
- <version>1.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword</artifactId>
- <packaging>jar</packaging>
- <version>${parent.version}</version>
- <name>jsword</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>3.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>3.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-smartcn</artifactId>
- <version>3.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
- <version>3.0.3</version>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.plugin</include>
- <include>**/*.png</include>
- <include>**/*.gif</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- </includes>
- </resource>
- </resources>
- </build>
+<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">
+ <parent>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword-base</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword</artifactId>
+ <packaging>jar</packaging>
+ <version>1.6.1-SNAPSHOT</version>
+ <name>jsword</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javatar</groupId>
+ <artifactId>javatar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.plugin</include>
+ <include>**/*.png</include>
+ <include>**/*.gif</include>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: trunk/jsword-web/pom.xml
===================================================================
--- trunk/jsword-web/pom.xml 2011-02-11 20:40:00 UTC (rev 2077)
+++ trunk/jsword-web/pom.xml 2011-02-12 15:48:03 UTC (rev 2078)
@@ -10,17 +10,19 @@
<groupId>org.crosswire.cv_accounting</groupId>
<artifactId>jsword-web</artifactId>
<packaging>war</packaging>
- <version>${parent.version}</version>
+ <version>1.6.1-SNAPSHOT</version>
<name>jsword-web</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<properties>
<context.path>${project.artifactId}</context.path>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-02-11 20:40:00 UTC (rev 2077)
+++ trunk/pom.xml 2011-02-12 15:48:03 UTC (rev 2078)
@@ -1,145 +1,201 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-base</artifactId>
- <packaging>pom</packaging>
- <version>1.6.1-SNAPSHOT</version>
- <name>jsword-base</name>
- <url>http://maven.apache.org</url>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
- <project.reporting.outputEncoding>iso-8859-1
- </project.reporting.outputEncoding>
- </properties>
+<!-- Currently not all jars are in the central maven repository, therefore
+ please run the following from the main directory mvn install:install-file
+ -Dfile=jsword\jar\jdom-1.1.1\jdom-1.1.1.jar -DgroupId=org.jdom -DartifactId=jdom
+ -Dpackaging=jar -Dversion=1.1.1 -->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <scope>compile</scope>
- </dependency>
+<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>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword-base</artifactId>
+ <packaging>pom</packaging>
+ <version>1.6.1-SNAPSHOT</version>
+ <name>jsword-base</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>iso-8859-1</project.reporting.outputEncoding>
+ <java.version>1.5</java.version>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>javatar</groupId>
- <artifactId>javatar</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
+ <!-- version management -->
+ <junit.version>3.8.1</junit.version>
+ <log4j.version>1.2.12</log4j.version>
+ <commons-codec.version>1.4</commons-codec.version>
+ <commons-logging.version>1.1.1</commons-logging.version>
+ <commons-net.version>2.2</commons-net.version>
+ <javatar.version>2.5</javatar.version>
+ <jdom.version>1.1.1</jdom.version>
+ <lucene.version>3.0.3</lucene.version>
+ <httpcomponents-httpcore.version>4.1</httpcomponents-httpcore.version>
+ <httpcomponents-httpclient.version>4.1-beta1</httpcomponents-httpclient.version>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>iso-8859-1</encoding>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- maven plugin versions -->
+ <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
- <distributionManagement>
- <repository>
- <id>crosswire-repo</id>
- <name>Cross Wire Maven Repository</name>
- <url>scp://maven.crosswire.org/var/www/maven.crosswire.org/htdocs/
- </url>
- </repository>
- </distributionManagement>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
- <modules>
- <module>common-swing</module>
- <module>jsword</module>
- <module>bibledesktop</module>
- <module>bibledesktop-web</module>
- <module>jsword-web</module>
- </modules>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents-httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents-httpclient.version}</version>
+ </dependency>
- <profiles>
- <profile>
- <id>test</id>
- <properties>
- <maven.test.skip>false</maven.test.skip>
- </properties>
- </profile>
- <profile>
- <id>common-aqua</id>
- <activation>
- <property>
- <name>os.name</name>
- <value>Mac OS X</value>
- </property>
- </activation>
- <modules>
- <module>common-aqua</module>
- </modules>
- </profile>
+ <dependency>
+ <groupId>javatar</groupId>
+ <artifactId>javatar</artifactId>
+ <version>${javatar.version}</version>
+ </dependency>
- <profile>
- <id>sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <keystore>../jsword/crosswire.keystore</keystore>
- <storepass>p455w0rd</storepass>
- <alias>jsword</alias>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <repository>
+ <id>crosswire-repo</id>
+ <name>Cross Wire Maven Repository</name>
+ <url>scp://maven.crosswire.org/var/www/maven.crosswire.org/htdocs/</url>
+ </repository>
+ </distributionManagement>
+
+
+ <modules>
+ <module>jsword</module>
+ <module>common-swing</module>
+ <module>bibledesktop</module>
+ <module>bibledesktop-web</module>
+ <module>jsword-web</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <properties>
+ <maven.test.skip>false</maven.test.skip>
+ </properties>
+ </profile>
+ <profile>
+ <id>common-aqua</id>
+ <activation>
+ <property>
+ <name>os.name</name>
+ <value>Mac OS X</value>
+ </property>
+ </activation>
+ <modules>
+ <module>common-aqua</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <keystore>../jsword/crosswire.keystore</keystore>
+ <storepass>p455w0rd</storepass>
+ <alias>jsword</alias>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
More information about the jsword-svn
mailing list