Commit Graph

351 Commits

Author SHA1 Message Date
Michal Srb
7c41e351e9 Merge branch 'master' into jenkins
Conflicts:
	build.bash
	javapackages-tools.spec
2015-01-08 08:35:10 +01:00
Michal Srb
d2960d49fa Update to upstream version 4.3.2 2015-01-05 17:58:01 +01:00
Mikolaj Izdebski
4104d7f80a Update to upstream version 4.3.1 2014-12-23 21:21:03 +01:00
Mikolaj Izdebski
c36174757b Remove dependency on python-six 2014-12-23 08:43:59 +01:00
Mikolaj Izdebski
32eaff6e10 Update to upstream version 4.3.0 2014-12-14 21:44:41 +01:00
Mikolaj Izdebski
aec2dc4957 Remove dependency on libxslt 2014-11-28 12:52:00 +01:00
Mikolaj Izdebski
22c439ba36 Scan lib64/ in OSGi dep generators
- Related: rhbz#1166156
2014-11-28 12:28:32 +01:00
Mikolaj Izdebski
297b18e50c Revert "Add namespace support in %mvn_artifact"
This reverts commit 8260ebcd74.

The commit which was used as a base for patch was reverted upstream.
2014-11-26 13:12:53 +01:00
Michal Srb
8260ebcd74 Add namespace support in %mvn_artifact 2014-11-24 12:08:33 +01:00
Mikolaj Izdebski
0aabe81a8e Fix OSGi provides/requires generation in Java libdir
- Resolves: rhbz#1166156
2014-11-21 06:15:35 +01:00
Michal Srb
8b7596336b Fix cache problem (Resolves: rhbz#1155185) 2014-11-12 19:07:24 +01:00
Mikolaj Izdebski
532a3d6f1c Fix path to ABRT agent DSO 2014-10-30 16:07:01 +01:00
Mikolaj Izdebski
827c3bd46f Use wrapper script to inject ABRT agent JVM argument
- Resolves: rhbz#1153652
2014-10-30 16:06:25 +01:00
Michael Simacek
2ae8a120aa Fix pom_editor missing space between xmlns declarations 2014-10-21 10:27:08 +02:00
Michal Srb
9eca9146b9 Do not generate OSGi R on eclipse-platform 2014-09-24 17:16:53 +02:00
Michal Srb
9860c4d5e3 Fix mvn_artifact: generate R, if it's not explicitly disabled 2014-09-18 14:30:26 +02:00
Michal Srb
ee8847f60a Update to upstream version 4.2.0 2014-09-09 09:27:58 +02:00
Michal Srb
b108b37922 Add R: python-six
+ fix python3 R on lxml
2014-08-25 15:49:21 +02:00
Michal Srb
90ffd39864 Remove R on java-1.8.0-openjdk-devel
java 7 is no longer in Fedora (F21+)
2014-08-20 13:28:13 +02:00
Michal Srb
1a590c32ef Add initial support for python3 2014-08-20 13:21:50 +02:00
Michal Srb
3fac015197 Backport upstream patch for maven.req 2014-07-10 15:35:00 +02:00
Michal Srb
7bb246babd Update to upstream version 4.1.0 2014-06-23 13:20:50 +02:00
Michal Srb
aff86795a7 Merge branch 'jenkins'
Conflicts:
	javapackages-tools.spec
2014-06-23 13:10:25 +02:00
Michal Srb
67dd7fb8b4 Bump version to 4.1.0 2014-06-23 13:07:46 +02:00
Michal Srb
52d1df3980 BR xmvn-resolve
Needed by tests
2014-06-23 11:21:25 +02:00
Michal Srb
eaf84163c7 Install man page for pom_change_dep 2014-06-12 10:46:57 +02:00
Michal Srb
f94bdba80c Backport fix for maven.prov 2014-06-10 16:36:57 +02:00
Michal Srb
e8641a572f Update docs 2014-06-10 08:44:27 +02:00
Dennis Gilmore
cf612e3763 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 18:30:37 -05:00
Michal Srb
ca53168970 Backport patch which adds support for "disableEffectivePom" property 2014-05-30 09:01:44 +02:00
Michal Srb
f64c6bc5f6 Add BR: javapackages-tools 2014-05-29 16:25:49 +02:00
Michal Srb
adfc4ad282 Add BR: javapackages-tools
no prov generator = no provides
2014-05-29 16:24:09 +02:00
Michal Srb
2342287380 Remove provides on com.sun:tools etc 2014-05-29 14:17:03 +02:00
Michal Srb
e2f0c5d0ec Backport patches for maven.req
- Remove com.sun:tools and sun.jdk:jconsole provides
2014-05-29 14:13:49 +02:00
Michal Srb
c30570bc47 Merge branch 'jenkins'
Conflicts:
	javapackages-tools.spec
2014-05-29 08:28:46 +02:00
Michal Srb
de1e9d7873 Apply the patch from my previous commit 2014-05-28 08:50:00 +02:00
Michal Srb
5449a7daaf Generate requires on POM artifacts with "pom" extension 2014-05-28 08:13:24 +02:00
Michal Srb
b113905566 Revert "Add BR: xmvn-resolve"
This reverts commit 104a5f088f.
2014-05-26 14:27:19 +02:00
Michal Srb
104a5f088f Add BR: xmvn-resolve
Needed by tests for req. generator
2014-05-26 14:05:49 +02:00
Michal Srb
49b72acd53 Move xmvn-subst and xmvn-install to javapacakges-local 2014-05-23 09:20:42 +02:00
Michal Srb
cc0e440305 Add javapackages-local subpackage 2014-05-21 16:01:15 +02:00
Michal Srb
47f9f68c60 Try to enable tests 2014-05-16 05:50:44 +02:00
Michal Srb
d27d04c307 Improve support for SCLs 2014-05-09 14:05:32 +02:00
Mikolaj Izdebski
9b0ad60bfb Add versioned requires on PyXB 2014-05-09 06:29:26 +02:00
Michal Srb
62767d6d0c Update requires to reflect XMvn 2.0 package split 2014-05-02 13:08:13 +02:00
Michal Srb
432bdf1107 Merge remote-tracking branch 'remotes/jenkins/javapackages-tools' into jenkins
Conflicts:
	javapackages-tools.spec
2014-05-02 12:42:33 +02:00
Michal Srb
080b72fdbd Add provides com.sun:tools and sun.jdk:jconsole 2014-04-28 12:19:21 +02:00
Mikolaj Izdebski
1274386eeb Remove BR on jpackage-utils 2014-04-25 13:52:46 +02:00
Mikolaj Izdebski
7dbdde9262 Untabify spec file 2014-04-25 13:47:32 +02:00
Michal Srb
e9c6e08858 Add spec file 2014-04-25 13:18:58 +02:00
Mikolaj Izdebski
bb05a75fea Add explicit maven-local requires on java-1.8.0-openjdk-devel 2014-04-16 15:51:34 +02:00
Stanislav Ochotnicky
b38e058ac5 Backport java-headless patches 2014-02-24 09:15:25 +01:00
Michal Srb
416c5289ba Add support for installing Maven artifacts with .hpi extension 2014-02-10 16:26:43 +01:00
Michael Simacek
7fe1488be1 Use upstream method of running tests (nosetests) 2014-01-17 14:30:07 +01:00
Mikolaj Izdebski
8c6ce60022 Add version requirements on xmvn and ivy 2014-01-16 14:42:05 +01:00
Mikolaj Izdebski
8a5ef981a7 Update to upstream version 3.5.0
- Add ivy-local subpackage
2014-01-16 14:31:39 +01:00
Mikolaj Izdebski
723c43768e Update patch for ZIP files 2014-01-07 23:31:00 +01:00
Mikolaj Izdebski
778957e61b Allow ZIP files in /usr/share/java 2014-01-07 18:43:08 +01:00
Michal Srb
575a02ed15 Update to upstream bugfix release 3.4.2 2013-12-05 13:34:40 +01:00
Mikolaj Izdebski
0d77f3a18b Add Requires on objectweb-pom 2013-12-04 08:16:10 +01:00
Stanislav Ochotnicky
7e233832ce Do not create parent dirs for pom.properties
- Resolves: rhbz#1031769
2013-11-19 12:53:29 +01:00
Stanislav Ochotnicky
7865f437c4 Update to upstream bugfix release 3.4.1 2013-11-05 17:23:43 +01:00
Mikolaj Izdebski
c8df4d2914 Move patching sources to %prep where it belongs 2013-10-21 19:10:01 +02:00
Mikolaj Izdebski
7ca24acbd2 Fix XMvn configuration for native JNI repos
- Resolves: rhbz#1021608
2013-10-21 18:53:15 +02:00
Mikolaj Izdebski
f0ee4e270e Require exact version of python-javapackages 2013-10-14 16:06:53 +02:00
Mikolaj Izdebski
08d90c7763 Update to upstream version 3.4.0 2013-10-14 15:27:23 +02:00
Mikolaj Izdebski
b876f7b17b Update to upstream version 3.3.1 2013-10-02 17:42:46 +02:00
Stanislav Ochotnicky
2648c4bf8f Update to upstream version 3.3.0 2013-10-01 09:58:18 +02:00
Stanislav Ochotnicky
274414a83e Fix installation of artifacts with classifier 2013-09-25 17:49:59 +02:00
Stanislav Ochotnicky
63043696d0 Merge branch 'master' into f20
Conflicts:
	javapackages-tools.spec
2013-09-25 15:10:54 +02:00
Stanislav Ochotnicky
95a15c4af8 Update to upstream version 3.2.4 2013-09-24 18:23:04 +02:00
Stanislav Ochotnicky
3bb5dab022 Update to upstream version 3.2.3 2013-09-24 17:44:02 +02:00
Michal Srb
8b25c64f4d Update to upstream version 3.2.2 2013-09-20 14:03:33 +02:00
Mikolaj Izdebski
65b58a8c3a Update to upstream version 3.2.1 2013-09-20 12:49:18 +02:00
Mikolaj Izdebski
3c90d1dfaa Update to upstream version 3.2.0 2013-09-20 12:05:35 +02:00
Mikolaj Izdebski
a53fe03f58 Update to upstream version 3.1.2 2013-09-20 10:02:15 +02:00
Stanislav Ochotnicky
cf998c1d5e Update to upstream version 3.1.1 2013-09-19 16:28:48 +02:00
Stanislav Ochotnicky
2eb825e859 Remove deprecated patch 2013-09-19 11:48:31 +02:00
Stanislav Ochotnicky
69e63eb3e0 Update to upstream version 3.1.0 2013-09-19 11:31:22 +02:00
Mikolaj Izdebski
718411175f Add depmap for sun.jdk:jconsole
- Resolves: rhbz#1008363
2013-09-16 11:22:18 +02:00
Mikolaj Izdebski
9603cb015c Add depmap for sun.jdk:jconsole 2013-09-16 11:11:37 +02:00
Stanislav Ochotnicky
69a88598c2 Update to upstream version 3.0.4 2013-09-16 10:09:39 +02:00
Stanislav Ochotnicky
695fc6bab5 Update to upstream version 3.0.3 2013-09-11 09:38:20 +02:00
Stanislav Ochotnicky
94434ee41b Fix a typo in temporary depmap 2013-09-10 17:20:26 +02:00
Stanislav Ochotnicky
f6051e9782 Make sure we do not provide google guice mapping 2013-09-10 16:44:04 +02:00
Stanislav Ochotnicky
cf7d1ede3b Update to upstream version 3.0.2
- Add separate python-javapackages subpackage
- Add separate fedora-review-plugin-java subpackage
- Enable part of unit tests
2013-09-10 13:35:08 +02:00
Mikolaj Izdebski
4a755d42fa Update to upstream version 2.0.1
- Fix creation of artifact aliases, resolves: rhbz#988462
2013-07-26 09:33:26 +02:00
Mikolaj Izdebski
684a38797a Require maven-resources-plugin by maven-local 2013-07-25 09:19:02 +02:00
Mikolaj Izdebski
fc0e6b6853 Add BuildRequires: asciidoc, xmlto 2013-07-18 16:00:19 +02:00
Mikolaj Izdebski
5ccbe011b7 Update to upstream version 2.0.0
Full list of changes:
  http://lists.fedoraproject.org/pipermail/java-devel/2013-July/004863.html
2013-07-18 15:46:50 +02:00
Mikolaj Izdebski
268477b364 Add R: jvnet-parent 2013-07-01 18:33:38 +02:00
Mikolaj Izdebski
68246e2431 Add more verbose changelog 2013-06-05 16:20:54 +02:00
Mikolaj Izdebski
4719c49cdb Update to upstream version 0.15.0 2013-06-05 16:10:06 +02:00
Stanislav Ochotnicky
c30abdcfcb Add several maven plugins to maven-local requires 2013-06-04 11:17:20 +02:00
Stanislav Ochotnicky
4b13008dfc Update to upstream version 0.14.1 with disabled debugging 2013-05-29 15:17:06 +02:00
Michal Srb
afcf26136d Update to upstream version 0.14.0 2013-04-09 15:33:27 +02:00
Mikolaj Izdebski
69bc26916d Add R: maven-surefire-provider-junit4 to maven-local
In older versions of maven-surefire provider-junit and provider-junit4
were separate packages; maven-local needs them both.
2013-04-08 12:32:04 +02:00
Mikolaj Izdebski
965ccd9733 Update to upstream version 0.13.7 2013-03-22 10:24:01 +01:00
Mikolaj Izdebski
a50d6ad30f Add geronimo-parent-poms to common POMs
Geronimo-parent-poms is required by geronimo-annotation, which is
required by cdi-api, which is required by sisu, which is required by
maven itself.  Everytime Maven is used in local mode
geronimo-parent-poms is required.
2013-03-20 14:29:49 +01:00
Mikolaj Izdebski
775fe6195b Add weld-parent to common POMs
Weld-parent is required by cdi-api, which is required by sisu, which
is required by maven itself.  Everytime Maven is used in local mode
weld-parent is required.
2013-03-20 13:15:34 +01:00
Stanislav Ochotnicky
60456923a2 Fix conditional macro to evaluate properly when fedora is not defined 2013-03-20 11:34:09 +01:00
Mikolaj Izdebski
baea553650 Update to upstream version 0.13.6 2013-03-18 10:31:37 +01:00
Mikolaj Izdebski
53153367d2 Update to upstream version 0.13.5 2013-03-13 18:32:56 +01:00
Mikolaj Izdebski
e0acb39d09 Update to upstream version 0.13.4 2013-03-13 16:35:30 +01:00
Mikolaj Izdebski
50fadb1bba Update to upstream version 0.13.3 2013-03-12 14:51:52 +01:00
Mikolaj Izdebski
f3e81f70cd Update to upstream version 0.13.2 2013-03-07 09:53:13 +01:00
Mikolaj Izdebski
b7753cc6e9 Update to upstream version 0.13.1 2013-03-07 07:53:15 +01:00
Mikolaj Izdebski
3030f95aea Update to upstream version 0.13.0 2013-03-06 16:57:12 +01:00
Mikolaj Izdebski
7f52b35a37 Upate to upstream pre-release snapshot 2f13366 2013-03-06 13:12:23 +01:00
Mikolaj Izdebski
389cff6cc3 Remove fragment file from %files 2013-03-04 14:38:23 +01:00
Mikolaj Izdebski
3501be5739 Update to upstream version 0.12.6
- Resolves: rhbz#917618 (remove jetty orbit provides)
- Resolves: rhbz#917647 (system.bundle into autogenerated deps)
2013-03-04 14:16:32 +01:00
Stanislav Ochotnicky
b7c707f00e Update to upstream version 0.12.5
- Resolves problems with compat package provides and automatic requires
2013-03-01 16:19:39 +01:00
Mikolaj Izdebski
ca0f043457 Don't mark RPM macro files as configuration
See: https://fedorahosted.org/fpc/ticket/259
2013-02-27 18:44:41 +01:00
Mikolaj Izdebski
686bd18a1b Update to upstream version 0.12.4
- Resolves: rhbz#913630 (versioned requires between subpackages)
2013-02-25 09:40:07 +01:00
Mikolaj Izdebski
3c02e9e0c7 Update to upstream version 0.12.3
- Resolves: rhbz#913694 (No plugin found for prefix 'X')
2013-02-22 14:38:20 +01:00
Mikolaj Izdebski
9d5faa4d4e Update to upstream version 0.12.2
- Resolves: rhbz#913120 (MAVEN_OPTS are not passed to Maven)
2013-02-20 13:51:21 +01:00
Mikolaj Izdebski
1778d6c27e Update to upstream version 0.12.1
- Resolves: rhbz#912333 (M2_HOME is not exported)
2013-02-18 14:52:17 +01:00
Mikolaj Izdebski
b086e34c36 Update to upstream version 0.12.0
- Implement new pom macros: xpath_replace and xpath_set
- Remove Support-local-depmaps.patch (accepted upstream)
2013-02-15 15:34:41 +01:00
Mikolaj Izdebski
1341320e2a Support local depmaps 2013-02-15 13:54:56 +01:00
Mikolaj Izdebski
7417026979 Add some maven-local Requires for convenience 2013-02-14 09:44:26 +01:00
Mikolaj Izdebski
af149cca3d Add missing R: httpcomponents-project 2013-02-07 18:09:52 +01:00
Mikolaj Izdebski
dbb075ae16 Add missing R: jboss-patent 2013-02-07 16:58:11 +01:00
Mikolaj Izdebski
64f841d5b2 Don't install mvn-local and mvn-rpmbuild on F18 2013-02-06 09:51:24 +01:00
Mikolaj Izdebski
793c4f2b95 Update to upstream version 0.11.2 2013-01-30 12:35:29 +01:00
Mikolaj Izdebski
fcee51c2fe Update to upstream version 0.11.1 2013-01-30 12:10:01 +01:00
Mikolaj Izdebski
4100124e22 Update to upstream version 0.11.0
- Add mvn-local and mvn-rpmbuild scripts
2013-01-23 13:58:05 +01:00
Mikolaj Izdebski
2c8409465f Update to upstream version 0.10.1 2013-01-21 17:41:45 +01:00
Mikolaj Izdebski
93b23c225e Update to upstream version 0.10.0
- Implement %xmvn_alias, %xmvn_file and %xmvn_package macros
- Fix regex in osgi.attr
- Add support for pre- and post-goals in mvn-build script
2013-01-07 19:54:59 +01:00
Mikolaj Izdebski
532db9637f Update to upstream version 0.9.1
- Resolves: rhbz#885636
2012-12-10 11:25:35 +01:00
Stanislav Ochotnicky
28ad1705b8 Update to latest upstream version
- Enable maven requires generator for xmvn packages
- Enable requires generator for javadoc packages
2012-12-06 17:51:53 +01:00
Stanislav Ochotnicky
d1209c2e03 Update to upstream version 0.8.3
- Fix maven provides generator for new XML valid fragments
2012-12-05 14:21:05 +01:00
Mikolaj Izdebski
b23eb99bc5 Update to upstream version 0.8.2 2012-11-30 14:27:26 +01:00
Mikolaj Izdebski
174c44da8e Update to upstream version 0.8.1 2012-11-30 14:06:03 +01:00
Mikolaj Izdebski
cebf6c2283 Update to upstream version 0.8.0
- Add xmvn macros
2012-11-28 15:05:14 +01:00
Mikolaj Izdebski
9659916f6f Add BR: jpackage-utils 2012-11-27 11:31:08 +01:00
Mikolaj Izdebski
a340710c5f Add maven-local subpackage 2012-11-27 11:13:17 +01:00
Stanislav Ochotnicky
842a6275be Fix versioned pom installation by quoting _jpath 2012-11-08 11:17:34 +01:00
Stanislav Ochotnicky
b9afd9aea8 Shorten maven filelist filenames 2012-10-31 17:35:56 +01:00
Mikolaj Izdebski
35e2a19712 Update to upstream version 0.7.3 2012-10-31 13:23:04 +01:00
Stanislav Ochotnicky
3591005040 Make sure add_maven_depmap fails when python tracebacks 2012-10-31 11:52:27 +01:00
Stanislav Ochotnicky
c6a85d1cdc Fix problem with exception in default add_maven_depmap invocation 2012-10-31 11:29:57 +01:00
Stanislav Ochotnicky
6cb4a9d492 Update to latest upstream
- Full support for compat depmap generation
- Generate maven-files-%{name} with a list of files to package
- Add support for maven repo generation (alpha version)
2012-10-30 15:10:49 +01:00
Stanislav Ochotnicky
2388607c5b Update to upstream version 0.6.0
- Make maven provides versioned
- Add additional pom_ macros to simplify additional pom editing
2012-07-30 15:11:54 +02:00
Stanislav Ochotnicky
a06eb784e2 Update to upstream version 0.5.0 - add support for add_maven_depmap -v 2012-07-25 10:37:53 +02:00
Dennis Gilmore
69d7b0414d - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 10:37:01 -05:00
Mikolaj Izdebski
7a341dccb3 Update to upstream version 0.4.1
- Fixes #837203
2012-07-09 14:03:26 +02:00
Mikolaj Izdebski
b8001d697b Install .pyc and .pyo files too 2012-06-27 09:32:04 +02:00
Mikolaj Izdebski
bc51e13a79 Update to upstream version 0.4.0 2012-06-27 09:16:01 +02:00
Stanislav Ochotnicky
cae47ba06f Create maven provides from fragments instead of poms 2012-03-19 13:45:19 +01:00
Stanislav Ochotnicky
e47c489d62 Fix maven_depmap installation 2012-02-16 09:20:08 +01:00
Stanislav Ochotnicky
0934dab77c Initial commit 2012-02-15 17:22:30 +01:00