knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject git commit: Release prep cleanup of poms.
Date Fri, 29 Mar 2013 22:01:42 GMT
Updated Branches:
  refs/heads/master 128e4613c -> d99d680ef


Release prep cleanup of poms.


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/d99d680e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/d99d680e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/d99d680e

Branch: refs/heads/master
Commit: d99d680ef1d8cb8f53c07c65f3a52bfa4027547a
Parents: 128e461
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Fri Mar 29 18:01:34 2013 -0400
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Fri Mar 29 18:01:34 2013 -0400

----------------------------------------------------------------------
 build.xml                     |   14 ++-
 gateway-release/home/README   |    2 +-
 gateway-release/pom.xml       |  117 ++++++++++---------
 gateway-util-launcher/pom.xml |   11 ++-
 pom.xml                       |  232 ++++++++++++++++++------------------
 5 files changed, 198 insertions(+), 178 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d99d680e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index dac9db6..f4b184f 100644
--- a/build.xml
+++ b/build.xml
@@ -57,10 +57,20 @@
         </exec>
     </target>
 
-    <target name="package" depends="init" description="Build the product.">
+    <target name="verify" depends="package" description="Perform the verification build."/>
+    <target name="package" depends="init" description="Build and package the product.">
         <exec executable="${mvn.cmd}">
+            <arg value="-Prelease"/>
             <arg value="clean"/>
-            <arg value="package"/>
+            <arg value="install"/>
+        </exec>
+    </target>
+
+    <target name="daily" depends="init" description="Perform the daily build.">
+        <exec executable="${mvn.cmd}">
+            <arg value="-Panalyze"/>
+            <arg value="-Prelease"/>
+            <arg value="site"/>
         </exec>
     </target>
 

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d99d680e/gateway-release/home/README
----------------------------------------------------------------------
diff --git a/gateway-release/home/README b/gateway-release/home/README
index 3d496d6..a3cb194 100644
--- a/gateway-release/home/README
+++ b/gateway-release/home/README
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------------
-README file for Hadoop Gateway
+README file for Apache Knox Gateway
 ------------------------------------------------------------------------------
 This distribution includes cryptographic software.  The country in 
 which you currently reside may have restrictions on the import, 

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d99d680e/gateway-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 79b3df3..7289778 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -37,62 +37,67 @@
         </license>
     </licenses>
 
-    <build>
-        <plugins>
-            <plugin>
-                <inherited>false</inherited>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <id>binary</id>
-                        <phase>package</phase>
-                        <goals><goal>single</goal></goals>
-                        <configuration>
-                            <finalName>${gateway-artifact}-${gateway-version}</finalName>
-                            <outputDirectory>../target</outputDirectory>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals><goal>run</goal></goals>
-                        <configuration>
-                            <tasks>
-                                <checksum algorithm="MD5" fileext=".md5">
-                                    <fileset dir="../target">
-                                        <include name="*.zip" />
-                                        <include name="*.tar.gz" />
-                                    </fileset>
-                                </checksum>
-                                <checksum algorithm="SHA1" fileext=".sha">
-                                    <fileset dir="../target">
-                                        <include name="*.zip" />
-                                        <include name="*.tar.gz" />
-                                    </fileset>
-                                </checksum>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>1.8.1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <inherited>false</inherited>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.4</version>
+                        <executions>
+                            <execution>
+                                <id>binary</id>
+                                <phase>package</phase>
+                                <goals><goal>single</goal></goals>
+                                <configuration>
+                                    <finalName>${gateway-artifact}-${gateway-version}</finalName>
+                                    <outputDirectory>../target</outputDirectory>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <descriptors>
+                                        <descriptor>src/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals><goal>run</goal></goals>
+                                <configuration>
+                                    <tasks>
+                                        <checksum algorithm="MD5" fileext=".md5">
+                                            <fileset dir="../target">
+                                                <include name="*.zip" />
+                                                <include name="*.tar.gz" />
+                                            </fileset>
+                                        </checksum>
+                                        <checksum algorithm="SHA1" fileext=".sha">
+                                            <fileset dir="../target">
+                                                <include name="*.zip" />
+                                                <include name="*.tar.gz" />
+                                            </fileset>
+                                        </checksum>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ant</groupId>
+                                <artifactId>ant-nodeps</artifactId>
+                                <version>1.8.1</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
     <dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d99d680e/gateway-util-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-launcher/pom.xml b/gateway-util-launcher/pom.xml
index 8682a4f..3e142e9 100644
--- a/gateway-util-launcher/pom.xml
+++ b/gateway-util-launcher/pom.xml
@@ -29,9 +29,18 @@
 
     <dependencies>
         <dependency>
+            <groupId>${gateway-group}</groupId>
+            <artifactId>gateway-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d99d680e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bdd9646..558396a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <name>gateway</name>
     <description>The Apache Knox Gateway</description>
-    <url>http://incubator.apache.org/knox</url>
+    <url>http://knox.incubator.apache.org/</url>
 
     <modules>
         <module>gateway-test-utils</module>
@@ -58,6 +58,8 @@
     </modules>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <gateway-name>Apache Knox (Incubator)</gateway-name>
         <gateway-project>knox</gateway-project>
         <gateway-artifact>knox</gateway-artifact>
@@ -82,23 +84,74 @@
         <connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-knox.git</connection>
     </scm>
 
+    <profiles>
+        <profile>
+            <id>analyze</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>cobertura-maven-plugin</artifactId>
+                        <version>2.5.2</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <inherited>false</inherited>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.4</version>
+                        <executions>
+                            <execution>
+                                <id>source</id>
+                                <phase>package</phase>
+                                <goals><goal>single</goal></goals>
+                                <configuration>
+                                    <finalName>${gateway-artifact}-${gateway-version}</finalName>
+                                    <descriptors>
+                                        <descriptor>src/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <debug>true</debug>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <version>0.8</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals><goal>check</goal></goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <excludedGroups>
-                        org.apache.hadoop.test.category.SlowTests,org.apache.hadoop.test.category.ManualTests,org.apache.hadoop.test.category.IntegrationTests
-                    </excludedGroups>
+                    <excludeSubProjects>false</excludeSubProjects>
+                    <excludes>
+                        <exclude>.git/**</exclude>
+                        <exclude>.svn/**</exclude>
+                        <exclude>.idea/**</exclude>
+                        <exclude>src/stage.txt</exclude>
+                        <exclude>src/vote.txt</exclude>
+                        <exclude>**/*.iml</exclude>
+                        <exclude>**/target/**</exclude>
+                        <exclude>**/test/resources/**</exclude>
+                        <exclude>**/main/resources/**/*.json</exclude>
+                        <exclude>**/home/CHANGES</exclude>
+                        <exclude>**/home/ISSUES</exclude>
+                        <exclude>**/home/samples/*.jar</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -115,98 +168,48 @@
                 </executions>
             </plugin>
             <plugin>
-                <inherited>false</inherited>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <id>source</id>
-                        <phase>package</phase>
-                        <goals><goal>single</goal></goals>
-                        <configuration>
-                            <finalName>${gateway-artifact}-${gateway-version}</finalName>
-                            <descriptors>
-                                <descriptor>src/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <debug>true</debug>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.4</version>
+                <configuration>
+                    <excludedGroups>
+                        org.apache.hadoop.test.category.SlowTests,org.apache.hadoop.test.category.ManualTests,org.apache.hadoop.test.category.IntegrationTests
+                    </excludedGroups>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>2.5.2</version></plugin>
-                    <plugin>
-                        <groupId>org.apache.rat</groupId>
-                        <artifactId>apache-rat-plugin</artifactId>
-                        <version>0.8</version>
-                        <executions>
-                            <execution>
-                                <phase>verify</phase>
-                                <goals><goal>check</goal></goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <excludeSubProjects>false</excludeSubProjects>
-                            <excludes>
-                                <exclude>.git/**</exclude>
-                                <exclude>.svn/**</exclude>
-                                <exclude>.idea/**</exclude>
-                                <exclude>**/*.iml</exclude>
-                                <exclude>**/dependency-reduced-pom.xml</exclude>
-                                <exclude>**/target/**</exclude>
-                                <exclude>**/test/resources/**</exclude>
-                                <exclude>**/main/resources/**/*.json</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                    <!--
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    -->
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>modules</report>
+                            <report>dependencies</report>
+                            <!--
+                            <report>project-team</report>
+                            <report>mailing-list</report>
+                            <report>issue-tracking</report>
+                            <report>license</report>
+                            <report>cim</report>
+                            <report>scm</report>
+                            -->
+                        </reports>
+                    </reportSet>
+                </reportSets>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -224,34 +227,27 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>2.5.2</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <version>0.8</version>
-                <configuration>
-                    <excludeSubProjects>false</excludeSubProjects>
-                    <excludes>
-                        <exclude>VOTE</exclude>
-                        <exclude>DEPLOY</exclude>
-                        <exclude>.git/**</exclude>
-                        <exclude>.svn/**</exclude>
-                        <exclude>.idea/**</exclude>
-                        <exclude>**/*.iml</exclude>
-                        <exclude>**/dependency-reduced-pom.xml</exclude>
-                        <exclude>**/target/**</exclude>
-                        <exclude>**/test/resources/**</exclude>
-                        <exclude>**/main/resources/**/*.json</exclude>
-                        <exclude>gateway-release/CHANGES</exclude>
-                        <exclude>gateway-release/ISSUES</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <!-- Source code metrics: mvn javancss:report or mvn site -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
                 <version>2.0-beta-2</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <!--
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                -->
+            </plugin>
         </plugins>
     </reporting>
 


Mime
View raw message