Skip to content

Commit 261de95

Browse files
committed
Credit @hacki11 for the contribution, and improve docs for new feature.
1 parent a5f8c46 commit 261de95

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- Added `addBuildSrc()` method to Oomph configuration.
66
- Bump bndlib from `3.4.0` to `3.5.0`.
7+
- `p2asmaven` now supports [slicing options](https://wiki.eclipse.org/Equinox/p2/Ant_Tasks#SlicingOptions) thanks to [@hacki11](https://github.com/hacki11). ([#41](https://github.com/diffplug/goomph/pull/41))
78

89
### Version 3.8.1 - October 13th 2017 ([javadoc](http://diffplug.github.io/goomph/javadoc/3.8.1/), [jcenter](https://bintray.com/diffplug/opensource/goomph/3.8.1/view))
910

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Below is an index of Goomph's capabilities, along with links to the javadoc wher
117117
* Thanks to Stefan Oehme for his feedback on Goomph's design.
118118
* Thanks to Neil Fraser of Google for [diff-match-patch](https://code.google.com/p/google-diff-match-patch/) which is very helpful for testing.
119119
* Thanks to Thipor Kong for his [handy windows cmdline length workaround for the classpath](https://discuss.gradle.org/t/javaexec-fails-for-long-classpaths-on-windows/15266).
120+
* Thanks to [hacki11](https://github.com/hacki11) for [slicingOptions in p2asmaven](https://github.com/diffplug/goomph/pull/41).
120121
* Formatted by [spotless](https://github.com/diffplug/spotless).
121122
* Bugs found by [findbugs](http://findbugs.sourceforge.net/).
122123
* Built by [gradle](http://gradle.org/).

src/main/java/com/diffplug/gradle/p2/AsMavenPlugin.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,22 @@
117117
*
118118
* If you think this is too hard, vote for [this issue on GitHub](https://github.com/diffplug/goomph/issues/12)
119119
* and [this bug on eclipse](https://bugs.eclipse.org/bugs/show_bug.cgi?id=382875) and we can make it easier.
120+
*
121+
* ## Slicing options
122+
*
123+
* You can control how the iu's are resolved using
124+
*
125+
* ```groovy
126+
* p2AsMaven {
127+
* group 'eclipse-deps', {
128+
* ...
129+
* slicingOption 'latestVersionOnly', 'true'
130+
* }
131+
* }
132+
* ```
120133
*
134+
* You can see all the available slicing options [here](https://wiki.eclipse.org/Equinox/p2/Ant_Tasks#SlicingOptions).
135+
*
121136
* ## Acknowledgements and comparisons to other options
122137
*
123138
* Inspired by Andrey Hihlovskiy's [unpuzzle](https://github.com/akhikhl/unpuzzle).

src/main/java/com/diffplug/gradle/p2/P2Model.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ public void addArtifactRepoBundlePool() {
162162
addArtifactRepo(GoomphCacheLocations.bundlePool());
163163
}
164164

165+
/** https://wiki.eclipse.org/Equinox/p2/Ant_Tasks#SlicingOptions */
165166
public void addSlicingOption(String option, String value) {
166167
slicingOptions.put(option, value);
167168
}

0 commit comments

Comments
 (0)