[jsword-svn] r2126 - in trunk: . bibledesktop
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Mon Mar 14 14:52:19 MST 2011
Author: ChrisBurrell
Date: 2011-03-14 14:52:19 -0700 (Mon, 14 Mar 2011)
New Revision: 2126
Modified:
trunk/bibledesktop/pom.xml
trunk/pom.xml
Log:
POMs changes to address JS-164 and JS-165
Modified: trunk/bibledesktop/pom.xml
===================================================================
--- trunk/bibledesktop/pom.xml 2011-03-14 21:37:06 UTC (rev 2125)
+++ trunk/bibledesktop/pom.xml 2011-03-14 21:52:19 UTC (rev 2126)
@@ -1,86 +1,83 @@
<?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>bibledesktop</artifactId>
- <packaging>jar</packaging>
- <version>1.6.1-SNAPSHOT</version>
- <name>bibledesktop</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword-common-swing</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.crosswire</groupId>
- <artifactId>jsword</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>jlfgr</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/jar/jlfgr-1.0/jlfgr-1_0.jar</systemPath>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>run</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.crosswire.bibledesktop.desktop.Desktop</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>common-aqua</id>
- <activation>
- <property>
- <name>os.name</name>
- <value>Mac OS X</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.crosswire</groupId>
- <artifactId>common-aqua</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+<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>bibledesktop</artifactId>
+ <packaging>jar</packaging>
+ <version>1.6.1-SNAPSHOT</version>
+ <name>bibledesktop</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword-common-swing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.crosswire</groupId>
+ <artifactId>jsword</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>jlfgr</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>run</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.crosswire.bibledesktop.desktop.Desktop</mainClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>common-aqua</id>
+ <activation>
+ <property>
+ <name>os.name</name>
+ <value>Mac OS X</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.crosswire</groupId>
+ <artifactId>common-aqua</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-03-14 21:37:06 UTC (rev 2125)
+++ trunk/pom.xml 2011-03-14 21:52:19 UTC (rev 2126)
@@ -116,12 +116,26 @@
</dependencies>
</dependencyManagement>
- <distributionManagement>
+ <repositories>
<repository>
- <id>crosswire-repo</id>
- <name>Cross Wire Maven Repository</name>
- <url>scp://maven.crosswire.org/var/www/maven.crosswire.org/htdocs/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <id>crosswire.public</id>
+ <name>Codehaus Public Repo</name>
+ <url>http://crosswire.org/mvn/content/groups/public/</url>
+ <layout>default</layout>
</repository>
+ </repositories>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>crosswire.mvn</id>
+ <url>http://crosswire.org/mvn/content/repositories/snapshots/</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
</distributionManagement>
More information about the jsword-svn
mailing list