curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject git commit: Updated docs, plugin versions, etc. Updates to move to TLP
Date Sat, 02 Nov 2013 15:32:40 GMT
Updated Branches:
  refs/heads/master 066698d8c -> 83054b95d


Updated docs, plugin versions, etc. Updates to move to TLP


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/83054b95
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83054b95
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/83054b95

Branch: refs/heads/master
Commit: 83054b95dbcf4b28c54b728994f39c38815fb8de
Parents: 066698d
Author: randgalt <randgalt@apache.org>
Authored: Sat Nov 2 08:32:33 2013 -0700
Committer: randgalt <randgalt@apache.org>
Committed: Sat Nov 2 08:32:33 2013 -0700

----------------------------------------------------------------------
 README                                          |  4 +-
 .../src/site/confluence/index.confluence        |  2 +-
 curator-x-discovery-server/README.txt           |  2 +-
 .../src/site/confluence/index.confluence        |  2 +-
 pom.xml                                         | 85 ++++++++++----------
 src/site/confluence/getting-started.confluence  |  2 +-
 src/site/confluence/index.confluence            |  8 --
 src/site/site.xml                               |  6 +-
 8 files changed, 53 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/README
----------------------------------------------------------------------
diff --git a/README b/README
index e56bc3c..cbd7e17 100644
--- a/README
+++ b/README
@@ -2,6 +2,6 @@ Apache Curator
 --------------
 Curator is a set of Java libraries that make using Apache ZooKeeper much easier.
 
-Website: http://curator.incubator.apache.org/
+Website: http://curator.apache.org/
 
-Getting started: http://curator.incubator.apache.org/getting-started.html
+Getting started: http://curator.apache.org/getting-started.html

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/curator-examples/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/curator-examples/src/site/confluence/index.confluence b/curator-examples/src/site/confluence/index.confluence
index 680a688..928b44f 100644
--- a/curator-examples/src/site/confluence/index.confluence
+++ b/curator-examples/src/site/confluence/index.confluence
@@ -8,5 +8,5 @@ This module contains example usages of various Curator features. Each directory
 |/discovery|Example usage of the Curator's ServiceDiscovery|
 |/framework|A few examples of how to use the CuratorFramework class|
 
-See the [examples source repo|https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git;a=tree;f=curator-examples/src/main/java]
for each example.
+See the [examples source repo|https://git-wip-us.apache.org/repos/asf?p=curator.git;a=tree;f=curator-examples/src/main/java]
for each example.
 

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/curator-x-discovery-server/README.txt
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/README.txt b/curator-x-discovery-server/README.txt
index d3b3906..598ec14 100644
--- a/curator-x-discovery-server/README.txt
+++ b/curator-x-discovery-server/README.txt
@@ -21,7 +21,7 @@
 A REST server for use with Curator Service Discovery. This server can be used for non-Java
applications
 that need to participate in the Curator Service Discovery.
 
-Full documentation: http://curator.incubator.apache.org/curator-x-discovery-server/index.html
+Full documentation: http://curator.apache.org/curator-x-discovery-server/index.html
 
 
 == JSON specifications for REST entities ==

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/curator-x-discovery-server/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/src/site/confluence/index.confluence b/curator-x-discovery-server/src/site/confluence/index.confluence
index 1e869e8..c7ffdda 100644
--- a/curator-x-discovery-server/src/site/confluence/index.confluence
+++ b/curator-x-discovery-server/src/site/confluence/index.confluence
@@ -87,4 +87,4 @@ h2. getAny
 *Description:* {name} is the service name. Return a random instance from the given service
or 404.
 
 h2. JSON specs
-The JSON specifications for the REST entities are documented here: https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git;a=blob_plain;f=curator-x-discovery-server/README.txt;hb=HEAD
+The JSON specifications for the REST entities are documented here: https://git-wip-us.apache.org/repos/asf?p=curator.git;a=blob_plain;f=curator-x-discovery-server/README.txt;hb=HEAD

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b232e14..017b5b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
     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
@@ -36,7 +35,7 @@
     <description>
         Curator is a set of Java libraries that make using Apache ZooKeeper much easier.
     </description>
-    <url>http://curator.incubator.apache.org</url>
+    <url>http://curator.apache.org</url>
     <inceptionYear>2011</inceptionYear>
 
     <licenses>
@@ -58,19 +57,20 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- OSGi Properties -->
-        <osgi.export.package />
-        <osgi.import.package />
-        <osgi.private.package />
-        <osgi.dynamic.import />
-        <osgi.require.bundle />
-        <osgi.export.service />
-        <osgi.activator />
+        <osgi.export.package/>
+        <osgi.import.package/>
+        <osgi.private.package/>
+        <osgi.dynamic.import/>
+        <osgi.require.bundle/>
+        <osgi.export.service/>
+        <osgi.activator/>
     </properties>
 
     <scm>
-        <url>https://git-wip-us.apache.org/repos/asf?p=incubator-curator.git</url>
-        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-curator.git</connection>
-        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-curator.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf/curator.git</url>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git
+        </developerConnection>
         <tag>HEAD</tag>
     </scm>
 
@@ -90,7 +90,7 @@
                 <sendOnSuccess>false</sendOnSuccess>
                 <sendOnWarning>false</sendOnWarning>
                 <configuration>
-                    <address>dev@curator.incubator.apache.org</address>
+                    <address>dev@curator.apache.org</address>
                 </configuration>
             </notifier>
         </notifiers>
@@ -99,31 +99,31 @@
     <distributionManagement>
         <site>
             <id>apache.website.svnpub</id>
-            <url>scm:svn:https://svn.apache.org/repos/asf/incubator/curator/site/trunk</url>
+            <url>scm:svn:https://svn.apache.org/repos/asf/curator/site/trunk</url>
         </site>
     </distributionManagement>
 
     <mailingLists>
         <mailingList>
             <name>Users</name>
-            <post>user@curator.incubator.apache.org</post>
-            <subscribe>user-subscribe@curator.incubator.apache.org</subscribe>
-            <unsubscribe>user-unsubscribe@curator.incubator.apache.org</unsubscribe>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-curator-user/</archive>
+            <post>user@curator.apache.org</post>
+            <subscribe>user-subscribe@curator.apache.org</subscribe>
+            <unsubscribe>user-unsubscribe@curator.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/curator-user/</archive>
         </mailingList>
         <mailingList>
             <name>Development</name>
-            <post>dev@curator.incubator.apache.org</post>
-            <subscribe>dev-subscribe@curator.incubator.apache.org</subscribe>
-            <unsubscribe>dev-unsubscribe@curator.incubator.apache.org</unsubscribe>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-curator-dev/</archive>
+            <post>dev@curator.apache.org</post>
+            <subscribe>dev-subscribe@curator.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@curator.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/curator-dev/</archive>
         </mailingList>
         <mailingList>
             <name>Commits</name>
-            <post>commits@curator.incubator.apache.org</post>
-            <subscribe>commits-subscribe@curator.incubator.apache.org</subscribe>
-            <unsubscribe>commits-unsubscribe@curator.incubator.apache.org</unsubscribe>
-            <archive>http://mail-archives.apache.org/mod_mbox/incubator-curator-commits/</archive>
+            <post>commits@curator.apache.org</post>
+            <subscribe>commits-subscribe@curator.apache.org</subscribe>
+            <unsubscribe>commits-unsubscribe@curator.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/curator-commits/</archive>
         </mailingList>
     </mailingLists>
 
@@ -336,7 +336,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>
@@ -357,6 +366,12 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.3.1</version>
                 <configuration>
@@ -432,7 +447,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.3</version>
                 <configuration>
                     <locales>en</locales>
                     <skipDeploy>true</skipDeploy>
@@ -450,18 +465,6 @@
                         <goals>
                             <goal>site</goal>
                         </goals>
-                        <configuration>
-                            <reportPlugins>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-javadoc-plugin</artifactId>
-                                    <version>2.9</version>
-                                    <configuration>
-                                        <aggregate>true</aggregate>
-                                    </configuration>
-                                </plugin>
-                            </reportPlugins>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/src/site/confluence/getting-started.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/getting-started.confluence b/src/site/confluence/getting-started.confluence
index 71818ea..4366f35 100644
--- a/src/site/confluence/getting-started.confluence
+++ b/src/site/confluence/getting-started.confluence
@@ -79,7 +79,7 @@ LeaderSelectorListener listener = new LeaderSelectorListener()
 
     public void stateChanged(CuratorFramework client, ConnectionState newState)
     {
-        // see http://curator.incubator.apache.org/errors.html
+        // see http://curator.apache.org/errors.html
         // You always need to be aware that connections to ZK can fail
     }
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/index.confluence b/src/site/confluence/index.confluence
index 479eb76..ba1bdd5 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -32,11 +32,3 @@ most users, the only artifact you need is {{curator-recipes}}.
 |org.apache.curator|curator-examples|Example usages of various Curator features.|
 |org.apache.curator|curator-x-discovery|A Service Discovery implementation built on the Curator
Framework.|
 |org.apache.curator|curator-x-discovery-server|A RESTful server that can be used with Curator
Discovery.|
-
-h2. Disclaimer
-
-Apache Curator is an effort undergoing incubation at the Apache Software Foundation (ASF),
sponsored by the Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review indicates that
the infrastructure, communications, and decision making process have stabilized in a manner
consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or stability
of the code, it does indicate that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/curator/blob/83054b95/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9857d33..e393ece 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -51,9 +51,9 @@
     </bannerLeft>
 
     <bannerRight>
-        <name>Apache Incubator</name>
-        <src>http://incubator.apache.org/images/apache-incubator-logo.png</src>
-        <href>http://incubator.apache.org</href>
+        <name>Apache</name>
+        <src>http://apache.org/images/feather-small.gif</src>
+        <href>http://apache.org</href>
     </bannerRight>
 
     <publishDate/>


Mime
View raw message