Commit Graph

264 Commits

Author SHA1 Message Date
Mark Diggory
0a5d43470f Merge pull request #42 from steveswinsburg/DS-1211
DS-1211 upgrade to Servlet API 2.4 and other compatible dependencies
2012-08-14 16:28:55 -07:00
Steve Swinsburg
8a6b269153 DS-1211 upgrade to Servlet API 2.4, and other compatible dependencies 2012-07-12 16:54:23 +10:00
Steve Swinsburg
fb69ec7ce2 DS-1209 all adjust files for the build time filtering 2012-07-10 16:21:54 +10:00
Steve Swinsburg
ad529f1584 DS-1209 adjust additions pom so that servlet-api is bundled into lib directory 2012-07-10 15:54:44 +10:00
Mark H. Wood
d549bb3b0f Missing license comments 2012-06-19 10:59:10 -04:00
KevinVdV
32ad3c427c [DS-981] API Project and build assembly restructure 2012-05-16 21:34:28 +02:00
Mark Diggory
eacbec7174 [DS-981] API Project and build assembly restructure 2012-05-09 17:15:49 -07:00
Tim Donohue
6bf9b33e61 Fix bad reference in <parent> of dspace/modules/solr/pom.xml file. The 'dspace-pom' module no longer exists. Changed this to just point at org.dspace.modules (like everything else in dspace/modules/). 2012-04-16 16:10:22 -05:00
Mark Diggory
6611a69e74 [DS-1150] Migrate to GitHub : Correct SCM Locations and project URL 2012-03-31 13:01:43 -07:00
Peter Dietz
9ea2dd5929 Added .ignore files to the modules webapps, since they were empty directories, and Git can't track empty directories.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6919 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2012-01-13 16:42:01 +00:00
Robin Taylor
0cde9d5af8 [maven-release-plugin] prepare for next development iteration
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6834 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-11-04 09:20:17 +00:00
Robin Taylor
a428a3b03a [maven-release-plugin] prepare release dspace-1.8.0
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6832 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-11-04 09:19:37 +00:00
Tim Donohue
741393d59d Change ordering of dependencies in swordv2 POM so that the org.dspace.dspace-swordv2 'war' dependency is listed *first*. This was necessary to ensure that the web.xml in that 'org.dspace.dspace-swordv2' WAR is inherited properly. (Previously it was somehow inheriting the web.xml from the 'org.swordapp.server' WAR)
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6828 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-25 20:11:38 +00:00
Robin Taylor
ffc4d0aa20 [maven-release-plugin] prepare for next development iteration
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6826 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-21 08:50:35 +00:00
Robin Taylor
a69894e7f3 [maven-release-plugin] prepare release dspace-1.8.0-rc3
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6824 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-21 08:49:54 +00:00
Tim Donohue
f5acd60120 Revert changes from r6815 so that SWORD2 webapp includes the dspace-swordv2-*-classes.jar as a dependency
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6823 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-20 18:16:32 +00:00
Robin Taylor
2605e681a6 [maven-release-plugin] prepare for next development iteration
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6818 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-19 09:30:46 +00:00
Robin Taylor
1714c0404a [maven-release-plugin] prepare release dspace-parent-1.8.0-rc2
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6816 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-19 09:30:05 +00:00
Robin Taylor
8432c50321 In the swordv2 overlay module replace the dependency on org.dspace sword server with that now released under org.swordapp.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6815 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-19 09:05:38 +00:00
Tim Donohue
7dbdc3508c The POM at [src]/dspace/modules/solr/pom.xml was oddly claiming to be version 11. Changing it so that it's in line with all our other POMs -- now version 1.8.0-rc2-SNAPSHOT.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6798 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-10-11 17:53:07 +00:00
Tim Donohue
eaca59bc42 DS-854 : Update several poms so that they use the latest version of dspace-pom (v.12) and the latest version of maven-license-plugin (v.1.9.0). This also cleans up several poms which override the default maven-license-plugin. This is the first of likely quite a few commits (which will seek to clean up licensing & ensure we are now obeying the new "strictCheck" option of maven-license-plugin).
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6702 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-09-16 19:45:33 +00:00
Robin Taylor
cb74a0c8ef [maven-release-plugin] prepare for next development iteration
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6683 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-09-11 10:20:57 +00:00
Robin Taylor
30493d6d19 [maven-release-plugin] prepare release dspace-1.8.0-rc1
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6681 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-09-11 10:20:08 +00:00
Mark Diggory
546426b659 [DS-1005] SWORD v2 implementation for DSpace : Restructure project and use external SWORD dependency.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6678 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-09-10 16:13:42 +00:00
Mark Diggory
f872d8efc8 Correct Issues with SWORDv2 Webapplication overlaying. Overlays should not attempt to work in classes or lib directories and rely on Maven dependency mechanism to resolve these dependency requirements. SWORD webapp now packages a separate jar artifact for the classes which is added as a dependency.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6676 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-09-09 19:36:54 +00:00
Robin Taylor
6c1607d8e3 [DS-1005] Add the dspace-swordv2 module
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6609 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-26 09:45:39 +00:00
Mark Diggory
78614be60d [DS-881] DSpace doesn't build properly with Maven 3 : Release Common POM 11, Correct usage of SNAPSHOT Release in last commit. Build cannot locate snapshot repository from a snapshot. This should correct CI problem once 11 is in central repository.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6605 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-26 00:13:04 +00:00
Mark Diggory
e013f11f81 [DS-881] DSpace doesn't build properly with Maven 3 : add missing profile ids and svn:ignores
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6600 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-25 23:36:59 +00:00
Mark Diggory
43744604e6 [DS-881] DSpace doesn't build properly with Maven 3 : Give control back to solr for its own dependency resolution.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6599 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-25 23:33:27 +00:00
Stuart Lewis
496d0a6012 Updating SWORD URL
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6590 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-25 03:40:58 +00:00
Mark Diggory
6ea81ecd06 [DS-881] DSpace doesn't build properly with Maven 3
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6585 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-24 21:31:03 +00:00
Mark Wood
1848c56678 Remove unwanted (on Unix) CRs at line end and mark files for native eol
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6557 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-18 15:10:31 +00:00
Tim Donohue
8fcac3ab07 [DS-980] Upgraded solr & lucene to version 3.3.0 - second try (Thanks to Kevin Van de Velde who fixed the issues that caused massive Unit Testing failures. This new version of patch passes all Unit Tests.)
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6548 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-15 21:04:17 +00:00
Tim Donohue
bc1b7354ef Undoing commit r6545 (DS-980) as it seems to have broken 80% of Unit Tests. Will recommit once Unit Testing issues are resolved.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6546 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-12 21:55:26 +00:00
Tim Donohue
e40a2c9441 [DS-980] Upgraded solr & lucene to version 3.3.0
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6545 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-12 19:49:34 +00:00
Robin Taylor
527fcc7b16 [DS-602] Move Sword Client module to trunk
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6533 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-08-07 11:19:38 +00:00
Tim Donohue
ae2f991061 DS-791 : Add ability to disable the building of particular DSpace modules/interfaces from source code
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6500 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-07-21 20:53:42 +00:00
Mark Diggory
c13c6022e3 [DSCR-22] Discovery module back end rewrite to support discovery without solr.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6463 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-07-13 23:20:42 +00:00
Mark Diggory
ef66d7841e [maven-release-plugin] prepare release dspace-async-release
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6414 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-06-02 08:10:34 +00:00
Mark Diggory
869f8c0247 [maven-release-plugin] prepare branch dspace-async-release
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6412 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-06-02 08:10:13 +00:00
Graham Triggs
52714bfee9 Add relativePath for Maven 3
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6022 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2011-01-14 20:57:01 +00:00
Tim Donohue
cbbaf37ebb Last commit (r5993) failed to catch all instances of 1.7.1-SNAPSHOT and replace with 1.8.0-SNAPSHOT on Trunk. This should take care of the rest of them.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5994 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-16 23:03:19 +00:00
Tim Donohue
b12082e26c Updating all Trunk poms to version of 1.8.0-SNAPSHOT. As of this moment, Trunk is now for 1.8.0 code, and 'dspace-1.7.x' branch is for 1.7.1 code.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5993 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-16 22:18:27 +00:00
Tim Donohue
891de52dc2 [maven-release-plugin] prepare for next development iteration
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5991 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-16 18:38:22 +00:00
Tim Donohue
45c1db882e [maven-release-plugin] prepare release dspace-1.7.0
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5989 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-16 18:38:03 +00:00
Tim Donohue
ae12f7a88b Very minor final bug fix. Fix to DS-786. As Hardy Pottinger pointed out, we need to update all our poms to use 'ojdbc6' dependency for Oracle, since we are now requiring Java 6. Hardy tested these changes with Oracle, before submitting. This patch updates all pom.xml files from ojdbc5 to ojdbc6 for Oracle.
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5961 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-16 16:11:08 +00:00
Tim Donohue
8652f07d15 [maven-release-plugin] prepare for next development iteration
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5952 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-13 22:03:12 +00:00
Tim Donohue
24a8fd6257 [maven-release-plugin] prepare release dspace-1.7.0-rc2
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5950 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-13 22:02:49 +00:00
Tim Donohue
1d5ff9ea99 Solr Webapp's pom.xml (in [dspace-src]/dspace/modules/solr/) needs a parent POM. Without a parent POM or without all the proper release configs specified by a parent POM, this Solr pom.xml throws errors during the release deploy process. For now, the quickest fix seems to be to just give this a parent (similar to all other modules in[dspace-src]/dspace/modules/).
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5949 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-13 21:39:29 +00:00
Tim Donohue
84fbf94fe1 [maven-release-plugin] rollback the release of dspace-1.7.0-rc2
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5947 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2010-12-13 20:58:26 +00:00