Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3358] trunk/archive-access/projects/wayback
|
From: <bra...@us...> - 2010-12-31 00:20:22
|
Revision: 3358
http://archive-access.svn.sourceforge.net/archive-access/?rev=3358&view=rev
Author: bradtofel
Date: 2010-12-31 00:20:16 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
checkpoint prior to site move
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-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -33,7 +33,7 @@
<descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>${project.artifactId}</finalName>
+ <finalName>wayback-${project.version}</finalName>
</configuration>
<executions>
<execution>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -171,7 +171,7 @@
<id>website</id>
<name>Website</name>
<!--Pass as command-line system property to maven-->
- <url>${website.url}/projects/${project.artifactId}</url>
+ <url>${website.url}/projects/wayback/</url>
</site>
</distributionManagement>
@@ -257,7 +257,7 @@
<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>
@@ -299,6 +299,34 @@
<artifactId>transform</artifactId>
<version>3.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+<!--
+ <scope>test</scope>
+-->
+ </dependency>
+ <dependency>
+ <artifactId>hadoop-core</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <version>0.20.2</version>
+ </dependency>
+
+
+ <!--
+ org.dspace-foresite doesn't seem to be in any pulic repository,
+ so a custom built version is on builds.archive.org, with SNAPSHOT
+ version..
+ TODO: fix this..
+ -->
+ <dependency>
+ <groupId>org.dspace</groupId>
+ <artifactId>foresite</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -15,40 +15,30 @@
<name>Wayback Core Java Classes</name>
<packaging>jar</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<!--
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.archive.wayback.Wayback</mainClass>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <version>3.8.1</version>
-->
+ <scope>test</scope>
+ </dependency>
- <dependencies>
<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>
<exclusions>
<exclusion>
<groupId>commons-pool</groupId>
@@ -63,32 +53,26 @@
<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>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -17,16 +17,8 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>wayback-hadoop-java</artifactId>
- <version>1.6.0</version>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2010-12-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -19,15 +19,20 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
+<!--
+ <version>3.8.1</version>
+-->
</dependency>
<dependency>
- <artifactId>hadoop-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>wayback-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hadoop</groupId>
- <version>0.20.2</version>
- <scope>compile</scope>
+ <artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
@@ -35,25 +40,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-core</artifactId>
- <scope>compile</scope>
- <version>1.6.0</version>
- </dependency>
</dependencies>
- <!--
- <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>
- </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-31 00:19:34 UTC (rev 3357)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2010-12-31 00:20:16 UTC (rev 3358)
@@ -29,9 +29,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <!--
- <version>6.1.22</version>
- -->
</plugin>
</plugins>
</build>
@@ -41,31 +38,17 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wayback-core</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>5.5.15</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+<!--
<scope>provided</scope>
+-->
</dependency>
- <!--
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- -->
- <dependency>
<groupId>org.dspace</groupId>
<artifactId>foresite</artifactId>
- <version>SNAPSHOT</version>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
