Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3355] trunk/archive-access/projects/wayback
|
From: <bra...@us...> - 2010-12-30 19:54:39
|
Revision: 3355
http://archive-access.svn.sourceforge.net/archive-access/?rev=3355&view=rev
Author: bradtofel
Date: 2010-12-30 19:54:31 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
checkpoint prior to major version refactoring
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-09 22:58:06 UTC (rev 3354)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-30 19:54:31 UTC (rev 3355)
@@ -1,63 +1,25 @@
-<?xml version="1.0"?>
-<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>
- <groupId>org.archive</groupId>
- <artifactId>wayback</artifactId>
+ <artifactId>parent</artifactId>
+ <groupId>org.archive.wayback</groupId>
<version>1.6.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback</artifactId>
+ <artifactId>dist</artifactId>
<name>Wayback tar.gz Distribution</name>
<packaging>pom</packaging>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>agilejava</id>
- <name>agilejava.com</name>
- <url>http://www.agilejava.com/maven</url>
- <layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
-
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>internetarchive</id>
- <name>Internet Archive Maven Repository</name>
- <url>http://builds.archive.org:8080/maven2</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
- <groupId>org.archive.wayback</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>wayback-core</artifactId>
- <version>1.6.0</version>
</dependency>
</dependencies>
-
<build>
<plugins>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2010-12-09 22:58:06 UTC (rev 3354)
+++ trunk/archive-access/projects/wayback/pom.xml 2010-12-30 19:54:31 UTC (rev 3355)
@@ -1,28 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- POM reference: http://maven.apache.org/pom.html
+<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>
- List of the better articles on maven:
+ <groupId>org.archive.wayback</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.6.0</version>
+ <name>Wayback</name>
- http://www.javaworld.com/javaworld/jw-05-2006/jw-0529-maven.html
- http://www.javaworld.com/javaworld/jw-02-2006/jw-0227-maven_p.html
+ <modules>
+ <module>wayback-core</module>
+ <module>wayback-webapp</module>
+ <module>wayback-hadoop-java</module>
+ <module>wayback-hadoop</module>
+ <module>dist</module>
+ </modules>
- URLs on converting from 1.0 to 2.0 maven (not much good generally):
-
- http://wiki.osafoundation.org/bin/view/Journal/Maven2Upgrade
- http://maven.apache.org/guides/mini/guide-m1-m2.html
- -->
-<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.archive</groupId>
- <artifactId>wayback</artifactId>
<properties>
- <globalVersion>1.6.0</globalVersion>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <website.url>http://archive-access.sourceforge.net/</website.url>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <version>1.6.0</version>
- <packaging>pom</packaging>
- <name>Wayback</name>
<description>
The wayback project is an open source implementation of the
@@ -34,8 +33,8 @@
<licenses>
<license>
- <name>GNU LESSER GENERAL PUBLIC LICENSE</name>
- <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
@@ -86,24 +85,12 @@
<repositories>
<repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
+
<id>internetarchive</id>
<name>Internet Archive Maven Repository</name>
<url>http://builds.archive.org:8080/maven2</url>
<layout>default</layout>
- </repository>
-<!--
- <repository>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
@@ -114,18 +101,17 @@
<updatePolicy>daily</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <id>dspace</id>
- <name>DSpace Maven Repository</name>
- <url>http://maven.dspace.org/</url>
- <layout>default</layout>
</repository>
- -->
-
-
</repositories>
<pluginRepositories>
<pluginRepository>
+
+ <id>archive</id>
+ <name>archive.org</name>
+ <url>http://builds.archive.org:8080/maven2</url>
+ <layout>default</layout>
+
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
@@ -136,10 +122,6 @@
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <id>archive</id>
- <name>archive.org</name>
- <url>http://builds.archive.org:8080/maven2</url>
- <layout>default</layout>
</pluginRepository>
</pluginRepositories>
@@ -149,47 +131,34 @@
</connection>
<tag>HEAD</tag>
<url>
- https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/
+ http://archive-access.svn.sourceforge.net/viewvc/archive-access/trunk/archive-access/projects/
</url>
</scm>
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>2.1</maven>
</prerequisites>
- <dependencyManagement>
- <!--Dependeny management is not same as dependencies (ugh)-->
- <dependencies>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-hadoop-java</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-hadoop</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-webapp</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <modules>
- <module>wayback-core</module>
- <module>wayback-webapp</module>
- <module>wayback-hadoop-java</module>
- <module>wayback-hadoop</module>
- <module>dist</module>
- </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.22</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<distributionManagement>
<repository>
@@ -223,12 +192,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <aggregate>true</aggregate>
+ <code>javadoc:aggregate</code>
+ <code>javadoc:test-aggregate</code>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
<reportSets>
<reportSet>
<reports>
@@ -246,4 +217,92 @@
</plugins>
</reporting>
+<!--
+ Finally, the dependencyManagement - all version coordinates for all
+ dependencies should be specified here, allowing child modules to specify
+ only groupId and artifactId coordinates.
+-->
+
+ <dependencyManagement>
+ <dependencies>
+
+ <!--
+ Link all Wayback child module version dependencies to the parent POM
+ version.
+ -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wayback-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wayback-hadoop-java</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wayback-hadoop</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wayback-webapp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.archive.heritrix</groupId>
+ <artifactId>heritrix-commons</artifactId>
+ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.archive.access-control</groupId>
+ <artifactId>access-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mozilla</groupId>
+ <artifactId>juniversalchardet</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.flagstone</groupId>
+ <artifactId>transform</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+
+
</project>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2010-12-09 22:58:06 UTC (rev 3354)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2010-12-30 19:54:31 UTC (rev 3355)
@@ -1,40 +1,24 @@
-<?xml version="1.0"?>
-<!--
- POM reference: http://maven.apache.org/pom.html
+<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">
- List of the better articles on maven:
-
- http://www.javaworld.com/javaworld/jw-05-2006/jw-0529-maven.html
- http://www.javaworld.com/javaworld/jw-02-2006/jw-0227-maven_p.html
-
- URLs on converting from 1.0 to 2.0 maven (not much good generally):
-
- http://wiki.osafoundation.org/bin/view/Journal/Maven2Upgrade
- http://maven.apache.org/guides/mini/guide-m1-m2.html
- -->
-<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>
- <groupId>org.archive</groupId>
- <artifactId>wayback</artifactId>
+ <artifactId>parent</artifactId>
+ <groupId>org.archive.wayback</groupId>
<version>1.6.0</version>
</parent>
- <groupId>org.archive.wayback</groupId>
+
<artifactId>wayback-core</artifactId>
- <name>Wayback Core Classes</name>
+ <name>Wayback Core Java Classes</name>
<packaging>jar</packaging>
+<!--
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -47,13 +31,13 @@
</plugin>
</plugins>
</build>
+-->
<dependencies>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2010-12-09 22:58:06 UTC (rev 3354)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2010-12-30 19:54:31 UTC (rev 3355)
@@ -1,15 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<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>
- <artifactId>wayback</artifactId>
- <groupId>org.archive</groupId>
+ <artifactId>parent</artifactId>
+ <groupId>org.archive.wayback</groupId>
<version>1.6.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.archive.wayback</groupId>
+
<artifactId>wayback-hadoop</artifactId>
<name>Wayback Hadoop Jar Packaging</name>
- <version>1.6.0</version>
- <url>http://maven.apache.org</url>
<packaging>pom</packaging>
<dependencies>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2010-12-09 22:58:06 UTC (rev 3354)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2010-12-30 19:54:31 UTC (rev 3355)
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
- <artifactId>wayback</artifactId>
- <groupId>org.archive</groupId>
+ <artifactId>parent</artifactId>
+ <groupId>org.archive.wayback</groupId>
<version>1.6.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.archive.wayback</groupId>
+
<artifactId>wayback-hadoop-java</artifactId>
<name>Wayback Hadoop Java Code</name>
- <version>1.6.0</version>
- <url>http://maven.apache.org</url>
<packaging>jar</packaging>
<dependencies>
@@ -40,6 +42,7 @@
<version>1.6.0</version>
</dependency>
</dependencies>
+ <!--
<build>
<plugins>
<plugin>
@@ -52,4 +55,5 @@
</plugin>
</plugins>
</build>
+ -->
</project>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2010-12-09 22:58:06 UTC (rev 3354)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2010-12-30 19:54:31 UTC (rev 3355)
@@ -1,15 +1,18 @@
-<?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">
+<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>
- <artifactId>wayback</artifactId>
- <groupId>org.archive</groupId>
+ <artifactId>parent</artifactId>
+ <groupId>org.archive.wayback</groupId>
<version>1.6.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.archive.wayback</groupId>
+
<artifactId>wayback-webapp</artifactId>
+ <name>Wayback Web Application</name>
<packaging>war</packaging>
- <name>Wayback Web Application</name>
<build>
<finalName>wayback-${project.version}</finalName>
@@ -26,7 +29,9 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
+ <!--
<version>6.1.22</version>
+ -->
</plugin>
</plugins>
</build>
@@ -34,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.archive.wayback</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>wayback-core</artifactId>
<scope>compile</scope>
</dependency>
@@ -44,6 +49,7 @@
<version>5.5.15</version>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
@@ -55,6 +61,7 @@
<artifactId>standard</artifactId>
<version>1.1.2</version>
</dependency>
+ -->
<dependency>
<groupId>org.dspace</groupId>
<artifactId>foresite</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
