You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/20 19:41:10 UTC
[1/2] curator git commit: version 4.0.0-SNAPSHOT
Repository: curator
Updated Branches:
refs/heads/CURATOR-426 [created] e10e40f9d
version 4.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/42ee566f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/42ee566f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/42ee566f
Branch: refs/heads/CURATOR-426
Commit: 42ee566f4f93cf074b93eb08266634d2e993bf4c
Parents: 7e611bd
Author: randgalt <ra...@apache.org>
Authored: Thu Jul 20 13:59:53 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Jul 20 13:59:53 2017 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
curator-test/pom.xml | 4 ++--
curator-x-async/pom.xml | 2 +-
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
curator-x-rpc/pom.xml | 4 ++--
pom.xml | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 13c1551..4b210da 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index cc65570..c092603 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 2f36e73..3ae9f54 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 77f2a51..42451ac 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index fb28d53..8f3f1e1 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-async/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml
index 925896b..ceae835 100644
--- a/curator-x-async/pom.xml
+++ b/curator-x-async/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index b23e2cf..b77ef41 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index be49f20..f6d89ff 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/curator-x-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/pom.xml b/curator-x-rpc/pom.xml
index e831e1f..c35cc2f 100644
--- a/curator-x-rpc/pom.xml
+++ b/curator-x-rpc/pom.xml
@@ -22,12 +22,12 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>curator-x-rpc</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Curator RPC Proxy</name>
<description>A proxy that bridges non-java environments with the Curator framework and recipes</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/42ee566f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa8fd86..64a4848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
[2/2] curator git commit: Moved to version 4.0.0 - website,
doxia refreshes
Posted by ra...@apache.org.
Moved to version 4.0.0 - website, doxia refreshes
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/e10e40f9
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/e10e40f9
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/e10e40f9
Branch: refs/heads/CURATOR-426
Commit: e10e40f9da3d7923c5a996a728bda79a4aca2b27
Parents: 42ee566
Author: randgalt <ra...@apache.org>
Authored: Thu Jul 20 14:40:58 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Jul 20 14:40:58 2017 -0500
----------------------------------------------------------------------
curator-client/src/site/site.xml | 4 ++--
curator-examples/src/site/site.xml | 4 ++--
curator-framework/src/site/site.xml | 4 ++--
curator-recipes/src/site/site.xml | 4 ++--
curator-test/src/site/site.xml | 4 ++--
curator-x-async/src/site/site.xml | 8 +++----
curator-x-discovery-server/src/site/site.xml | 4 ++--
curator-x-discovery/src/site/site.xml | 4 ++--
curator-x-rpc/src/site/site.xml | 4 ++--
pom.xml | 4 ++--
src/site/resources/css/site.css | 26 ++++-------------------
src/site/site.xml | 18 +++++++++++-----
12 files changed, 39 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-client/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-client/src/site/site.xml b/curator-client/src/site/site.xml
index 45d5e05..5a84db1 100644
--- a/curator-client/src/site/site.xml
+++ b/curator-client/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Apache Curator Client">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Client"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-examples/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-examples/src/site/site.xml b/curator-examples/src/site/site.xml
index 9d43ada..eab1751 100644
--- a/curator-examples/src/site/site.xml
+++ b/curator-examples/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Apache Curator Examples">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Examples"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-framework/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-framework/src/site/site.xml b/curator-framework/src/site/site.xml
index 4a66e87..9f2767b 100644
--- a/curator-framework/src/site/site.xml
+++ b/curator-framework/src/site/site.xml
@@ -21,7 +21,7 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Apache Curator Framework">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
@@ -32,6 +32,6 @@
}
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-recipes/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/src/site/site.xml b/curator-recipes/src/site/site.xml
index 2e4527b..5ea4837 100644
--- a/curator-recipes/src/site/site.xml
+++ b/curator-recipes/src/site/site.xml
@@ -21,7 +21,7 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Apache Curator Recipes">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
@@ -31,6 +31,6 @@
}
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-test/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-test/src/site/site.xml b/curator-test/src/site/site.xml
index 5a73601..f71dd75 100644
--- a/curator-test/src/site/site.xml
+++ b/curator-test/src/site/site.xml
@@ -21,8 +21,8 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Apache Curator Test">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-async/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/src/site/site.xml b/curator-x-async/src/site/site.xml
index 70b5d4b..c8707f4 100644
--- a/curator-x-async/src/site/site.xml
+++ b/curator-x-async/src/site/site.xml
@@ -21,9 +21,9 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Curator Async">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
- <script type="text/javascript"><![CDATA[
+ <script type="text/javascript">
$(function(){
if ( location && location.pathname && location.pathname.endsWith('/index.html') ) {
$('a[title="Java 8/Async"]').parent().addClass("active");
@@ -33,7 +33,7 @@
$('a[title="Strongly Typed Models"]').parent().addClass("active");
}
});
- ]]></script>
- </head>
+ </script>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-discovery-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/src/site/site.xml b/curator-x-discovery-server/src/site/site.xml
index d236ff6..bf57e9a 100644
--- a/curator-x-discovery-server/src/site/site.xml
+++ b/curator-x-discovery-server/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Discovery Service Server">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Service Discovery Server"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-discovery/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/src/site/site.xml b/curator-x-discovery/src/site/site.xml
index 5ece90a..8b40d5f 100644
--- a/curator-x-discovery/src/site/site.xml
+++ b/curator-x-discovery/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Discovery Service">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Service Discovery"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/curator-x-rpc/src/site/site.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/site/site.xml b/curator-x-rpc/src/site/site.xml
index fca1e73..2f5b8e8 100644
--- a/curator-x-rpc/src/site/site.xml
+++ b/curator-x-rpc/src/site/site.xml
@@ -21,13 +21,13 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd" name="Curator RPC Proxy">
<body>
- <head>
+ <head><![CDATA[
<link rel="stylesheet" href="../css/site.css" />
<script type="text/javascript">
$(function(){
$('a[title="Curator RPC Proxy"]').parent().addClass("active");
});
</script>
- </head>
+ ]]></head>
</body>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 64a4848..be382c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>18</version>
</parent>
<groupId>org.apache.curator</groupId>
@@ -63,7 +63,7 @@
<maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
<maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
<maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
- <doxia-module-confluence-version>1.6</doxia-module-confluence-version>
+ <doxia-module-confluence-version>1.7</doxia-module-confluence-version>
<maven-license-plugin-version>1.9.0</maven-license-plugin-version>
<commons-math-version>2.2</commons-math-version>
<jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index b60d059..5f9beb9 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -16,21 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-body
-{
- font-size: 16px;
- line-height: 22px;
-}
tt
{
- font-size: 14px;
- background-color: transparent;
-}
-
-pre
-{
- font-size: 14px;
+ background-color: #eee;
}
.well, .breadcrumb
@@ -58,15 +47,8 @@ a:hover
background-color: #DDDDDD;
}
-footer
-{
- font-size: 12px;
- line-height: 15px;
-}
-
-h2
+.search-query
{
- text-align: center;
- border-bottom: 1px solid #0035AC;
- margin-bottom: 18px;
+ margin-top: 15px;
+ width: 183px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/curator/blob/e10e40f9/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 8136c9a..c2ed319 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,7 +25,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
+ <version>1.6</version>
</skin>
<custom>
@@ -38,9 +38,17 @@
<googlePlusOne />
<twitter>
<user>ApacheCurator</user>
- <showUser>false</showUser>
- <showFollowers>false</showFollowers>
+ <showUser>true</showUser>
+ <showFollowers>true</showFollowers>
</twitter>
+ <googleSearch>
+ <sitesearch>${project.url}</sitesearch>
+ </googleSearch>
+ <gitHub>
+ <projectId>apache/curator</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
+ </gitHub>
</fluidoSkin>
</custom>
@@ -119,12 +127,12 @@
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
</menu>
- <footer>
+ <footer><![CDATA[
<div class="row span12" style="margin-bottom: 8px;">
Apache Curator, the Apache feather logo, and the Apache Curator project logos are
trademarks of The Apache Software Foundation. All other marks mentioned may be
trademarks or registered trademarks of their respective owners.
</div>
- </footer>
+ ]]></footer>
</body>
</project>