Commit Graph

91 Commits

Author SHA1 Message Date
Olivier Lamy 10553cbf42 ensure ARCHIVA_BASE works
Previous workaround failed due to the ordering of wrapper.conf, so now we
leave the current mechanism in place, but workaround the APPASM bug by
replacing set.ARCHIVA_BASE=. with set.default.ARCHIVA_BASE=.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1566000 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:04:47 +00:00
Olivier Lamy 16dcdfb944 Revert "make sure ARCHIVA_BASE is not overridden"
This reverts commit b62e1962c89a63d25eeb2606d7de21e754bbfd42 (r1562696).

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565999 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:04:41 +00:00
Olivier Lamy f6b004c361 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565998 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:04:34 +00:00
Olivier Lamy 8efe254c0f [maven-release-plugin] prepare release archiva-2.0.0-RC2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565997 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:03:45 +00:00
Olivier Lamy 728c1e97c4 make sure ARCHIVA_BASE is not overridden
For some reason MAPPASM-175 changed it from set.default.X to set.X, which
means it can't be changed.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565989 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:02:03 +00:00
Olivier Lamy bd56eac0c4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565985 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:01:36 +00:00
Olivier Lamy 7c38ab4088 [maven-release-plugin] prepare release archiva-2.0.0-RC1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565984 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 12:00:46 +00:00
Olivier Lamy abf7ffaa6d change version to 2.0.0-RC1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565974 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 11:59:09 +00:00
Olivier Lamy 9528f9580d dependency needed
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1556445 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 05:33:24 +00:00
Olivier Lamy 63533c4177 next version will be 2.0.0
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1508017 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 12:31:34 +00:00
Olivier Lamy d7f7a0d9a3 next version will be 1.4.0
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1488666 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 11:25:25 +00:00
Olivier Lamy 233a2d78e4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1486549 13f79535-47bb-0310-9956-ffa450edef68
2013-05-27 09:29:30 +00:00
Olivier Lamy d6d41d28f0 [maven-release-plugin] prepare release archiva-1.4-M4
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1486547 13f79535-47bb-0310-9956-ffa450edef68
2013-05-27 09:28:55 +00:00
Maria Odea B. Ching fbc8c42996 [MRM-1751] removed unused methods and config + update docs
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1484418 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 10:28:30 +00:00
Olivier Lamy 9fd97df2ab add sysproperty AsyncLogger.WaitStrategy in wrapper.conf file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1481708 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 06:50:42 +00:00
Olivier Lamy 68e62f9595 [MRM-1760] Multiple, incompatible, log name formats
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1478363 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 13:20:34 +00:00
Olivier Lamy aa482e9b9b fix final name of assembly
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1426363 13f79535-47bb-0310-9956-ffa450edef68
2012-12-27 23:06:39 +00:00
Olivier Lamy 1569a22310 others fix due to module rename
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1426215 13f79535-47bb-0310-9956-ffa450edef68
2012-12-27 14:55:45 +00:00
Olivier Lamy 94a387343c rename jetty-js to jetty as it's now default one
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1426074 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 22:42:31 +00:00
Olivier Lamy 56c8770344 [MRM-1686] stop support of struts2 webapp.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1395876 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 07:15:28 +00:00
Olivier Lamy d856df8196 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1393506 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 14:23:47 +00:00
Olivier Lamy ca17b63c3e [maven-release-plugin] prepare release archiva-1.4-M3
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1393504 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 14:23:19 +00:00
Olivier Lamy 8a58f4f5f4 add windows 64 wrapper
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1390708 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 19:58:11 +00:00
Olivier Lamy 54355035ec [MRM-1676] use tomcat-jdbc for connection pooling in embeded distrib.
for legacy webapp too.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389468 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 16:12:25 +00:00
Olivier Lamy 378818ddfe docs not anymore included in webapp
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387047 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 08:37:15 +00:00
Olivier Lamy a4bc7e4e16 move versions in parent pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1337794 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 07:35:36 +00:00
Olivier Lamy 5d31688e7f move version to pluginMngt in parent pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1307001 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 17:14:18 +00:00
Jean-Baptiste Onofre 0fe74aabaa [MRM-1608] Upgrade to commons-pool 1.6
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1294143 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 13:17:30 +00:00
Brett Porter 8c93dc5c59 use correct temporary directory
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1215123 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 13:15:33 +00:00
Olivier Lamy 58b08d0094 bump to 1.4-M3-SNAPSHOT version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1213816 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:18:37 +00:00
Brett Porter a75e5d3977 create an empty temp directory rather than using a dummy file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1201580 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 02:37:18 +00:00
Olivier Lamy dd986c1a8b [MRM-1552] Perm-Gen space exception on MAC using the wrapper
add a default to  -XX:MaxPermSize=128m to wrapper.conf

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1199338 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 16:49:07 +00:00
Olivier Lamy 52b31a8ee9 m not needed for memory settings in wrapper.conf
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198794 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 16:16:29 +00:00
Olivier Lamy 4c10128a3a [MRM-815] aggregate indices for repository groups.
add a sys props in wrapper.conf for ttl value.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198648 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 08:30:06 +00:00
Olivier Lamy 0f6f9dfa4a [MRM-1549] add some initial memory setup in wrapper.conf
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198647 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 08:29:53 +00:00
Olivier Lamy 5dbee3276e add basic memory settings in jetty wrapper distrib
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198643 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 08:28:33 +00:00
Olivier Lamy 0da6ef6d8c [MRM-1548] configure a java.io.tmpdir in ./temp for jetty distrib
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198293 13f79535-47bb-0310-9956-ffa450edef68
2011-11-06 09:02:03 +00:00
Olivier Lamy 54ad5a2835 upgrade commons-dbcp and commons-pool
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189975 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:54:59 +00:00
Olivier Lamy 438c37f0d3 [MRM-1539] Upgrade to Jetty 7
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189909 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 18:11:45 +00:00
Olivier Lamy e624d21c43 [MRM-1539] Upgrade to Jetty 7.
change pom declaration.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189902 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 18:09:49 +00:00
Olivier Lamy 16f136486b move javax.mail version to a property
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189230 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 14:19:57 +00:00
Olivier Lamy e77de4841f move the derby version to a property
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189229 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 14:19:14 +00:00
Olivier Lamy 33776a4920 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185622 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 12:26:11 +00:00
Olivier Lamy ccd7d803f7 [maven-release-plugin] prepare release archiva-1.4-M1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185616 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 12:19:44 +00:00
Olivier Lamy d9df6e4404 move antrun version to pluginManagement section
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178320 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 07:44:01 +00:00
Brett Porter 3c20054f1d update version to 1.4-M1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178021 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 15:38:32 +00:00
Brett Porter 67c31e023d upgrade to new appassembler plugin version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177885 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 02:27:38 +00:00
Brett Porter c46aede9c8 formatting only
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1174598 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 08:53:17 +00:00
Brett Porter 3445922612 update licenses and send in RAT
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1161440 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 08:42:50 +00:00
Olivier Lamy 7c018c68ed fix some warning when building with maven3
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103901 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 21:26:54 +00:00