Commit Graph

866 Commits

Author SHA1 Message Date
Olivier Lamy d1d92da751 implement merge method in merge repositories service
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387390 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 22:03:12 +00:00
Olivier Lamy 2103f2d60f finish unit test for getMergeConflictedArtifacts rest method
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387384 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 22:00:57 +00:00
Olivier Lamy f946fbed79 fix slf4j usage
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387376 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 21:56:55 +00:00
Olivier Lamy 7d99e4775b fix running legacy webapp with tomcat plugin
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387054 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 08:46:43 +00:00
skygo 7c6c74c281 more MRM-1638 fix
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1386879 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 22:25:55 +00:00
Olivier Lamy b07cc37a20 every minutes rolling file is not a good idea!
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1386622 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 14:18:19 +00:00
Olivier Lamy aaf625b997 prevent npe
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384832 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 16:03:01 +00:00
skygo df482cbb3c MRM-1515 spring test with test scope
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384754 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 13:04:18 +00:00
skygo 35c22b8182 MRM-1515 ctn'd
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384744 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 12:34:59 +00:00
skygo 47710933b7 MRM-1515
remove spring-test from war
remove jaxb   (as we are 1.6)

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384727 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 11:25:44 +00:00
Olivier Lamy c0a4d685cf remove not anymore needed file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384282 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 11:35:11 +00:00
Olivier Lamy 2c13f4ec19 fix spring context for unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384281 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 11:34:58 +00:00
Olivier Lamy 4c5c7cfa59 remove not anymore needed files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384234 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 08:40:51 +00:00
Olivier Lamy 5c9657b348 move those tests to webapp-js as there will be still valid even if we remove the legacy UI :)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384233 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 08:40:26 +00:00
Olivier Lamy fc2b1e3cc0 reduce noisy logs
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382751 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 10:46:24 +00:00
Olivier Lamy f470e3eaa6 -Pdev not anymore needed in old webapp too
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382672 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 07:37:39 +00:00
Olivier Lamy 9fd5b89f16 put log directory in a property for log4j2 files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382601 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 22:25:50 +00:00
Olivier Lamy a27fd2e2e9 [MRM-1660] use log4j2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382519 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 15:38:44 +00:00
Olivier Lamy 1377df4564 [MRM-1660] use log4j2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382518 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 15:38:26 +00:00
Olivier Lamy b3f857bd37 [MRM-1660] use log4j 2.x done for testing webapp js
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382517 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 15:37:27 +00:00
Olivier Lamy b5ff14f797 remove not anymore maintained files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1378706 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 20:34:12 +00:00
Olivier Lamy de4a2d210a add images for IndexWriter in old webapp too
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1378011 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 08:05:37 +00:00
Olivier Lamy 1c0fae86e8 remove $Id$
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1371169 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 11:36:01 +00:00
Olivier Lamy af692bcacd use StringBuilder rather than StringBuffer
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370992 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 22:10:11 +00:00
Olivier Lamy 0f89fd4db7 increase size for uploading files
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370151 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 09:08:46 +00:00
Olivier Lamy 2d64002185 remove dependency on maven tree component
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369472 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 21:28:22 +00:00
Olivier Lamy f507ef2481 use dependency tree with aether for old webapp too
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369471 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 21:27:44 +00:00
Olivier Lamy 664eea9e41 dependency tree with aether move beans to a separate new module to be able to reuse beans
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369269 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 06:56:52 +00:00
Olivier Lamy 6fa6750970 avoid multipe slf4j binding in test
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1367067 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 12:32:26 +00:00
Olivier Lamy 92875ac037 exclude from rat check
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1367066 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 12:26:28 +00:00
Olivier Lamy 94d4a270f9 remove more @version $Id:
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1357907 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 20:56:07 +00:00
Olivier Lamy 20d2ba964e remove all @version $Id$
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1357898 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 20:49:18 +00:00
Olivier Lamy a116e45603 fix some issues reported by rat check
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356459 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 20:25:06 +00:00
Olivier Lamy 9062fa612f add missing @Before
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356133 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 09:20:37 +00:00
Olivier Lamy bf52af4760 change package for those test utils
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356101 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 07:49:49 +00:00
Olivier Lamy 6a9b1752e5 use a different artifactId
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356096 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 07:40:05 +00:00
Olivier Lamy 1484a3316a [MRM-1638] Improve unit test for archiva build
Based on patch provided by Eric Barboni.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356091 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 07:36:23 +00:00
Olivier Lamy f57fc8bec7 cleanup osgi metadatas
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1354267 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 22:17:24 +00:00
Olivier Lamy d7c9b6fc24 avoid writing test files in source tree
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1354264 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 22:11:31 +00:00
Olivier Lamy 2296e073bf ensure we use correct lucene artifacts.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1353617 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 15:54:21 +00:00
Olivier Lamy f2809251dc restore backward comp for the struts webapp
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1350773 13f79535-47bb-0310-9956-ffa450edef68
2012-06-15 20:10:08 +00:00
Olivier Lamy fc0cfdb227 add the jar to download
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1350772 13f79535-47bb-0310-9956-ffa450edef68
2012-06-15 20:09:38 +00:00
Olivier Lamy e49e93a9ea fix a FIXME :-) test can run offline
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1350771 13f79535-47bb-0310-9956-ffa450edef68
2012-06-15 20:09:14 +00:00
Olivier Lamy e19ba78207 use commons io 2.2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1350768 13f79535-47bb-0310-9956-ffa450edef68
2012-06-15 20:08:42 +00:00
Olivier Lamy 235030c2bd fix download link in jsp webapp
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1349787 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 12:16:24 +00:00
Olivier Lamy 0db6c1faa2 fix unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1349786 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 12:15:50 +00:00
Olivier Lamy b0db797847 enforce we use correct jackrabbit-jcr-commons version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1349785 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 12:15:28 +00:00
Olivier Lamy 7dd7ac9983 update README file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1346796 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 09:09:30 +00:00
Olivier Lamy 1141aca7ec fix compilation failure
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1345395 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 23:47:00 +00:00
Olivier Lamy 994e72b018 artifact content view: display snapshot versions
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1343416 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 22:52:58 +00:00