Skip to content

Commit 6082789

Browse files
committed
rename and fix last test
1 parent fa22aac commit 6082789

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

src/sbt-test/universal/jvmopts-makeEtcDefault/build.sbt src/sbt-test/universal/application-ini-from-javaoptions/build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ name := "simple-test"
44

55
version := "0.1.0"
66

7-
javaOptions in Linux ++= Seq(
7+
javaOptions in Universal ++= Seq(
88
"-J-Xmx64m", "-J-Xms64m", "-Dproperty=true"
99
)
1010

1111
TaskKey[Unit]("check") := {
12-
val etc = (target in Universal).value / "tmp" / "etc" / "default" / name.value
13-
val content = IO.read(etc)
12+
val application = (target in Universal).value / "tmp" / "conf" / "application.ini"
13+
val content = IO.read(application)
1414
val options = (javaOptions in Linux).value
1515
options.foreach { opt =>
1616
assert(content.contains(opt), "Option [" + opt + "] is missing")
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Run the zip packaging.
2+
> stage
3+
# $ exists target/universal/tmp/conf/application.ini
4+
> check

src/sbt-test/universal/jvmopts-makeEtcDefault/test

-4
This file was deleted.

src/sphinx/archetypes/java_server/customize.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You have three options. First, you can specify your options via the ``build.sbt`
2222

2323
.. code-block :: scala
2424
25-
javaOptions in Linux ++= Seq(
25+
javaOptions in Universal ++= Seq(
2626
"-J-Xmx64m", "-J-Xms64m", "-Dproperty=true",
2727
)
2828

0 commit comments

Comments
 (0)