Commit Graph

133 Commits

Author SHA1 Message Date
Olivier Lamy 45b308aab0 align maven api to use maven 3 version
temporary comment failing dependency tree

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134349 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 15:37:00 +00:00
Olivier Lamy 1788eb54c4 [MRM-1473] remove use of plexus-spring
remove all dependencies to plexus-container
use of sisu-inject-plexus (version 2.2.2 with ASL license) for components using maven api components.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128075 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 20:52:13 +00:00
Olivier Lamy b781d2f5f7 update plexus-spring groupId
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103898 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:26:24 +00:00
Brett Porter 86ed5afc5c [MRM-1111] upgrade to Struts 2.1.8.1
Applied patch and made some additional modifications
Submitted by: Julien Henry, Gwen Harold Autencio

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1091398 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 13:23:24 +00:00
Brett Porter 4fed1a6fc5 analyze dependencies
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@921424 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 16:15:43 +00:00
Brett Porter 606c82cbca merged recent changes from trunk, and reimplemented incoming audit log functionality as a plugin using the metadata repository
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@900664 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 06:15:09 +00:00
Brett Porter fb9ad3f771 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898618 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 02:07:00 +00:00
Brett Porter d3fede7d5d [maven-release-plugin] prepare release archiva-1.3
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898616 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 02:05:50 +00:00
Brett Porter bf4af27748 Merged /archiva/trunk:r883982-885005
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@885019 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 21:14:58 +00:00
Brett Porter e7e9b184eb upgrade to Shade 1.2.2 so that build works with Maven 3.x
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@884355 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 01:25:48 +00:00
Brett Porter e89326d687 [MRM-1025] merge -r721944:723577 from former MRM-1025 branch, now aligned to trunk
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@825867 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 12:35:38 +00:00
Maria Odea B. Ching 6ad5da6f8d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808338 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:34:26 +00:00
Maria Odea B. Ching 924e33b562 [maven-release-plugin] prepare release archiva-1.2.2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808336 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:30:51 +00:00
Maria Odea B. Ching 81aa36aa09 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@807091 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 06:14:31 +00:00
Maria Odea B. Ching 03aae7ee6a [maven-release-plugin] prepare release archiva-1.2.2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@807087 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 06:12:10 +00:00
Maria Odea B. Ching 06ac3284ec [MRM-1141] archiva-cli no longer works
o merge content of all spring-context.xml files
o include commons-io in shaded jar, this is needed for repository scan


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@799177 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 06:15:04 +00:00
Maria Odea B. Ching 57a95feef7 [MRM-1141] archiva-cli no longer works
o merge spring.handlers of spring-context and plexus-spring


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798809 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 08:41:34 +00:00
Brett Porter a73f0ccf31 [MRM-1219] correct log4j configuration, consolidate logging APIs
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@794572 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 07:45:17 +00:00
Maria Odea B. Ching 3fea67fafd [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778166 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 14:50:05 +00:00
Maria Odea B. Ching 2d00ba7504 [maven-release-plugin] prepare release archiva-1.2.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778164 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 14:46:45 +00:00
Maria Odea B. Ching 4f50f5722e revert to 1.2.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778156 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 14:17:53 +00:00
Maria Odea B. Ching f2a299be93 [maven-release-plugin] prepare release archiva-1.2.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778151 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 13:58:14 +00:00
Maria Odea B. Ching 8dc8cd536a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757124 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 03:19:24 +00:00
Maria Odea B. Ching d811b1f00d [maven-release-plugin] prepare release archiva-1.2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757122 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 03:15:29 +00:00
Brett Porter 776361e663 revert shade plugin version to previous one
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755334 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 17:51:45 +00:00
Brett Porter 537ff689e7 [MRM-1140] centralise logging through slf4j
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753590 13f79535-47bb-0310-9956-ffa450edef68
2009-03-14 02:33:57 +00:00
Maria Odea B. Ching db96d2d7f2 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@712168 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 15:44:29 +00:00
Maria Odea B. Ching 4cd3872031 [maven-release-plugin] prepare release archiva-1.2-M1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@712154 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 15:15:14 +00:00
Brett Porter 0f2ba3d908 add required JAR for CLI execution
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@683519 13f79535-47bb-0310-9956-ffa450edef68
2008-08-07 05:57:37 +00:00
Maria Odea B. Ching 0d580b48c1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@677215 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 09:43:54 +00:00
Maria Odea B. Ching ef3b578f91 [maven-release-plugin] prepare release archiva-1.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@677213 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 09:41:07 +00:00
Maria Odea B. Ching c5b51473ba [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674706 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 02:04:28 +00:00
Maria Odea B. Ching 84c614d09a [maven-release-plugin] prepare release archiva-1.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674704 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 02:01:17 +00:00
James William Dumay a0170714e3 MRM-855 - java.lang.NoClassDefFoundError: org/apache/xml/serialize/OutputFormat
* removed excludes for xerces:*
* updated enforcer rules
* excluded xerces from shade in archiva-cli



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673269 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 04:11:34 +00:00
Brett Porter 6d84f3a0a5 POM clean up
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@667751 13f79535-47bb-0310-9956-ffa450edef68
2008-06-14 06:27:11 +00:00
Maria Odea B. Ching a43d8e101d -exclude commons-io which is causing a conflict
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@648549 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 06:28:19 +00:00
Maria Odea B. Ching 328422ab73 -reverted exclusions of plexus-container in plexus-spring dependency
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@648097 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 02:14:25 +00:00
Maria Odea B. Ching 32474f11ca -exclude plexus container in plexus-spring dependency
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647784 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 13:03:47 +00:00
Brett Porter 15e8484be8 clean up dependencies
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@646442 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 17:19:31 +00:00
Brett Porter fa4aa39725 a couple of workarounds to force "offline" behaviour
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@645751 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 01:24:10 +00:00
Brett Porter 28d9a2384a refreshed the CLI
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@645493 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 13:13:06 +00:00
Brett Porter f257dd0798 change the group ID
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642482 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 02:01:11 +00:00
Maria Odea B. Ching 8dbb5ad8c0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@612722 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 05:55:30 +00:00
Maria Odea B. Ching 720b5f60c1 [maven-release-plugin] prepare release archiva-1.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@612720 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 05:52:31 +00:00
Maria Odea B. Ching 54da9df2b8 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@597643 13f79535-47bb-0310-9956-ffa450edef68
2007-11-23 11:19:29 +00:00
Maria Odea B. Ching dad43cc047 [maven-release-plugin] prepare release archiva-1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@597641 13f79535-47bb-0310-9956-ffa450edef68
2007-11-23 11:16:46 +00:00
Brett Porter a2d82e7cbe lining up to a common parent called "archiva" instead, incorparating site, preparing for a shared product parent
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@593879 13f79535-47bb-0310-9956-ffa450edef68
2007-11-11 13:14:20 +00:00
Maria Odea B. Ching 46fbfa0fd1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@593451 13f79535-47bb-0310-9956-ffa450edef68
2007-11-09 08:32:31 +00:00
Maria Odea B. Ching 68ec920cd9 [maven-release-plugin] prepare release archiva-1.0-beta-4
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@593449 13f79535-47bb-0310-9956-ffa450edef68
2007-11-09 08:30:01 +00:00
Maria Odea B. Ching 76ca3a6797 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@589972 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 06:18:56 +00:00
Maria Odea B. Ching 7cde1cdf00 [maven-release-plugin] prepare release archiva-1.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@589970 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 06:16:21 +00:00
Maria Odea B. Ching c5f4e5079b -Reverted version to 1.0-beta-3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@588567 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 08:54:24 +00:00
Maria Odea B. Ching d2ceac7b0b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@586989 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 02:56:59 +00:00
Maria Odea B. Ching 44c44aa4f1 [maven-release-plugin] prepare release archiva-1.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@586987 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 02:54:10 +00:00
Maria Odea B. Ching 55baa9dff8 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@576050 13f79535-47bb-0310-9956-ffa450edef68
2007-09-16 06:42:14 +00:00
Maria Odea B. Ching ffb8b570c3 [maven-release-plugin] prepare release archiva-1.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@576048 13f79535-47bb-0310-9956-ffa450edef68
2007-09-16 06:39:24 +00:00
Maria Odea B. Ching d9ff71462a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@563101 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 10:38:34 +00:00
Maria Odea B. Ching 72c28b496c [maven-release-plugin] prepare release 1.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@563098 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 10:35:55 +00:00
Wendy Smoak c1ef06e2ab [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@550128 13f79535-47bb-0310-9956-ffa450edef68
2007-06-23 22:22:30 +00:00
Wendy Smoak 2023b7ee64 [maven-release-plugin] prepare release archiva-parent-1.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@550126 13f79535-47bb-0310-9956-ffa450edef68
2007-06-23 22:21:50 +00:00
Joakim Erdfelt 9bcbf0e482 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@543535 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 17:10:47 +00:00
Joakim Erdfelt 582f8d5781 [maven-release-plugin] prepare release archiva-1.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@543533 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 17:10:13 +00:00
Arnaud Heritier 4f35d1c716 MRM-338 : Fix dependencies convergence between archiva projects
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@537669 13f79535-47bb-0310-9956-ffa450edef68
2007-05-13 23:01:31 +00:00
Brett Porter d2e2a7c336 lock version
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@537310 13f79535-47bb-0310-9956-ffa450edef68
2007-05-11 23:04:05 +00:00
Joakim Erdfelt 99efaacbf0 Upgrading trunk to 1.0-alpha-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@534183 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 18:25:13 +00:00
Joakim Erdfelt 76fd577ce2 Fixing archiva-converter and usage in archiva-cli
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@532496 13f79535-47bb-0310-9956-ffa450edef68
2007-04-25 21:51:17 +00:00
Jesse McConnell c440e1e291 working archiva-ali again
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@528525 13f79535-47bb-0310-9956-ffa450edef68
2007-04-13 15:32:51 +00:00
Jesse McConnell e970003cf5 working on getting the cli working again
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@528251 13f79535-47bb-0310-9956-ffa450edef68
2007-04-12 22:00:28 +00:00
Joakim Erdfelt 3fddad3e8c Fixing versions of dependencies in cli
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@525996 13f79535-47bb-0310-9956-ffa450edef68
2007-04-05 22:52:46 +00:00
Joakim Erdfelt 769fe91fc3 Adding more consumers to the mix.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@525982 13f79535-47bb-0310-9956-ffa450edef68
2007-04-05 22:22:17 +00:00
Joakim Erdfelt 74cb10586c Updating branch with latest work towards database refactor.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@525176 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 15:21:33 +00:00
Joakim Erdfelt 54e1d8c608 Cleanup of pom multimodule heirarchy after directory moves.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@521491 13f79535-47bb-0310-9956-ffa450edef68
2007-03-22 22:03:11 +00:00
Joakim Erdfelt dee0d5a300 Merge from archiva-MRM-239 branch to trunk. r506385:HEAD
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@511053 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 19:05:21 +00:00
Brett Porter a2c185546c fix snapshot repositories
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@506783 13f79535-47bb-0310-9956-ffa450edef68
2007-02-13 00:59:51 +00:00
Joakim Erdfelt 79cc18ce70 * Upgraded webdav server to use new plexus-webdav with ability to override logic and correct flaws found in webdav servers.
* Added ProxiedDavServer component (used by plexus-webdav) to make /repository/ access proxied.
* Upgraded plexus, used [MRM-264] as baseline, but many more changes were needed.
* Plexus upgrade broken JSTL's <c:forTokens> taglib everywhere, corrected by moving away from that taglib.
* Created GroupIdLink tag following webwork guidelines for UI component.
* Fixed AuditLog.



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@497563 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 20:39:19 +00:00
Brett Porter 0b54f729ab Update license, reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@489860 13f79535-47bb-0310-9956-ffa450edef68
2006-12-23 06:39:46 +00:00
Henri Yandell 8f58ff7664 Moved from Plexus-Util StringUtils to Lang StringUtils. replace, split and join should just have had performance improvements (probably won't be noticed). isEmpty no longer trims, but usually people don't expect that so that's a semi bugfix. I've also switched a couple of \!isEmpty's to isNotEmpty.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@481446 13f79535-47bb-0310-9956-ffa450edef68
2006-12-01 23:44:12 +00:00
Jason van Zyl 51fcc19430 remove a dep by mistake
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@476730 13f79535-47bb-0310-9956-ffa450edef68
2006-11-19 06:38:20 +00:00
Jason van Zyl 360b2dfd86 o use new plexus-cli piece
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@476729 13f79535-47bb-0310-9956-ffa450edef68
2006-11-19 06:30:11 +00:00
Brett Porter ec4a395f41 fix build errors
- ensure correct version of plexus container is used
- remove custom manifest, generate with configuration. Ant tasks were not working OOTB


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@471809 13f79535-47bb-0310-9956-ffa450edef68
2006-11-06 18:40:17 +00:00
Jason van Zyl 890db48fdf comment about using the integration-test phase
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@471101 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 02:18:41 +00:00
Jason van Zyl 5370713b08 o create an executable JAR, assembly doesn't seem to want to let you make a JAR with a custom manifest ...
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@471098 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 02:17:08 +00:00
Jason van Zyl f05bc0c3dd o cli interface for archiva, using this to do the m1 -> m2 conversion
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@470635 13f79535-47bb-0310-9956-ffa450edef68
2006-11-03 02:09:38 +00:00