Repository: tajo Updated Branches: refs/heads/master 89e8fa3b8 -> fe8103552
TAJO-517: Publish Tajo jar to a public maven repository. (hyunsik) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/fe810355 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/fe810355 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/fe810355 Branch: refs/heads/master Commit: fe8103552bb737a8085242ae67ba00732601287b Parents: 89e8fa3 Author: Hyunsik Choi <[email protected]> Authored: Wed Apr 23 12:17:23 2014 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Wed Apr 23 12:17:40 2014 +0900 ---------------------------------------------------------------------- CHANGES | 2 + pom.xml | 126 +++++++++++++++++-- tajo-algebra/pom.xml | 24 ---- tajo-catalog/pom.xml | 36 ++---- tajo-catalog/tajo-catalog-client/pom.xml | 24 ---- tajo-catalog/tajo-catalog-common/pom.xml | 24 ---- tajo-catalog/tajo-catalog-drivers/pom.xml | 6 + tajo-client/pom.xml | 24 ---- tajo-common/pom.xml | 24 ---- tajo-core/pom.xml | 40 +++--- .../src/main/resources/assemblies/tajo-src.xml | 54 ++++++++ tajo-project/pom.xml | 24 ++-- tajo-rpc/pom.xml | 24 ---- tajo-storage/pom.xml | 24 ---- tajo-yarn-pullserver/pom.xml | 24 ---- 15 files changed, 221 insertions(+), 259 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 0180821..ce3e4b3 100644 --- a/CHANGES +++ b/CHANGES @@ -673,6 +673,8 @@ Release 0.8.0 - unreleased TASKS + TAJO-517: Publish Tajo jar to a public maven repository. (hyunsik) + TAJO-788: Update Tajo documentation and README, and BUILDING. (hyunsik) TAJO-752: Escalate sub modules in tajo-core into the top-level modules. http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 53df599..db160e1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,11 @@ <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";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>14</version> + </parent> <groupId>org.apache.tajo</groupId> <artifactId>tajo-main</artifactId> <version>0.8.0-SNAPSHOT</version> @@ -51,17 +56,12 @@ <scm> <url>https://git-wip-us.apache.org/repos/asf/tajo.git</url> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/tajo.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/tajo.git</developerConnection> </scm> <repositories> <repository> - <id>apache.snapshots</id> - <url>http://repository.apache.org/snapshots</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> <id>eclipse-jetty</id> <url>http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-distribution/</url> <snapshots> @@ -87,9 +87,9 @@ <module>tajo-catalog</module> <module>tajo-client</module> <module>tajo-jdbc</module> - <module>tajo-dist</module> <module>tajo-storage</module> <module>tajo-yarn-pullserver</module> + <module>tajo-dist</module> </modules> <build> @@ -97,6 +97,11 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> <version>2.15</version> <configuration> @@ -116,7 +121,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0</version> + <version>1.3.1</version> <configuration> <rules> <requireMavenVersion> @@ -129,6 +134,10 @@ </configuration> </plugin> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <version>2.5</version> @@ -382,5 +391,104 @@ <module>tajo-docs</module> </modules> </profile> + <profile> + <id>apache-release</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <!-- + Create a source-release artifact that contains the fully buildable + project directory source structure. This is the artifact which is + the official subject of any release vote. + --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.4</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <finalName>tajo-${project.version}-src</finalName> + <descriptorRefs> + <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef> + </descriptorRefs> + <descriptors> + <descriptor>tajo-dist/src/main/resources/assemblies/tajo-src.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> + <!-- + We want to deploy the artifact to a staging location for perusal + --> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- + We want to sign the artifact, the POM, and all attached artifacts + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <configuration> + <passphrase>${gpg.passphrase}</passphrase> + <useAgent>${gpg.useagent}</useAgent> + </configuration> + <executions> + <execution> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-algebra/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-algebra/pom.xml b/tajo-algebra/pom.xml index dea4727..0d5f5c3 100644 --- a/tajo-algebra/pom.xml +++ b/tajo-algebra/pom.xml @@ -132,30 +132,6 @@ </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dist</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-catalog/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/pom.xml b/tajo-catalog/pom.xml index 37d62ad..d979eed 100644 --- a/tajo-catalog/pom.xml +++ b/tajo-catalog/pom.xml @@ -49,6 +49,18 @@ <artifactId>maven-surefire-report-plugin</artifactId> <version>2.15</version> </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + </configuration> + </plugin> </plugins> </build> @@ -81,30 +93,6 @@ </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dist</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-catalog/tajo-catalog-client/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-client/pom.xml b/tajo-catalog/tajo-catalog-client/pom.xml index 66664d4..9cccd6b 100644 --- a/tajo-catalog/tajo-catalog-client/pom.xml +++ b/tajo-catalog/tajo-catalog-client/pom.xml @@ -167,30 +167,6 @@ </plugins> </build> </profile> - <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> <reporting> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-catalog/tajo-catalog-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/pom.xml b/tajo-catalog/tajo-catalog-common/pom.xml index 233079d..a02b652 100644 --- a/tajo-catalog/tajo-catalog-common/pom.xml +++ b/tajo-catalog/tajo-catalog-common/pom.xml @@ -183,30 +183,6 @@ </plugins> </build> </profile> - <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> <reporting> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-catalog/tajo-catalog-drivers/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/pom.xml b/tajo-catalog/tajo-catalog-drivers/pom.xml index 97b8062..92b922a 100644 --- a/tajo-catalog/tajo-catalog-drivers/pom.xml +++ b/tajo-catalog/tajo-catalog-drivers/pom.xml @@ -42,6 +42,12 @@ <artifactId>maven-surefire-report-plugin</artifactId> <version>2.15</version> </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-client/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-client/pom.xml b/tajo-client/pom.xml index 5662678..029c74f 100644 --- a/tajo-client/pom.xml +++ b/tajo-client/pom.xml @@ -261,30 +261,6 @@ </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>tajo-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dist</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-common/pom.xml b/tajo-common/pom.xml index f334380..010d734 100644 --- a/tajo-common/pom.xml +++ b/tajo-common/pom.xml @@ -242,30 +242,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>tajo-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dist</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-core/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml index f90e089..8adbc87 100644 --- a/tajo-core/pom.xml +++ b/tajo-core/pom.xml @@ -72,9 +72,23 @@ </configuration> </plugin> <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>2.3.1</version> + <configuration> + <excludes> + <exclude>LICENSE</exclude> + </excludes> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + </configuration> <executions> <execution> <phase>package</phase> @@ -399,30 +413,6 @@ </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>hcatalog-0.12.0</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-dist/src/main/resources/assemblies/tajo-src.xml ---------------------------------------------------------------------- diff --git a/tajo-dist/src/main/resources/assemblies/tajo-src.xml b/tajo-dist/src/main/resources/assemblies/tajo-src.xml new file mode 100644 index 0000000..0ec81d7 --- /dev/null +++ b/tajo-dist/src/main/resources/assemblies/tajo-src.xml @@ -0,0 +1,54 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> + <id>tajo-src</id> + <formats> + <format>tar.gz</format> + <format>tar.bz2</format> + <format>zip</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>.</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <!-- exclude only developer files --> + <exclude>.reviewboardrc</exclude> + <exclude>request-patch-review.py</exclude> + + <exclude>.git/**</exclude> + <exclude>**/.gitignore</exclude> + <exclude>**/.svn</exclude> + <exclude>**/*.iws</exclude> + <exclude>**/*.ipr</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.project</exclude> + <exclude>**/.settings</exclude> + <exclude>.idea/**</exclude> + <exclude>**/target/**</exclude> + <exclude>*.patch</exclude> + <exclude>atlassian-ide-plugin.xml</exclude> + <exclude>**/*.log</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-project/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml index cf0d538..57fc2a5 100644 --- a/tajo-project/pom.xml +++ b/tajo-project/pom.xml @@ -315,13 +315,6 @@ <repositories> <repository> - <id>apache.snapshots</id> - <url>http://repository.apache.org/snapshots</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> <id>eclipse-jetty</id> <url>http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-distribution/</url> <snapshots> @@ -1005,10 +998,23 @@ <executions> <execution> <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> + <id>tajo-java-sources</id> <phase>package</phase> <goals> - <goal>jar-no-fork</goal> + <goal>test-jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>dist-enforce</id> + <phase>package</phase> + <goals> + <goal>enforce</goal> </goals> </execution> </executions> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-rpc/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-rpc/pom.xml b/tajo-rpc/pom.xml index 839e3e0..8c267d2 100644 --- a/tajo-rpc/pom.xml +++ b/tajo-rpc/pom.xml @@ -197,30 +197,6 @@ </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>tajo-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dist</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-storage/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-storage/pom.xml b/tajo-storage/pom.xml index 6f552f3..4098237 100644 --- a/tajo-storage/pom.xml +++ b/tajo-storage/pom.xml @@ -332,30 +332,6 @@ </build> </profile> <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>tajo-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>dist</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/tajo/blob/fe810355/tajo-yarn-pullserver/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-yarn-pullserver/pom.xml b/tajo-yarn-pullserver/pom.xml index 7c760ec..2fbea77 100644 --- a/tajo-yarn-pullserver/pom.xml +++ b/tajo-yarn-pullserver/pom.xml @@ -114,30 +114,6 @@ </plugins> </build> </profile> - <profile> - <id>src</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> <reporting>
