Skip to content

Commit d849fc9

Browse files
committed
[CARBONDATA-141] Polish pom.xml files, use Apache parent POM and cleanup the Maven coordinates This closes apache#62
2 parents 29f9cf2 + 61d4b43 commit d849fc9

File tree

10 files changed

+567
-457
lines changed

10 files changed

+567
-457
lines changed

assembly/pom.xml

+38-32
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
2-
~ Licensed to the Apache Software Foundation (ASF) under one
3-
~ or more contributor license agreements. See the NOTICE file
4-
~ distributed with this work for additional information
5-
~ regarding copyright ownership. The ASF licenses this file
6-
~ to you under the Apache License, Version 2.0 (the
7-
~ "License"); you may not use this file except in compliance
8-
~ with the License. You may obtain a copy of the License at
9-
~
10-
~ http://www.apache.org/licenses/LICENSE-2.0
11-
~
12-
~ Unless required by applicable law or agreed to in writing,
13-
~ software distributed under the License is distributed on an
14-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
~ KIND, either express or implied. See the License for the
16-
~ specific language governing permissions and limitations
17-
~ under the License.
18-
-->
19-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
2020
<modelVersion>4.0.0</modelVersion>
21-
<groupId>org.carbondata</groupId>
22-
<artifactId>carbon-assembly</artifactId>
23-
<packaging>pom</packaging>
24-
<name>CarbonData Assembly</name>
21+
2522
<parent>
26-
<groupId>org.carbondata</groupId>
27-
<version>0.1.0-SNAPSHOT</version>
23+
<groupId>org.apache.carbondata</groupId>
2824
<artifactId>carbondata-parent</artifactId>
25+
<version>0.1.0-incubating-SNAPSHOT</version>
2926
<relativePath>../pom.xml</relativePath>
3027
</parent>
28+
29+
<artifactId>carbondata-assembly</artifactId>
30+
<packaging>pom</packaging>
31+
<name>Apache CarbonData :: Assembly</name>
32+
3133
<properties>
3234
<carbondata.jar.dir>scala-${scala.binary.version}</carbondata.jar.dir>
3335
<carbondata.jar.basename>carbondata_${scala.binary.version}-${project.version}-shade-hadoop${hadoop.version}.jar</carbondata.jar.basename>
3436
<carbondata.jar>${project.build.directory}/${carbondata.jar.dir}/${carbondata.jar.basename}</carbondata.jar>
3537
<dev.path>${basedir}/../dev</dev.path>
3638
</properties>
39+
3740
<dependencies>
3841
<dependency>
39-
<groupId>org.carbondata</groupId>
40-
<artifactId>carbon-common</artifactId>
42+
<groupId>org.apache.carbondata</groupId>
43+
<artifactId>carbondata-common</artifactId>
4144
<version>${project.version}</version>
4245
</dependency>
4346
<dependency>
44-
<groupId>org.carbondata</groupId>
45-
<artifactId>carbon-core</artifactId>
47+
<groupId>org.apache.carbondata</groupId>
48+
<artifactId>carbondata-core</artifactId>
4649
<version>${project.version}</version>
4750
</dependency>
4851
<dependency>
49-
<groupId>org.carbondata</groupId>
50-
<artifactId>carbon-processing</artifactId>
52+
<groupId>org.apache.carbondata</groupId>
53+
<artifactId>carbondata-processing</artifactId>
5154
<version>${project.version}</version>
5255
</dependency>
5356
<dependency>
54-
<groupId>org.carbondata</groupId>
55-
<artifactId>carbon-spark</artifactId>
57+
<groupId>org.apache.carbondata</groupId>
58+
<artifactId>carbondata-spark</artifactId>
5659
<version>${project.version}</version>
5760
</dependency>
5861
</dependencies>
62+
5963
<build>
6064
<plugins>
6165
<plugin>
@@ -121,6 +125,7 @@
121125
</plugin>
122126
</plugins>
123127
</build>
128+
124129
<profiles>
125130
<profile>
126131
<id>provided</id>
@@ -170,4 +175,5 @@
170175
</build>
171176
</profile>
172177
</profiles>
178+
173179
</project>

common/pom.xml

+28-24
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
2-
~ Licensed to the Apache Software Foundation (ASF) under one
3-
~ or more contributor license agreements. See the NOTICE file
4-
~ distributed with this work for additional information
5-
~ regarding copyright ownership. The ASF licenses this file
6-
~ to you under the Apache License, Version 2.0 (the
7-
~ "License"); you may not use this file except in compliance
8-
~ with the License. You may obtain a copy of the License at
9-
~
10-
~ http://www.apache.org/licenses/LICENSE-2.0
11-
~
12-
~ Unless required by applicable law or agreed to in writing,
13-
~ software distributed under the License is distributed on an
14-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
~ KIND, either express or implied. See the License for the
16-
~ specific language governing permissions and limitations
17-
~ under the License.
18-
-->
19-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
2020
<modelVersion>4.0.0</modelVersion>
21-
<groupId>org.carbondata</groupId>
22-
<artifactId>carbon-common</artifactId>
23-
<packaging>jar</packaging>
24-
<name>CarbonData Common</name>
21+
2522
<parent>
26-
<groupId>org.carbondata</groupId>
27-
<version>0.1.0-SNAPSHOT</version>
23+
<groupId>org.apache.carbondata</groupId>
2824
<artifactId>carbondata-parent</artifactId>
25+
<version>0.1.0-incubating-SNAPSHOT</version>
2926
<relativePath>../pom.xml</relativePath>
3027
</parent>
28+
29+
<artifactId>carbondata-common</artifactId>
30+
<name>Apache CarbonData :: Common</name>
31+
3132
<properties>
3233
<dev.path>${basedir}/../dev</dev.path>
3334
</properties>
35+
3436
<dependencies>
3537
<dependency>
3638
<groupId>log4j</groupId>
@@ -50,6 +52,7 @@
5052
<artifactId>hadoop-common</artifactId>
5153
</dependency>
5254
</dependencies>
55+
5356
<build>
5457
<sourceDirectory>src/main/java</sourceDirectory>
5558
<testSourceDirectory>src/test/java</testSourceDirectory>
@@ -63,4 +66,5 @@
6366
</plugin>
6467
</plugins>
6568
</build>
69+
6670
</project>

core/pom.xml

+35-30
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
2-
~ Licensed to the Apache Software Foundation (ASF) under one
3-
~ or more contributor license agreements. See the NOTICE file
4-
~ distributed with this work for additional information
5-
~ regarding copyright ownership. The ASF licenses this file
6-
~ to you under the Apache License, Version 2.0 (the
7-
~ "License"); you may not use this file except in compliance
8-
~ with the License. You may obtain a copy of the License at
9-
~
10-
~ http://www.apache.org/licenses/LICENSE-2.0
11-
~
12-
~ Unless required by applicable law or agreed to in writing,
13-
~ software distributed under the License is distributed on an
14-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
~ KIND, either express or implied. See the License for the
16-
~ specific language governing permissions and limitations
17-
~ under the License.
18-
-->
19-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
2020
<modelVersion>4.0.0</modelVersion>
21-
<groupId>org.carbondata</groupId>
22-
<artifactId>carbon-core</artifactId>
23-
<packaging>jar</packaging>
24-
<name>CarbonData Core</name>
21+
2522
<parent>
26-
<groupId>org.carbondata</groupId>
27-
<version>0.1.0-SNAPSHOT</version>
23+
<groupId>org.apache.carbondata</groupId>
2824
<artifactId>carbondata-parent</artifactId>
25+
<version>0.1.0-incubating-SNAPSHOT</version>
2926
<relativePath>../pom.xml</relativePath>
3027
</parent>
28+
29+
<artifactId>carbondata-core</artifactId>
30+
<name>Apache CarbonData :: Core</name>
31+
3132
<properties>
3233
<dev.path>${basedir}/../dev</dev.path>
3334
</properties>
35+
3436
<repositories>
3537
<repository>
3638
<id>pentaho-releases</id>
3739
<url>http://repository.pentaho.org/artifactory/repo/</url>
3840
</repository>
3941
</repositories>
42+
4043
<dependencies>
4144
<dependency>
42-
<groupId>org.carbondata</groupId>
43-
<artifactId>carbon-format</artifactId>
45+
<groupId>org.apache.carbondata</groupId>
46+
<artifactId>carbondata-format</artifactId>
4447
<version>${project.version}</version>
4548
</dependency>
4649
<dependency>
47-
<groupId>org.carbondata</groupId>
48-
<artifactId>carbon-common</artifactId>
50+
<groupId>org.apache.carbondata</groupId>
51+
<artifactId>carbondata-common</artifactId>
4952
<version>${project.version}</version>
5053
</dependency>
5154
<dependency>
@@ -94,8 +97,8 @@
9497
<artifactId>spark-sql_${scala.binary.version}</artifactId>
9598
</dependency>
9699
<dependency>
97-
<groupId>org.carbondata</groupId>
98-
<artifactId>carbon-format</artifactId>
100+
<groupId>org.apache.carbondata</groupId>
101+
<artifactId>carbondata-format</artifactId>
99102
<version>${project.version}</version>
100103
</dependency>
101104
<dependency>
@@ -110,6 +113,7 @@
110113
</exclusions>
111114
</dependency>
112115
</dependencies>
116+
113117
<build>
114118
<sourceDirectory>src/main/java</sourceDirectory>
115119
<testSourceDirectory>src/test/java</testSourceDirectory>
@@ -131,4 +135,5 @@
131135
</plugin>
132136
</plugins>
133137
</build>
138+
134139
</project>

0 commit comments

Comments
 (0)