Skip to content

Commit 2cb900c

Browse files
stotystoty
committed
PHOENIX-6140 Update connectors maven configuration
update to apache parent 23 update versions/remove redundant version tags remove obsolete maven-eclipse-plugin fix up javadoc errors udpate dependencies to pass dependecy:analyze convert code to thirdparty guava reformat poms to use 2 spaces indents as per maven style guide remove github workflows test config file
1 parent 7a0f920 commit 2cb900c

File tree

42 files changed

+2236
-2525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2236
-2525
lines changed

‎.github/workflows/maven.yml

-20
This file was deleted.

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# eclipse stuffs
1111
.settings/*
12-
*/.settings/
12+
**/.settings/
1313
.classpath
1414
.project
1515
*/.externalToolBuilders
@@ -28,3 +28,5 @@ RESULTS/
2828
CSV_EXPORT/
2929
.DS_Store
3030

31+
#test files
32+
derby.log

‎phoenix-connectors-phoenix4-compat/pom.xml

+39-59
Original file line numberDiff line numberDiff line change
@@ -20,64 +20,44 @@
2020
2121
-->
2222
<project xmlns="http://maven.apache.org/POM/4.0.0"
23-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25-
<parent>
26-
<groupId>org.apache</groupId>
27-
<artifactId>apache</artifactId>
28-
<version>23</version>
29-
</parent>
30-
<modelVersion>4.0.0</modelVersion>
31-
<version>6.0.0-SNAPSHOT</version>
32-
33-
<groupId>org.apache.phoenix</groupId>
34-
<artifactId>phoenix-connectors-phoenix4-compat</artifactId>
35-
<name>Compatibility util for Phoenix 4</name>
36-
37-
<properties>
38-
<phoenix.version>4.15.0-HBase-1.4</phoenix.version>
39-
<hbase.version>1.4.0</hbase.version>
40-
</properties>
41-
42-
<build>
43-
<plugins>
44-
<!-- Setup eclipse -->
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-eclipse-plugin</artifactId>
48-
<version>2.9</version>
49-
<configuration>
50-
<buildcommands>
51-
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
52-
</buildcommands>
53-
</configuration>
54-
</plugin>
55-
<plugin>
56-
<groupId>org.apache.rat</groupId>
57-
<artifactId>apache-rat-plugin</artifactId>
58-
</plugin>
59-
</plugins>
60-
</build>
61-
62-
<dependencies>
63-
<!-- HBase dependencies -->
64-
<dependency>
65-
<groupId>org.apache.hbase</groupId>
66-
<artifactId>hbase-client</artifactId>
67-
<version>${hbase.version}</version>
68-
<scope>provided</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.apache.hbase</groupId>
72-
<artifactId>hbase-common</artifactId>
73-
<version>${hbase.version}</version>
74-
<scope>provided</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.apache.hbase</groupId>
78-
<artifactId>hbase-server</artifactId>
79-
<version>${hbase.version}</version>
80-
</dependency>
81-
</dependencies>
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25+
<parent>
26+
<groupId>org.apache</groupId>
27+
<artifactId>apache</artifactId>
28+
<version>23</version>
29+
</parent>
30+
<modelVersion>4.0.0</modelVersion>
31+
<version>6.0.0-SNAPSHOT</version>
32+
33+
<groupId>org.apache.phoenix</groupId>
34+
<artifactId>phoenix-connectors-phoenix4-compat</artifactId>
35+
<name>Compatibility util for Phoenix 4</name>
36+
37+
<properties>
38+
<phoenix.version>4.15.0-HBase-1.4</phoenix.version>
39+
<hbase.version>1.4.0</hbase.version>
40+
</properties>
41+
42+
<dependencies>
43+
<!-- HBase dependencies -->
44+
<dependency>
45+
<groupId>org.apache.hbase</groupId>
46+
<artifactId>hbase-client</artifactId>
47+
<version>${hbase.version}</version>
48+
<scope>provided</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.hbase</groupId>
52+
<artifactId>hbase-common</artifactId>
53+
<version>${hbase.version}</version>
54+
<scope>provided</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.apache.hbase</groupId>
58+
<artifactId>hbase-server</artifactId>
59+
<version>${hbase.version}</version>
60+
</dependency>
61+
</dependencies>
8262

8363
</project>

‎phoenix-connectors-phoenix5-compat/pom.xml

+36-56
Original file line numberDiff line numberDiff line change
@@ -20,65 +20,45 @@
2020
2121
-->
2222
<project xmlns="http://maven.apache.org/POM/4.0.0"
23-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25-
<parent>
26-
<groupId>org.apache</groupId>
27-
<artifactId>apache</artifactId>
28-
<version>23</version>
29-
</parent>
30-
<modelVersion>4.0.0</modelVersion>
31-
<version>6.0.0-SNAPSHOT</version>
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25+
<parent>
26+
<groupId>org.apache</groupId>
27+
<artifactId>apache</artifactId>
28+
<version>23</version>
29+
</parent>
30+
<modelVersion>4.0.0</modelVersion>
31+
<version>6.0.0-SNAPSHOT</version>
3232

33-
<groupId>org.apache.phoenix</groupId>
34-
<artifactId>phoenix-connectors-phoenix5-compat</artifactId>
35-
<name>Compatibility util for Phoenix 5</name>
33+
<groupId>org.apache.phoenix</groupId>
34+
<artifactId>phoenix-connectors-phoenix5-compat</artifactId>
35+
<name>Compatibility util for Phoenix 5</name>
3636

37-
<properties>
38-
<phoenix.version>5.1.0-SNAPSHOT</phoenix.version>
39-
<hbase.version>2.1.9</hbase.version>
40-
</properties>
37+
<properties>
38+
<phoenix.version>5.1.0-SNAPSHOT</phoenix.version>
39+
<hbase.version>2.1.9</hbase.version>
40+
</properties>
4141

42-
<build>
43-
<plugins>
44-
<!-- Setup eclipse -->
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-eclipse-plugin</artifactId>
48-
<version>2.9</version>
49-
<configuration>
50-
<buildcommands>
51-
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
52-
</buildcommands>
53-
</configuration>
54-
</plugin>
55-
<plugin>
56-
<groupId>org.apache.rat</groupId>
57-
<artifactId>apache-rat-plugin</artifactId>
58-
</plugin>
59-
</plugins>
60-
</build>
42+
<dependencies>
43+
<!-- HBase dependencies -->
44+
<dependency>
45+
<groupId>org.apache.hbase</groupId>
46+
<artifactId>hbase-client</artifactId>
47+
<version>${hbase.version}</version>
48+
<scope>provided</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.hbase</groupId>
52+
<artifactId>hbase-common</artifactId>
53+
<version>${hbase.version}</version>
54+
<scope>provided</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.apache.hbase</groupId>
58+
<artifactId>hbase-mapreduce</artifactId>
59+
<version>${hbase.version}</version>
60+
</dependency>
6161

62-
<dependencies>
63-
<!-- HBase dependencies -->
64-
<dependency>
65-
<groupId>org.apache.hbase</groupId>
66-
<artifactId>hbase-client</artifactId>
67-
<version>${hbase.version}</version>
68-
<scope>provided</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.apache.hbase</groupId>
72-
<artifactId>hbase-common</artifactId>
73-
<version>${hbase.version}</version>
74-
<scope>provided</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.apache.hbase</groupId>
78-
<artifactId>hbase-mapreduce</artifactId>
79-
<version>${hbase.version}</version>
80-
</dependency>
81-
82-
</dependencies>
62+
</dependencies>
8363

8464
</project>

‎phoenix-flume-base/phoenix4-flume/pom.xml

+35-36
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,40 @@
2020
2121
-->
2222
<project xmlns="http://maven.apache.org/POM/4.0.0"
23-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25-
<parent>
26-
<artifactId>phoenix-flume-base</artifactId>
27-
<groupId>org.apache.phoenix</groupId>
28-
<version>6.0.0-SNAPSHOT</version>
29-
</parent>
30-
<modelVersion>4.0.0</modelVersion>
31-
32-
<artifactId>phoenix4-flume</artifactId>
33-
<name>Phoenix Flume Connector for Phoenix 4</name>
34-
35-
<dependencies>
36-
<dependency>
37-
<groupId>org.apache.phoenix</groupId>
38-
<artifactId>phoenix-connectors-phoenix4-compat</artifactId>
39-
</dependency>
40-
</dependencies>
41-
42-
<build>
43-
<plugins>
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-failsafe-plugin</artifactId>
47-
</plugin>
48-
<plugin>
49-
<groupId>org.codehaus.mojo</groupId>
50-
<artifactId>build-helper-maven-plugin</artifactId>
51-
</plugin>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-resources-plugin</artifactId>
55-
</plugin>
56-
</plugins>
57-
</build>
58-
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25+
<parent>
26+
<artifactId>phoenix-flume-base</artifactId>
27+
<groupId>org.apache.phoenix</groupId>
28+
<version>6.0.0-SNAPSHOT</version>
29+
</parent>
30+
<modelVersion>4.0.0</modelVersion>
31+
32+
<artifactId>phoenix4-flume</artifactId>
33+
<name>Phoenix Flume Connector for Phoenix 4</name>
34+
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.apache.phoenix</groupId>
38+
<artifactId>phoenix-connectors-phoenix4-compat</artifactId>
39+
</dependency>
40+
</dependencies>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-failsafe-plugin</artifactId>
47+
</plugin>
48+
<plugin>
49+
<groupId>org.codehaus.mojo</groupId>
50+
<artifactId>build-helper-maven-plugin</artifactId>
51+
</plugin>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-resources-plugin</artifactId>
55+
</plugin>
56+
</plugins>
57+
</build>
5958

6059
</project>

0 commit comments

Comments
 (0)