Skip to content

Commit 8172e08

Browse files
123-komal123-komal
authored
Merge branch 'release/4.11' into snapshot-removal-6111
2 parents a44fc91 + 820890c commit 8172e08

File tree

12 files changed

+336
-97
lines changed

12 files changed

+336
-97
lines changed

‎.github/workflows/e2e.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ name: Build e2e tests
1616

1717
on:
1818
push:
19-
branches: [ develop ]
19+
branches: [ develop, release/* ]
2020
pull_request:
21-
branches: [ develop ]
22-
types: [ opened, synchronize, reopened ]
21+
branches: [ develop, release/*]
22+
types: [opened, synchronize, reopened, labeled]
2323
workflow_dispatch:
2424

2525
jobs:
@@ -35,7 +35,9 @@ jobs:
3535
if: >
3636
github.event_name == 'workflow_dispatch'
3737
|| github.event_name == 'push'
38-
|| github.event_name == 'pull_request'
38+
|| (contains(github.event.pull_request.labels.*.name, 'build')
39+
&& (github.event.action != 'labeled' || github.event.label.name == 'build')
40+
)
3941
strategy:
4042
matrix:
4143
module: [wrangler-transform]
@@ -63,6 +65,7 @@ jobs:
6365
with:
6466
repository: cdapio/cdap-e2e-tests
6567
path: e2e
68+
ref: release/6.11
6669

6770
- name: Cache
6871
uses: actions/cache@v4

‎pom.xml‎

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,6 @@
6060
<tag>HEAD</tag>
6161
</scm>
6262

63-
<distributionManagement>
64-
<repository>
65-
<id>sonatype.release</id>
66-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
67-
</repository>
68-
<snapshotRepository>
69-
<id>sonatype.snapshots</id>
70-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
71-
</snapshotRepository>
72-
</distributionManagement>
73-
7463
<issueManagement>
7564
<url>https://issues.cask.co/browse/CDAP</url>
7665
</issueManagement>
@@ -83,7 +72,7 @@
8372
<aws.sdk.version>1.11.133</aws.sdk.version>
8473
<bigquery.connector.hadoop2.version>0.10.2-hadoop2</bigquery.connector.hadoop2.version>
8574
<bouncycastle.version>1.56</bouncycastle.version>
86-
<cdap.version>6.11.0-SNAPSHOT</cdap.version>
75+
<cdap.version>6.11.1-SNAPSHOT</cdap.version>
8776
<chlorine.version>1.1.5</chlorine.version>
8877
<commons.validator.version>1.6</commons.validator.version>
8978
<commons-io.version>2.5</commons-io.version>
@@ -126,19 +115,9 @@
126115
</properties>
127116

128117
<repositories>
129-
<repository>
130-
<id>sonatype</id>
131-
<url>https://oss.sonatype.org/content/groups/public</url>
132-
<releases>
133-
<enabled>true</enabled>
134-
</releases>
135-
<snapshots>
136-
<enabled>false</enabled>
137-
</snapshots>
138-
</repository>
139118
<repository>
140119
<id>sonatype-snapshots</id>
141-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
120+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
142121
<releases>
143122
<enabled>false</enabled>
144123
</releases>
@@ -387,26 +366,14 @@
387366
</plugin>
388367

389368
<plugin>
390-
<groupId>org.apache.maven.plugins</groupId>
391-
<artifactId>maven-release-plugin</artifactId>
392-
<version>2.5.3</version>
393-
<configuration>
394-
<tag>v${releaseVersion}</tag>
395-
<tagNameFormat>v@{project.version}</tagNameFormat>
396-
<autoVersionSubmodules>true</autoVersionSubmodules>
397-
<!-- releaseProfiles configuration will actually force a Maven profile
398-
– the `releases` profile – to become active during the Release process. -->
399-
<releaseProfiles>releases</releaseProfiles>
400-
</configuration>
401-
</plugin>
402-
<plugin>
403-
<groupId>org.sonatype.plugins</groupId>
404-
<artifactId>nexus-staging-maven-plugin</artifactId>
405-
<version>1.6.2</version>
369+
<groupId>org.sonatype.central</groupId>
370+
<artifactId>central-publishing-maven-plugin</artifactId>
371+
<version>0.8.0</version>
406372
<extensions>true</extensions>
407373
<configuration>
408-
<nexusUrl>https://oss.sonatype.org</nexusUrl>
409-
<serverId>sonatype.release</serverId>
374+
<publishingServerId>sonatype.release</publishingServerId>
375+
<autoPublish>false</autoPublish>
376+
<ignorePublishedComponents>true</ignorePublishedComponents>
410377
</configuration>
411378
</plugin>
412379
</plugins>
@@ -547,7 +514,7 @@
547514
<dependency>
548515
<groupId>io.cdap.tests.e2e</groupId>
549516
<artifactId>cdap-e2e-framework</artifactId>
550-
<version>0.4.0-SNAPSHOT</version>
517+
<version>0.4.0</version>
551518
<scope>test</scope>
552519
</dependency>
553520

‎wrangler-proto/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
<artifactId>cdap-etl-api</artifactId>
3737
<version>${cdap.version}</version>
3838
</dependency>
39+
<dependency>
40+
<groupId>io.cdap.cdap</groupId>
41+
<artifactId>cdap-proto</artifactId>
42+
<version>${cdap.version}</version>
43+
</dependency>
3944
<dependency>
4045
<groupId>io.cdap.wrangler</groupId>
4146
<artifactId>wrangler-api</artifactId>

‎wrangler-proto/src/main/java/io/cdap/wrangler/proto/id/WorkspaceEntityId.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright © 2025 Cask Data, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package io.cdap.wrangler.proto.id;
17+
18+
import io.cdap.cdap.proto.id.SystemAppEntityId;
19+
20+
/**
21+
* Uniquely identifies a dataprep.workspace entity
22+
*/
23+
public class WorkspaceEntityId extends SystemAppEntityId {
24+
public WorkspaceEntityId(String namespace, String workspaceId) {
25+
super(namespace, "dataprep", "workspace", workspaceId);
26+
}
27+
}

‎wrangler-service/pom.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@
122122
<groupId>com.amazonaws</groupId>
123123
<artifactId>aws-java-sdk-s3</artifactId>
124124
<version>${aws.sdk.version}</version>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>com.fasterxml.jackson.core</groupId>
128+
<artifactId>jackson-databind</artifactId>
129+
</exclusion>
130+
</exclusions>
125131
</dependency>
126132
<dependency>
127133
<groupId>com.google.cloud</groupId>
@@ -266,8 +272,10 @@
266272
<Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>
267273
<Embed-Transitive>true</Embed-Transitive>
268274
<Embed-Directory>lib</Embed-Directory>
269-
<!-- So that user plugins can depend on Directive.java and other classes, for user-defined directives -->
270-
<_exportcontents>io.cdap.wrangler.api.*</_exportcontents>
275+
<!-- So that user plugins can depend on Directive.java, EL.java and other classes, for user-defined directives -->
276+
<_exportcontents>
277+
io.cdap.wrangler.api.*,io.cdap.wrangler.expression.*
278+
</_exportcontents>
271279
</instructions>
272280
</configuration>
273281
<executions>

‎wrangler-service/src/main/java/io/cdap/wrangler/service/common/AbstractWranglerHandler.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.cdap.cdap.api.service.http.HttpServiceRequest;
2323
import io.cdap.cdap.api.service.http.HttpServiceResponder;
2424
import io.cdap.cdap.api.service.worker.RemoteExecutionException;
25+
import io.cdap.cdap.security.spi.authorization.UnauthorizedException;
2526
import io.cdap.cdap.spi.data.transaction.TransactionRunners;
2627
import io.cdap.wrangler.api.RecipeException;
2728
import io.cdap.wrangler.dataset.connections.ConnectionNotFoundException;
@@ -215,6 +216,8 @@ protected void respond(HttpServiceResponder responder, String namespace,
215216
} catch (RemoteExecutionException e) {
216217
responder.sendJson(getErrorCode(e.getCause().getRemoteExceptionClassName()),
217218
new io.cdap.wrangler.proto.workspace.v2.ServiceResponse<>(e.getMessage()));
219+
} catch (UnauthorizedException e) {
220+
responder.sendJson(e.getStatusCode(), new io.cdap.wrangler.proto.workspace.v2.ServiceResponse<>(e.getMessage()));
218221
} catch (Throwable t) {
219222
responder.sendJson(HttpURLConnection.HTTP_INTERNAL_ERROR,
220223
new io.cdap.wrangler.proto.workspace.v2.ServiceResponse<>((t.getMessage())));

0 commit comments

Comments
 (0)