Commit Graph

267 Commits

Author SHA1 Message Date
Mikolaj Izdebski
934536a80c Update to upstream version 3.3.0 2015-03-16 09:35:39 +01:00
Mikolaj Izdebski
622ab2139d Add objectweb-asm to plexus.core 2015-02-18 15:31:41 +01:00
Mikolaj Izdebski
5f6ae673b5 Update to upstream version 3.2.5 2015-01-19 05:42:10 +01:00
Ville Skyttä
58e6aad3e2 Fix bash completion filename
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
2014-12-07 23:21:31 +01:00
Mikolaj Izdebski
3f922b0178 Remove legacy Obsoletes/Provides for maven2 2014-10-14 09:40:50 +02:00
Mikolaj Izdebski
04b2021593 Patch accepted upstream 2014-09-30 06:10:41 +02:00
Mikolaj Izdebski
26ebec7ce0 Update patches 2014-09-29 13:36:40 +02:00
Mikolaj Izdebski
4778f3905e Mark patches merged upstream as such 2014-09-15 14:45:46 +02:00
Michal Srb
eabd943cd5 Update to upstream version 3.2.3 2014-08-22 14:48:21 +02:00
Mikolaj Izdebski
34f885c43e Update to upstream version 3.2.2 2014-06-18 18:12:24 +02:00
Dennis Gilmore
0073213b52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 03:14:42 -05:00
Mikolaj Izdebski
e6ec314292 Fix artifact pattern in %mvn_file invocation 2014-06-05 10:46:42 +02:00
Mikolaj Izdebski
bcbfde73b3 Install additional lib symlinks only for JAR files 2014-06-04 12:24:31 +02:00
Mikolaj Izdebski
a5dfcf7c00 Fix dangling symlinks in Maven lib dir
- Resolves: rhbz#1104396
2014-06-04 08:36:15 +02:00
Mikolaj Izdebski
a798258719 Clean up patches
- Add patch for MNG-5613
2014-06-02 06:44:51 +02:00
Mikolaj Izdebski
dfa1d2f92f Remove BuildRequires on maven-surefire-provider-junit4 2014-05-26 08:16:19 +02:00
Michal Srb
82e5e0b34e Add missing BR: modello-maven-plugin 2014-03-17 08:33:46 +01:00
Mikolaj Izdebski
3c589e20f6 Set logback dependency scope to provided 2014-03-07 16:29:21 +01:00
Mikolaj Izdebski
be67ebc33c Add patch for MNG-5591 2014-02-24 14:13:16 +01:00
Mikolaj Izdebski
54bf0a1db2 Fix wagon-http-shared requires 2014-02-20 20:01:15 +01:00
Mikolaj Izdebski
76d5d01be3 Migrate to Wagon subpackages
See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005132.html
2014-02-20 19:14:37 +01:00
Mikolaj Izdebski
806447efef Remove BR on plexus-containers-container-default 2014-02-20 14:22:34 +01:00
Mikolaj Izdebski
ab6a59d3d6 Update to upstream version 3.2.1 2014-02-17 10:29:03 +01:00
Mikolaj Izdebski
fd31156be4 Update to upstream version 3.2.0 2014-02-11 10:36:06 +01:00
Mikolaj Izdebski
0cc6979ba1 Read user and system config files in maven-script 2013-12-23 10:40:37 +01:00
Mikolaj Izdebski
dbd13e666c Update to Sisu 0.1.0 and Guice 3.1.6 2013-11-13 15:01:35 +01:00
Mikolaj Izdebski
ed10454bc9 Add wagon-http-shared4 to plexus.core 2013-11-08 09:54:28 +01:00
Stanislav Ochotnicky
5fa15811e9 Merge branch 'master' into f20
Conflicts:
	maven.spec
2013-11-06 10:41:57 +01:00
Mikolaj Izdebski
911334bb1e Add OrderWithRequires: xmvn
- Related: rhbz#1014355
2013-11-05 17:13:28 +01:00
Mikolaj Izdebski
5f933c9f1c Add OrderWithRequires: xmvn
- Related: rhbz#1014355
2013-11-05 17:10:31 +01:00
Mikolaj Izdebski
2287fc1338 Add explicit requires 2013-10-29 12:40:26 +01:00
Mikolaj Izdebski
9d97ab3ba5 Add dependencies of wagon-http-shaded to plexus.core
- Remove objectweb-asm from plexus.core
- Resolves: rhbz#1023872
2013-10-29 12:40:20 +01:00
Mikolaj Izdebski
995d31535b Add explicit requires 2013-10-29 12:39:34 +01:00
Mikolaj Izdebski
a104903f93 Rebuild to regenerate broken POM files
- Related: rhbz#1021484
2013-10-23 11:15:50 +02:00
Mikolaj Izdebski
81679b6327 Add dependencies of wagon-http-shaded to plexus.core
- Remove objectweb-asm from plexus.core
2013-10-21 13:48:28 +02:00
Mikolaj Izdebski
9b71af330d Update to upstream version 3.1.1 2013-10-07 10:53:22 +02:00
Mikolaj Izdebski
7eb7962e0f Synchronize JAR list in lib/ with upstream release
- Remove test dependencies on aopalliance and cglib
2013-09-23 17:08:02 +02:00
Mikolaj Izdebski
a1aa0862fe Migrate from easymock 1 to easymock 3
- Resolves: rhbz#1002432

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
2013-08-29 11:51:49 +02:00
Mikolaj Izdebski
b62e4ec0b2 Add patch for MNG-5503
- Resolves: rhbz#991454
2013-08-23 10:07:16 +02:00
Mikolaj Izdebski
e2d80ff7a5 Update Aether to 0.9.0.M3 2013-08-12 10:44:00 +02:00
Mikolaj Izdebski
1ae0bd3095 Prepare for update to Aether 0.9.0.M3 2013-08-12 10:11:01 +02:00
Mikolaj Izdebski
c58adef3dc Remove workaround for incompatible plexus-utils 2013-08-10 05:25:25 +02:00
Dennis Gilmore
0d2c6565d5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 04:21:01 -05:00
Mikolaj Izdebski
7a2c24978a Install simplelogger.properties into %{_sysconfdir} 2013-07-23 13:02:30 +02:00
Mikolaj Izdebski
e7c9c8a8e2 Add BR on logback 2013-07-23 12:13:56 +02:00
Mikolaj Izdebski
4f23e8e4e3 Update to upstream version 3.1.0 2013-07-23 10:52:07 +02:00
Mikolaj Izdebski
c6a7f715fa Use sonatype-aether symlinks 2013-07-19 14:50:11 +02:00
Mikolaj Izdebski
54c64b2941 Move bash-completion files to primary location
- Resolves: rhbz#918000
2013-05-20 15:57:54 +02:00
Mikolaj Izdebski
fd64eeb5de Add Requires on java-devel 2013-05-10 04:06:16 +02:00
Mikolaj Izdebski
4e726b5375 Remove unneeded BR: async-http-client 2013-05-10 03:57:51 +02:00
Mikolaj Izdebski
38a45557b3 BR proper aether subpackages
- Resolves: rhbz#958160
2013-05-02 05:25:18 +02:00
Mikolaj Izdebski
4015f9bca5 Add missing BuildRequires 2013-04-26 13:16:50 +02:00
Mikolaj Izdebski
138201088e Make ext/ a subdirectory of lib/ 2013-03-12 13:35:41 +01:00
Mikolaj Izdebski
62a5dbea06 In maven-script don't override M2_HOME if already set 2013-03-12 13:27:04 +01:00
Mikolaj Izdebski
a88154f287 Fix a copy-paste mistake 2013-03-01 14:00:00 +01:00
Mikolaj Izdebski
a60e276854 Update to upstream version 3.0.5
- Move settings.xml to /etc
2013-03-01 13:53:36 +01:00
Mikolaj Izdebski
02326dfb7f Remove xerces-j2 from plexus.core realm
- Resolves: rhbz#784816
2013-02-11 10:48:55 +01:00
Mikolaj Izdebski
94a213be76 Migrate BR from sisu to sisu subpackages 2013-02-07 16:31:30 +01:00
Mikolaj Izdebski
46645ff05b Remove unneeded R: maven-local
Dependency on maven-local was only temporary and
it's not needed since Fedora 19 Maven rebuild:
http://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
2013-02-06 20:08:09 +01:00
Mikolaj Izdebski
2cf4fd6a25 Drop support for local mode 2013-02-04 15:22:18 +01:00
Mikolaj Izdebski
e1deac7d72 Move mvn-local and mvn-rpmbuild out of %_bindir 2013-01-23 13:44:50 +01:00
Mikolaj Izdebski
1731c8f3ab Move some parts to maven-local package 2012-11-27 12:44:17 +01:00
Mikolaj Izdebski
c10d2c0069 Force source >= 1.5 and target >= source 2012-11-22 15:38:55 +01:00
Mikolaj Izdebski
5003b5412a Fix license tag 2012-11-19 16:18:44 +01:00
Mikolaj Izdebski
c4935d7c53 Install NOTICE file with javadoc package 2012-11-15 16:52:16 +01:00
Mikolaj Izdebski
c0f471b469 Temporarly require Plexus POMs as a workaround 2012-11-13 11:02:25 +01:00
Mikolaj Izdebski
a419043fad Drop dependency on maven2-common-poms
- Drop support for /etc/maven/fragments
2012-11-12 19:29:59 +01:00
Stanislav Ochotnicky
19395ab0e3 Add support for custom jar/pom/fragment directories 2012-11-09 13:26:13 +01:00
Mikolaj Izdebski
0ae689d405 Remove all slf4j providers except nop from maven realm 2012-11-08 16:00:41 +01:00
Mikolaj Izdebski
f81e79ae5a Add aopalliance and cglib to maven-model-builder test dependencies 2012-11-01 13:37:49 +01:00
Mikolaj Izdebski
31522b39fe Add objectweb-asm to classpath 2012-11-01 11:25:59 +01:00
Mikolaj Izdebski
b35ff7a5fc Add aopalliance to classpath 2012-11-01 10:14:19 +01:00
Mikolaj Izdebski
c9e849a077 Don't exho in maven-script
- Add bash completion for -Dproject.build.sourceEncoding
2012-10-31 14:59:45 +01:00
Mikolaj Izdebski
a44a678f8e Add a few bash completion goals 2012-10-29 13:48:03 +01:00
Stanislav Ochotnicky
08f0efa43c Enable test skipping patch only for local mode (#869399) 2012-10-24 10:32:57 +02:00
Stanislav Ochotnicky
4ee764f3d3 Make sure we look for requested pom file and not resolved 2012-10-19 09:39:08 +02:00
Stanislav Ochotnicky
a7133ac4fa Look into maven.repo.local first to handle corner-case packages (#865599)
- Finish handling of compatibility packages
2012-10-18 18:20:34 +02:00
Mikolaj Izdebski
4e46797c53 Disable animal-sniffer on RHEL 2012-08-27 14:17:46 +02:00
Stanislav Ochotnicky
6456c72388 Fix exit code of mvn-rpmbuild outside of mock
- Make sure we look for original asked-for version first
  version variable can be overwritten later in the function so we make
  sure to use the original value
2012-07-25 10:40:34 +02:00
Mikolaj Izdebski
7d259eee4b Run redundant dependency checks only in mock 2012-07-23 18:37:28 +02:00
Mikolaj Izdebski
5856826cc4 Add manual page
Manpage was created using help2man and then tweaked manually.
2012-07-17 18:32:12 +02:00
Mikolaj Izdebski
d1265ccd6f Implement experimental dependency checking 2012-06-12 16:22:51 +02:00
Krzysztof Daniel
544b33ba4e Bug 824789 - Use the version if it is possible. 2012-05-24 15:03:34 +02:00
Stanislav Ochotnicky
c45bdfa272 Use Obsoletes instead of Conflicts 2012-05-14 13:57:27 +02:00
Stanislav Ochotnicky
058da9b05b Obsolete and provide maven2 2012-05-14 10:19:19 +02:00
Stanislav Ochotnicky
dd1a604bed Make package noarch again to simplify bootstrapping 2012-03-30 14:15:46 +02:00
Stanislav Ochotnicky
7dbeeb52a2 Make javadoc noarch
- Make compilation source level 1.5
2012-02-10 14:21:31 +01:00
Stanislav Ochotnicky
341ded3b4d Alphabetize BRs/Rs and add xmlunit to BRs 2012-01-31 15:55:00 +01:00
Stanislav Ochotnicky
cbb4efd11d Update to latest upstream version 2012-01-31 15:55:00 +01:00
Dennis Gilmore
c6a6cf4321 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 03:22:41 -06:00
Stanislav Ochotnicky
14cb0d553e Add common poms to BR as well 2011-12-13 14:40:35 +01:00
Stanislav Ochotnicky
bc14a55bee Add maven2-common-poms to Requires 2011-12-13 14:16:28 +01:00
Stanislav Ochotnicky
fdef3da767 Provide mvn script now instead of maven2
- Conflict with older versions of maven2
2011-10-11 12:53:56 +02:00
Stanislav Ochotnicky
61f66c0070 Fix test scope skipping 2011-09-08 14:31:03 +02:00
Stanislav Ochotnicky
082f1a5705 Remove unnecessary deps causing problems from lib/
- Add utf-8 source encoding patch
2011-08-22 16:23:24 +02:00
Ville Skyttä
d29bb36052 Bump and rebuild for post-3.0.3-11 commit: Disable debug package creation 2011-07-30 20:44:29 +03:00
Stanislav Ochotnicky
04aab49ee7 Disable debug package creation 2011-07-28 16:44:13 +02:00
Stanislav Ochotnicky
e48a64d229 Change to arch specific since we are using _libdir for _jnidir 2011-07-28 15:32:13 +02:00
Stanislav Ochotnicky
3ace7c298b Add bash completion (#706856) 2011-07-26 16:08:34 +02:00
Stanislav Ochotnicky
b755aadc15 Add resolving from jnidir and java-jni 2011-07-04 14:25:55 +02:00
Stanislav Ochotnicky
2aea90da84 Add maven-parent to BR/R 2011-06-23 17:22:27 +02:00
Stanislav Ochotnicky
1d63307f52 Process fragments in alphabetical order 2011-06-22 17:06:41 +02:00
Stanislav Ochotnicky
3b2966e851 Fix handling of fallback default_poms
- Add empty-dep into maven package to not require maven2 version
2011-06-22 12:03:54 +02:00
Stanislav Ochotnicky
a170a2aaad Resolve poms also from /usr/share/maven-poms
This will enable us to move fragments from etc
2011-06-10 11:17:07 +02:00
Stanislav Ochotnicky
bdbc16d2c1 Process fragments directly instead of maven2-depmap.xml
Fragments are also expected in /usr/share/maven-fragments where they
should be moved (backward compat preserved for now).

Big changes are due to reformatting to use spaces (sorry, cleaner
log/diff in separate resolver repo)
2011-06-10 10:33:20 +02:00
Stanislav Ochotnicky
70f23c4306 Add help to mvn-rpmbuild and mvn-local (rhbz#710448) 2011-06-06 10:34:24 +02:00
Stanislav Ochotnicky
2caba3e6ac Improve and clean up depmap handling for m2/m3 repos 2011-05-10 13:40:59 +02:00
Stanislav Ochotnicky
abf9b4a49a Enable MAVEN_OPTS override in scripts 2011-04-18 10:20:16 +02:00
Stanislav Ochotnicky
49f4ff0cb6 Update to 3.0.3
- Add ext subdirectory to lib
2011-03-04 14:02:08 +01:00
Stanislav Ochotnicky
9667d78a30 Update to 3.0.3rc1
- Enable tests again
2011-03-01 15:06:46 +01:00
Stanislav Ochotnicky
f5501c5008 Added mvn-rpmbuild script to be used in spec files
- mvn-local is now mixed mode (online with javadir priority)
- Changed mvn.jpp to mvn.local
2011-02-10 12:06:47 +01:00
Stanislav Ochotnicky
6839257333 Update to latest version (3.0.2)
- Ignore test failures temporarily
2011-01-28 17:12:57 +01:00
Stanislav Ochotnicky
0f96b0570c Fix bug #669034
this is mostly just a workaround for 669034. Seems like
plexus-container-default has some quirks that cause it to lose
version so it's set to null. Needs more looking into to fix it
properly.
2011-01-12 16:57:07 +01:00
Stanislav Ochotnicky
680881b48d Fix #667625 #667614 and #667636
- Install maven metadata so they are not downloaded when mvn is run (667625)

  repo-metadata.tar.xz will have to be updated as additional plugins need new metadata

- Make sure JavadirWorkspaceReader is used when building model (patch update)

  Needed because WorkspaceReader is not used early when building mvn project
  and this causes problems

- JavadirWorkspaceReader doesn't pretend to resolve non-existent artifacts anymore

  Instead it returns null (artifact not found) so that reactor/local resolver can work as expected
2011-01-12 11:05:29 +01:00
Stanislav Ochotnicky
0cc48e02a3 Rename mvn3-local to mvn-local
- rename patch to be sequential from git format-patch
2011-01-11 14:57:59 +01:00
Stanislav Ochotnicky
1ae9fb1553 Add fedora local resolver
- Fix quoting of arguments to mvn scripts
- Add javadoc subpackage
- Make jars versionless and remove unneeded clean section
2010-12-21 15:45:43 +01:00
Stanislav Ochotnicky
91ffb10ecc Initial version of the package 2010-12-03 15:38:46 +01:00