Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
801bfeb
build(deps): bump jaxxstorm/action-install-gh-release
dependabot[bot] Apr 28, 2025
8da8244
build(deps): bump grpcVersion from 1.57.2 to 1.72.0 in /sdk/java
dependabot[bot] May 21, 2025
8c21a4a
build(deps): bump actions/create-github-app-token from 1 to 2
dependabot[bot] Jul 16, 2025
caa3cb2
build(deps): bump github.com/hashicorp/hcl/v2 in /pkg
dependabot[bot] Jul 31, 2025
f83ca64
build(deps): bump actions/download-artifact from 4 to 5
dependabot[bot] Aug 6, 2025
14dd774
build(deps): bump org.yaml:snakeyaml from 2.3 to 2.5 in /sdk/java
dependabot[bot] Sep 1, 2025
2838e63
build(deps): bump com.google.code.gson:gson in /sdk/java
dependabot[bot] Sep 11, 2025
72c7389
build(deps): bump org.mockito:mockito-core in /sdk/java
dependabot[bot] Sep 22, 2025
d178193
build(deps): bump google.golang.org/grpc from 1.72.1 to 1.76.0 in /pkg
dependabot[bot] Oct 7, 2025
e65b91f
Merge remote-tracking branch 'origin/dependabot/go_modules/pkg/google…
iwahbe Oct 7, 2025
a452d64
Merge remote-tracking branch 'origin/dependabot/gradle/sdk/java/org.m…
iwahbe Oct 7, 2025
5ec6a22
Merge remote-tracking branch 'origin/dependabot/gradle/sdk/java/com.g…
iwahbe Oct 7, 2025
5a26b4f
Merge remote-tracking branch 'origin/dependabot/gradle/sdk/java/org.y…
iwahbe Oct 7, 2025
41cbb0b
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
iwahbe Oct 7, 2025
2dc6303
Merge remote-tracking branch 'origin/dependabot/go_modules/pkg/github…
iwahbe Oct 7, 2025
369af9e
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
iwahbe Oct 7, 2025
4803481
Merge remote-tracking branch 'origin/dependabot/gradle/sdk/java/grpcV…
iwahbe Oct 7, 2025
462749e
Merge remote-tracking branch 'origin/dependabot/github_actions/jaxxst…
iwahbe Oct 7, 2025
530ee35
Back out the Java changes
iwahbe Oct 7, 2025
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
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
with:
pulumi-version: latest
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.14.0
uses: jaxxstorm/action-install-gh-release@v2.1.0
with:
repo: pulumi/pulumictl
tag: v0.0.31
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
with:
go-version: stable
- name: Download go-binaries
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: go-binaries
path: ~/bin
Expand All @@ -162,7 +162,7 @@ jobs:
chmod a+x ~/bin/pulumi-language-java
chmod a+x ~/bin/pulumi-java-gen
- name: Download versions.txt
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: versions.txt
path: artifacts
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
${{ steps.go-cache-paths.outputs.go-mod }}
key: go-cache-test-go-${{ hashFiles('**/go.sum') }}
- name: Download Java SDK
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: java-sdk
path: ~/.m2/repository/com/pulumi
Expand Down Expand Up @@ -255,14 +255,14 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6
- name: Download versions.txt
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: versions.txt
path: artifacts
- name: Setup versioning env vars
run: cat artifacts/versions.txt | tee $GITHUB_ENV
- name: Download Java SDK
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: java-sdk
path: ~/.m2/repository/com/pulumi
Expand Down Expand Up @@ -375,14 +375,14 @@ jobs:
- name: Install Pulumi CLI
uses: pulumi/action-install-pulumi-cli@b374ceb6168550de27c6eba92e01c1a774040e11 # v2
- name: Download versions.txt
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: versions.txt
path: artifacts
- name: Setup versioning env vars
run: cat artifacts/versions.txt | tee $GITHUB_ENV
- name: Download Java SDK
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: java-sdk
path: ~/.m2/repository/com/pulumi
Expand Down Expand Up @@ -436,14 +436,14 @@ jobs:
${{ steps.go-cache-paths.outputs.go-mod }}
key: go-cache-templates-${{ hashFiles('**/go.sum') }}
- name: Download versions.txt
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: versions.txt
path: artifacts
- name: Setup versioning env vars
run: cat artifacts/versions.txt | tee $GITHUB_ENV
- name: Download Java SDK
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: java-sdk
path: ~/.m2/repository/com/pulumi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/export-repo-secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- name: Generate a GitHub token
id: generate-token
uses: actions/create-github-app-token@v1
uses: actions/create-github-app-token@v2
with:
app-id: 1256780 # Export Secrets GitHub App
private-key: ${{ secrets.EXPORT_SECRETS_PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-java-sdk-to-maven-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Fetch Tags
run: git fetch --quiet --prune --unshallow --tags
- name: Install pulumictl
uses: jaxxstorm/action-install-gh-release@v1.14.0
uses: jaxxstorm/action-install-gh-release@v2.1.0
with:
repo: pulumi/pulumictl
tag: v0.0.31
Expand Down
36 changes: 18 additions & 18 deletions pkg/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pulumi/pulumi-java/pkg

go 1.23.11
go 1.24.0

toolchain go1.24.5

Expand All @@ -11,7 +11,7 @@ replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
require (
github.com/blang/semver v3.5.1+incompatible
github.com/golang/protobuf v1.5.4
github.com/hashicorp/hcl/v2 v2.23.0
github.com/hashicorp/hcl/v2 v2.24.0
github.com/hexops/autogold/v2 v2.2.1
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v3 v3.187.0
Expand All @@ -20,14 +20,14 @@ require (
github.com/stretchr/testify v1.10.0
github.com/zclconf/go-cty v1.16.3
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
google.golang.org/grpc v1.72.1
google.golang.org/grpc v1.76.0
google.golang.org/protobuf v1.36.6
gopkg.in/yaml.v3 v3.0.1
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/compute/metadata v0.7.0 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/kms v1.15.7 // indirect
cloud.google.com/go/logging v1.9.0 // indirect
Expand Down Expand Up @@ -82,12 +82,12 @@ require (
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.13.2 // indirect
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/golang/glog v1.2.4 // indirect
github.com/golang/glog v1.2.5 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
Expand Down Expand Up @@ -165,27 +165,27 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
gocloud.dev v0.37.0 // indirect
gocloud.dev/secrets/hashivault v0.37.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/crypto v0.40.0 // indirect
golang.org/x/mod v0.25.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.33.0 // indirect
golang.org/x/tools v0.34.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.169.0 // indirect
google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
lukechampine.com/frand v1.4.2 // indirect
mvdan.cc/gofumpt v0.5.0 // indirect
Expand Down
Loading
Loading