Skip to content

Commit 02fd7e6

Browse files
chore: maven enforce and fixes (#191)
Moved enforcer-plugin configuration under pluginManagement and enabled inheritance. This ensures consistent enforcement rules across all modules in the project. fix CVE-2024-7254 --------- Co-authored-by: David Mihalcik <[email protected]>
1 parent 57e5a34 commit 02fd7e6

File tree

4 files changed

+47
-19
lines changed

4 files changed

+47
-19
lines changed

.github/workflows/checks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
35-
- uses: bufbuild/buf-setup-action@382440cdb8ec7bc25a68d7b4711163d95f7cc3aa
35+
- uses: bufbuild/buf-setup-action@2211e06e8cf26d628cda2eea15c95f8c42b080b3
3636
with:
3737
github_token: ${{ secrets.GITHUB_TOKEN }}
3838
- name: Set up JDK
@@ -53,7 +53,7 @@ jobs:
5353
steps:
5454
- name: Checkout Java SDK
5555
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
56-
- uses: bufbuild/buf-setup-action@382440cdb8ec7bc25a68d7b4711163d95f7cc3aa
56+
- uses: bufbuild/buf-setup-action@2211e06e8cf26d628cda2eea15c95f8c42b080b3
5757
with:
5858
github_token: ${{ secrets.GITHUB_TOKEN }}
5959
- name: Set up JDK

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
3434
- name: Setup Buf
35-
uses: bufbuild/buf-setup-action@382440cdb8ec7bc25a68d7b4711163d95f7cc3aa
35+
uses: bufbuild/buf-setup-action@2211e06e8cf26d628cda2eea15c95f8c42b080b3
3636
with:
3737
github_token: ${{ secrets.GITHUB_TOKEN }}
3838
# stage maven profile

pom.xml

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<maven.compiler.source>11</maven.compiler.source>
1616
<maven.compiler.target>11</maven.compiler.target>
1717
<log4j.version>2.20.0</log4j.version>
18-
<grpc.version>1.63.0</grpc.version>
18+
<grpc.version>1.68.0</grpc.version>
1919
<protobuf.version>3.25.3</protobuf.version>
2020
<sslcontext.version>8.3.5</sslcontext.version>
2121
</properties>
@@ -110,6 +110,36 @@
110110
<version>${grpc.version}</version>
111111
<scope>runtime</scope>
112112
</dependency>
113+
<dependency>
114+
<groupId>com.google.errorprone</groupId>
115+
<artifactId>error_prone_annotations</artifactId>
116+
<version>2.28.0</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>com.google.guava</groupId>
120+
<artifactId>guava</artifactId>
121+
<version>33.2.1-android</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>com.google.protobuf</groupId>
125+
<artifactId>protobuf-java</artifactId>
126+
<version>3.25.5</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.slf4j</groupId>
130+
<artifactId>slf4j-api</artifactId>
131+
<version>2.0.13</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>commons-codec</groupId>
135+
<artifactId>commons-codec</artifactId>
136+
<version>1.17.0</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.jetbrains.kotlin</groupId>
140+
<artifactId>kotlin-stdlib</artifactId>
141+
<version>1.9.23</version>
142+
</dependency>
113143
</dependencies>
114144
</dependencyManagement>
115145

@@ -156,18 +186,16 @@
156186
<version>3.0.0</version>
157187
</plugin>
158188
<plugin>
159-
<groupId>org.apache.maven.plugins</groupId>
160189
<artifactId>maven-enforcer-plugin</artifactId>
161190
<version>3.0.0</version>
162-
<configuration>
163-
<failFast>false</failFast>
164-
<rules>
165-
<dependencyConvergence/>
166-
<requireUpperBoundDeps/>
167-
<requireSameVersions/>
168-
<banDuplicatePomDependencyVersions/>
169-
</rules>
170-
</configuration>
191+
</plugin>
192+
<plugin>
193+
<artifactId>maven-resources-plugin</artifactId>
194+
<version>3.3.1</version>
195+
</plugin>
196+
<plugin>
197+
<artifactId>maven-deploy-plugin</artifactId>
198+
<version>3.1.2</version>
171199
</plugin>
172200
</plugins>
173201
</pluginManagement>
@@ -195,7 +223,7 @@
195223
<plugin>
196224
<groupId>org.apache.maven.plugins</groupId>
197225
<artifactId>maven-enforcer-plugin</artifactId>
198-
<inherited>false</inherited>
226+
<inherited>true</inherited>
199227
<configuration>
200228
<failFast>false</failFast>
201229
<rules>

sdk/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>com.google.code.gson</groupId>
4040
<artifactId>gson</artifactId>
41-
<version>2.10.1</version>
41+
<version>2.11.0</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>commons-codec</groupId>
@@ -118,7 +118,7 @@
118118
<dependency>
119119
<groupId>junit</groupId>
120120
<artifactId>junit</artifactId>
121-
<version>4.13.1</version>
121+
<version>4.13.2</version>
122122
<scope>test</scope>
123123
</dependency>
124124
<dependency>
@@ -234,14 +234,14 @@
234234
<configuration>
235235
<target>
236236
<!-- Generate OpenTDF Platform Protobuf -->
237-
<exec executable="buf" dir=".">
237+
<exec executable="buf" dir="." failOnError="true">
238238
<arg value="generate"/>
239239
<arg value="https://github.com/opentdf/platform.git#branch=main,subdir=service"/>
240240
<arg value="-o"/>
241241
<arg value="target/generated-sources"/>
242242
</exec>
243243
<!-- Generate gRPC Protobuf -->
244-
<exec executable="buf" dir=".">
244+
<exec executable="buf" dir="." failOnError="true">
245245
<arg value="generate"/>
246246
<arg value="buf.build/grpc-ecosystem/grpc-gateway"/>
247247
<arg value="-o"/>

0 commit comments

Comments
 (0)