Permalink
Browse files

Merge pull request #90 from atmire/dspace3-reorg2

[DS-1144] Maven Project Consolidation
  • Loading branch information...
2 parents ef576f7 + 21d400c commit bed7fc63a06e55338e5f49a7752dc894f340f2e3 @mdiggory mdiggory committed Oct 3, 2012
Showing 1,545 changed files with 11,849 additions and 13,423 deletions.
View
@@ -188,6 +188,12 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -297,11 +303,7 @@
</dependency>
<dependency>
<groupId>org.dspace</groupId>
- <artifactId>dspace-services-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-services-impl</artifactId>
+ <artifactId>dspace-services</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -347,6 +349,66 @@
<artifactId>jbibtex</artifactId>
<version>1.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${lucene.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dspace.dependencies</groupId>
+ <artifactId>dspace-geoip</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.dspace.dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ostermiller</groupId>
+ <artifactId>utils</artifactId>
+ <version>1.07.00</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>0.18.6</version>
+ </dependency>
+
+ <!-- Gson: Java to Json conversion -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+
</dependencies>
</project>

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit bed7fc6

Please sign in to comment.