Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue #789 where brpJavaRepack was negated #932

Merged
merged 7 commits into from
Jan 25, 2017
Merged

Fixes issue #789 where brpJavaRepack was negated #932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
115c0ed
Fixed issue #789 where brpJavaRepack was negated (set to 'false' inst…
Jan 18, 2017
5e251e8
1. Changed brpJavaRepack command to a supported flag on RPM
Jan 19, 2017
4398c25
1. Removed debug logs
Jan 19, 2017
3d87d82
Triggering rebuild.
Jan 19, 2017
77ababf
Modified RPM names to avoid race conditions and failing tests.
Jan 19, 2017
576f24d
Fixed broken tests (missing renaming in places, comments).
Jan 19, 2017
0f9d721
Updated RPM repacking description in the docs.
Jan 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/resources/com/typesafe/sbt/packager/rpm/brpJavaRepackJar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
%define __jar_repack %nil
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/packager/rpm/RpmPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ object RpmPlugin extends AutoPlugin {
rpmConflicts := Seq.empty,
rpmSetarch := None,
rpmChangelogFile := None,
rpmBrpJavaRepackJars := true,
rpmBrpJavaRepackJars := false,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The documentation regarding jar repackaging is now going to be outdated (and generally it's pointing to a blog post that no longer exists). Where is the documentation maintained?

rpmPretrans := None,
rpmPre := None,
rpmPost := None,
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/rpm/scriplets-no-javarepack-rpm/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
out.log.info(spec)
assert(
spec contains
"""sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g'""",
"""%define __jar_repack %nil""",
"Missing java repack disabling in %pre")
out.log.success("Successfully tested rpm test file")
()
Expand Down