Skip to content

Commit 5ab3cd8

Browse files
vishwasvaidya-cloudsufivishwasvaidya-cloudsufi
committed
Merge branch 'develop' into oracle-structsupport
# Conflicts: # oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceSchemaReader.java # oracle-plugin/src/test/java/io/cdap/plugin/oracle/OracleSchemaReaderTest.java
2 parents fe03c7b + a77e211 commit 5ab3cd8

25 files changed

Lines changed: 109 additions & 113 deletions

File tree

‎amazon-redshift-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@
9393
<artifactId>cdap-api</artifactId>
9494
<scope>provided</scope>
9595
</dependency>
96-
<dependency>
97-
<groupId>org.jetbrains</groupId>
98-
<artifactId>annotations</artifactId>
99-
<version>RELEASE</version>
100-
<scope>compile</scope>
101-
</dependency>
10296
</dependencies>
10397
<build>
10498
<plugins>

‎aurora-mysql-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
<artifactId>cdap-api</artifactId>
7878
<scope>provided</scope>
7979
</dependency>
80-
<dependency>
81-
<groupId>org.jetbrains</groupId>
82-
<artifactId>annotations</artifactId>
83-
<version>RELEASE</version>
84-
<scope>compile</scope>
85-
</dependency>
8680
</dependencies>
8781
<build>
8882
<plugins>

‎aurora-postgresql-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
<artifactId>cdap-api</artifactId>
7878
<scope>provided</scope>
7979
</dependency>
80-
<dependency>
81-
<groupId>org.jetbrains</groupId>
82-
<artifactId>annotations</artifactId>
83-
<version>RELEASE</version>
84-
<scope>compile</scope>
85-
</dependency>
8680
<dependency>
8781
<groupId>io.cdap.plugin</groupId>
8882
<artifactId>postgresql-plugin</artifactId>

‎cloudsql-mysql-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@
115115
<version>${mockito.version}</version>
116116
<scope>test</scope>
117117
</dependency>
118-
<dependency>
119-
<groupId>org.jetbrains</groupId>
120-
<artifactId>annotations</artifactId>
121-
<version>RELEASE</version>
122-
<scope>compile</scope>
123-
</dependency>
124118
<!-- https://mvnrepository.com/artifact/com.google.cloud.sql/mysql-socket-factory-connector-j-8 -->
125119
<dependency>
126120
<groupId>com.google.cloud.sql</groupId>

‎cloudsql-postgresql-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@
119119
<version>${mockito.version}</version>
120120
<scope>test</scope>
121121
</dependency>
122-
<dependency>
123-
<groupId>org.jetbrains</groupId>
124-
<artifactId>annotations</artifactId>
125-
<version>RELEASE</version>
126-
<scope>compile</scope>
127-
</dependency>
128122
<!-- https://mvnrepository.com/artifact/com.google.cloud.sql/postgres-socket-factory -->
129123
<dependency>
130124
<groupId>com.google.cloud.sql</groupId>

‎db2-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
<version>db2jcc4</version>
7878
<scope>test</scope>
7979
</dependency>
80-
<dependency>
81-
<groupId>org.jetbrains</groupId>
82-
<artifactId>annotations</artifactId>
83-
<version>RELEASE</version>
84-
<scope>compile</scope>
85-
</dependency>
8680
</dependencies>
8781
<build>
8882
<plugins>

‎generic-database-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@
7676
<artifactId>cdap-api</artifactId>
7777
<scope>provided</scope>
7878
</dependency>
79-
<dependency>
80-
<groupId>org.jetbrains</groupId>
81-
<artifactId>annotations</artifactId>
82-
<version>RELEASE</version>
83-
<scope>compile</scope>
84-
</dependency>
8579
</dependencies>
8680
<build>
8781
<plugins>

‎generic-db-argument-setter/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@
7676
<artifactId>cdap-api</artifactId>
7777
<scope>provided</scope>
7878
</dependency>
79-
<dependency>
80-
<groupId>org.jetbrains</groupId>
81-
<artifactId>annotations</artifactId>
82-
<version>RELEASE</version>
83-
<scope>compile</scope>
84-
</dependency>
8579
</dependencies>
8680
<build>
8781
<plugins>

‎mariadb-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
<version>2.7.3</version>
7878
<scope>test</scope>
7979
</dependency>
80-
<dependency>
81-
<groupId>org.jetbrains</groupId>
82-
<artifactId>annotations</artifactId>
83-
<version>RELEASE</version>
84-
<scope>compile</scope>
85-
</dependency>
8680
<dependency>
8781
<groupId>io.cdap.plugin</groupId>
8882
<artifactId>mysql-plugin</artifactId>

‎memsql-plugin/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
<artifactId>cdap-api</artifactId>
5151
<scope>provided</scope>
5252
</dependency>
53-
<dependency>
54-
<groupId>org.jetbrains</groupId>
55-
<artifactId>annotations</artifactId>
56-
<version>RELEASE</version>
57-
<scope>compile</scope>
58-
</dependency>
5953

6054
<!-- test dependencies -->
6155
<dependency>

0 commit comments

Comments
 (0)