fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject incubator-fluo git commit: Use o.a.fluo build-resources
Date Thu, 04 Aug 2016 20:18:43 GMT
Repository: incubator-fluo
Updated Branches:
  refs/heads/fluo-parent d41fc8162 -> e1d18200f


Use o.a.fluo build-resources

Fix license wording, add missing "(incubating)" to project name in
pom.xml, NOTICE, and README.md, and switch build-resources from io.fluo
to the one provided by org.apache.fluo.

Also add missing slf4j plugin dependency for mavanagaiata to eliminate a
warning.


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

Branch: refs/heads/fluo-parent
Commit: e1d18200fa1c0c21850cd8f2551abb6485d748dc
Parents: d41fc81
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Aug 4 15:19:39 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Aug 4 15:19:39 2016 -0400

----------------------------------------------------------------------
 NOTICE    |  2 +-
 README.md | 13 ++++++++-----
 pom.xml   | 29 ++++++++++++++++++-----------
 3 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/e1d18200/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index dab393a..fe145d4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Fluo
+Apache Fluo Parent POM (incubating)
 Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/e1d18200/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 22a4f92..33fe5b5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 <!--
-  Licensed 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
+  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
 
@@ -14,7 +17,7 @@
 
 [![Build Status][ti]][tl] [![Maven Central][mi]][ml] [![Apache License][li]][ll]
 
-# Apache Fluo Parent POM
+# Apache Fluo Parent POM (incubating)
 
 View documentation at:
 https://fluo.apache.org
@@ -28,4 +31,4 @@ This project uses a 1-up counter for its versioning.
 [mi]: https://maven-badges.herokuapp.com/maven-central/org.apache.fluo/fluo-parent/badge.svg
 [ml]: https://maven-badges.herokuapp.com/maven-central/org.apache.fluo/fluo-parent
 [li]: https://img.shields.io/badge/license-ASL-blue.svg
-[ll]: https://github.com/apache/incubator-fluo/blob/master/LICENSE
+[ll]: https://github.com/apache/incubator-fluo/blob/fluo-parent/LICENSE

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/e1d18200/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ad217c8..1edefeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
   <artifactId>fluo-parent</artifactId>
   <version>1-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>Apache Fluo Parent POM</name>
-  <description>Parent pom to configure common project build resources for Apache Fluo
projects</description>
+  <name>Apache Fluo Parent POM (incubating)</name>
+  <description>Parent pom for common configuration across Apache Fluo projects</description>
   <url>https://fluo.apache.org</url>
   <!-- this is the year of inception at ASF -->
   <inceptionYear>2016</inceptionYear>
@@ -77,14 +77,14 @@
   </issueManagement>
   <properties>
     <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
-    <checkstyle.config>io/fluo/resources/java-checkstyle.xml</checkstyle.config>
+    <build-resources.version>1.0.0-incubating</build-resources.version>
+    <checkstyle.config>org/apache/fluo/resources/java-checkstyle.xml</checkstyle.config>
     <extraReleaseArguments />
     <findbugs.effort>Max</findbugs.effort>
     <findbugs.includeTests>true</findbugs.includeTests>
     <findbugs.maxRank>16</findbugs.maxRank>
     <findbugs.xmlOutput>true</findbugs.xmlOutput>
-    <formatter.config>io/fluo/resources/eclipse-formatter.xml</formatter.config>
-    <io.fluo.resources.version>1.0.1</io.fluo.resources.version>
+    <formatter.config>org/apache/fluo/resources/eclipse-formatter.xml</formatter.config>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.min-version>3.0.5</maven.min-version>
@@ -120,6 +120,13 @@
           <configuration>
             <skipNoGit>true</skipNoGit>
           </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-simple</artifactId>
+              <version>1.7.2</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>net.revelc.code</groupId>
@@ -132,9 +139,9 @@
           </configuration>
           <dependencies>
             <dependency>
-              <groupId>io.fluo</groupId>
-              <artifactId>resources</artifactId>
-              <version>${io.fluo.resources.version}</version>
+              <groupId>org.apache.fluo</groupId>
+              <artifactId>build-resources</artifactId>
+              <version>${build-resources.version}</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -153,9 +160,9 @@
               <version>7.0</version>
             </dependency>
             <dependency>
-              <groupId>io.fluo</groupId>
-              <artifactId>resources</artifactId>
-              <version>${io.fluo.resources.version}</version>
+              <groupId>org.apache.fluo</groupId>
+              <artifactId>build-resources</artifactId>
+              <version>${build-resources.version}</version>
             </dependency>
           </dependencies>
         </plugin>


Mime
View raw message