Skip to content

Commit

Permalink
Update README and fix proguard
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed Aug 13, 2023
1 parent e25ada1 commit c02ead2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ cjmx is a command line JMX client intended to be used when graphical tools (e.g.
Getting cjmx
============

cjmx is available on Maven Central using groupId `com.github.cjmx` and artifactId `cjmx_2.12`. An executable JAR is published using the `app` classifier.
cjmx is available on Maven Central using groupId `com.github.cjmx` and artifactId `cjmx_3`. An executable JAR is published using the `app` classifier.

- cjmx artifacts on Maven Central: https://search.maven.org/search?q=g:com.github.cjmx
- Executable JAR using Scala 2.12: https://search.maven.org/remotecontent?filepath=com/github/cjmx/cjmx_2.12/2.8.1/cjmx_2.12-2.8.1-app.jar
- Executable JAR using Scala 3: https://search.maven.org/remotecontent?filepath=com/github/cjmx/cjmx_3/3.0.0/cjmx_3-3.0.0-app.jar

Note: Both a regular and an application JAR (with embedded dependencies and minimized) are published on Maven Central.

Building
========
To build, run `sbt publish-local`. This will build `target/scala-2.12/proguard/cjmx_2.12-2.8.1-SNAPSHOT.jar` and install a copy to your local ivy cache. Note this requires [sbt](https://www.scala-sbt.org) to be installed first.
To build, run `sbt publishLocal`. This will build `target/scala-3.3.0/proguard/cjmx_3-3.3.0-SNAPSHOT.jar` and install a copy to your local ivy cache. Note this requires [sbt](https://www.scala-sbt.org) to be installed first.

Usage
=====

Launching cjmx is done via, using Java 9+:

java -cp target/scala-2.12/proguard/cjmx_2.12-2.8.1-SNAPSHOT.jar cjmx.Main [PID]
java -cp target/scala-3.3.0/proguard/cjmx_*.jar cjmx.Main [PID]

If a PID is specified on the command line, cjmx will attempt to connect to the local JVM with that PID; otherwise, cjmx starts in a disconnected state.

Expand Down
7 changes: 3 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ libraryDependencies ++=
"org.scalatest" %% "scalatest" % "3.2.16" % "test" ::
Nil

Proguard / proguardVersion := "5.2.1"
Proguard / proguardVersion := "7.4.0-beta01"
Proguard / proguardOptions ++= Seq(
ProguardOptions.keepMain("cjmx.Main"),
"-dontobfuscate",
Expand All @@ -43,9 +43,8 @@ Proguard / proguardOptions ++= Seq(
)
Proguard / proguardInputFilter := { file =>
file.name match {
case f if f.startsWith("jansi-") => Some("!**")
case "tools.jar" => Some("!META-INF/**")
case _ => Some("!META-INF/MANIFEST.MF")
case "tools.jar" => Some("!META-INF/**")
case _ => Some("!META-INF/MANIFEST.MF")
}
}

Expand Down

0 comments on commit c02ead2

Please sign in to comment.