Skip to content

Commit

Permalink
Update versions, cap (and reorder) CHANGELOG, add script for 0.10.0-p…
Browse files Browse the repository at this point in the history
…re4 final.
  • Loading branch information
swaldman committed Feb 23, 2024
1 parent 2d2e250 commit 4643934
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 15 deletions.
25 changes: 13 additions & 12 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
-- Support SOURCE_DATE_EPOCH for deterministic builds.
(Here and in mchange-commons-java.)
See https://github.com/swaldman/c3p0/issues/163
https://reproducible-builds.org/docs/source-date-epoch/
https://github.com/swaldman/mchange-commons-java/commit/09480482ddde70b98baf8437e66c5e3bba9ae3e2
Thanks Bernhard M. Wiedemann!
-- Eliminate support for traditional reflective proxies.
-- Fix bad anchor in docs, thanks Hakan!
-- Relicense to allow users to opt for LGPL-2.1 or later, rather than LGPL-2.1-only.
(Here and in mchange-commons-java.)
See https://github.com/swaldman/c3p0/issues/133
Thanks Bernhard E. Reiter!
c3p0-0.10.0-pre4
-- Define (in a separate, Java 21, project) a loom virtual-threads based
TaskRunnerFactory, VirtualThreadPerTaskExecutorTaskRunnerFactory.
See https://github.com/swaldman/c3p0-loom
Expand All @@ -25,6 +14,18 @@
-- Define TaskRunnerFactory, and config param TaskRunnerFactoryClassName.
Users can provide implementations of TaskRunnerFactory with a public no-arg
constructor to take full control of threading, thread-pooling, etc.
-- Support SOURCE_DATE_EPOCH for deterministic builds.
(Here and in mchange-commons-java.)
See https://github.com/swaldman/c3p0/issues/163
https://reproducible-builds.org/docs/source-date-epoch/
https://github.com/swaldman/mchange-commons-java/commit/09480482ddde70b98baf8437e66c5e3bba9ae3e2
Thanks Bernhard M. Wiedemann!
-- Eliminate support for traditional reflective proxies.
-- Fix bad anchor in docs, thanks Hakan!
-- Relicense to allow users to opt for LGPL-2.1 or later, rather than LGPL-2.1-only.
(Here and in mchange-commons-java.)
See https://github.com/swaldman/c3p0/issues/133
Thanks Bernhard E. Reiter!
c3p0-0.10.0-pre3
-- Have build fail if we try to build with an unexpected JVM version.
We want to use a consistent JVM version (currently 11) and target version (currently 7)
Expand Down
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import scala.annotation.tailrec

object Dependency {
// mill-build/build.sc also has a mchange-commons-java dependency. Best to keep them in sync
val MchangeCommonsJavaVersion = "0.3.0-SNAPSHOT"
val MchangeCommonsJavaVersion = "0.3.0"

val MchangeCommonsJava = ivy"com.mchange:mchange-commons-java:${MchangeCommonsJavaVersion}"
val JUnit = ivy"org.junit.vintage:junit-vintage-engine:5.10.2"
Expand All @@ -20,7 +20,7 @@ object Dependency {
object c3p0 extends RootModule with JavaModule with PublishModule {
val organization = "com.mchange"
override def artifactName = T{"c3p0"}
override def publishVersion = T{"0.10.0-pre4-SNAPSHOT"}
override def publishVersion = T{"0.10.0-pre4"}

// we are currently building in Java 11, but releasing Java 7 compatible class files
// for users of smaller JDBC subsets
Expand Down
2 changes: 1 addition & 1 deletion mill-build/build.sc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import mill._, scalalib._

object Dependency {
val MchangeCommonsJava = ivy"com.mchange:mchange-commons-java:0.3.0-SNAPSHOT"
val MchangeCommonsJava = ivy"com.mchange:mchange-commons-java:0.3.0"
}

object millbuild extends MillBuildRootModule {
Expand Down
40 changes: 40 additions & 0 deletions publishSigned
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/usr/bin/env -S scala-cli shebang

// this is modified from my usual script to only publish the root module.
// for now, we are only publishing c3p0-test locally.

// expects SONATYPE_USERNAME and SONATYPE_PASSWORD to be set prior to running!

val console = System.console()
if (console == null) {
System.err.println("Could not initialize system console. Exiting.")
System.exit(1)
}

val sonatypeUsername = System.getenv("SONATYPE_USERNAME")
val sonatypePassword = System.getenv("SONATYPE_PASSWORD")
if (sonatypeUsername == null) {
System.err.println(s"Environment variable 'SONATYPE_USERNAME' not set. Exiting.")
System.exit(1)
}
if (sonatypePassword == null) {
System.err.println(s"Environment variable 'SONATYPE_PASSWORD' not set. Exiting.")
System.exit(1)
}

val gpgPassphrase = console.readPassword("Please enter GPG passphrase for signing: ")

def millBinary( local : Boolean ) =
(if local then "./" else "") + "mill"

val useLocal = (new java.io.File( millBinary(true) )).exists()

val argsPreparsed = Seq(
millBinary( useLocal ), "mill.scalalib.PublishModule/publishAll", "publishArtifacts",
"--sonatypeCreds", s"${sonatypeUsername}:${sonatypePassword}",
"--gpgArgs", s"--passphrase=${new String(gpgPassphrase)},--batch,--yes,-a,-b,--no-tty,--pinentry-mode=loopback",
"--release", "false"
)

import scala.sys.process._
argsPreparsed.!

0 comments on commit 4643934

Please sign in to comment.