Adjust site build process

diff --git a/build.moxie b/build.moxie
index 0a17af081f3cd3de95334b9637641149ec0b5c46..15fe5084cafd4be92bbb5c541ad5561dbbd7d73b 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -10,13 +10,13 @@ name: Iciql
 description: 'a model-based database access wrapper for JDBC'
 groupId: com.gitblit.iciql
 artifactId: iciql
-version: 2.0.0-SNAPSHOT
+version: 2.0.0
 packaging: jar+zip
 inceptionYear: 2011
 
 # Current stable release
-releaseVersion: 1.6.5
-releaseDate: 2015-07-21
+releaseVersion: 2.0.0
+releaseDate: 2016-04-04
 
 # Project urls
 url: 'http://iciql.com'

diff --git a/build.xml b/build.xml
index e656b02ac8daeb4086568cbaf78c499aaf5dbbf7..62d304a3b544cc4079dde7ca929c7accbbab8ff8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -147,7 +147,6 @@
                                </menu>
 
                                <page name="building" src="building.mkd" out="building.html" />
-                               <page name="javadoc" src="javadoc.mkd" out="javadoc.html" />
 
                                <page name="release notes" out="releasenotes.html">
                                        <template src="releasecurrent.ftl" data="${releaselog}" />
@@ -157,16 +156,15 @@
                                </page>
 
                                <menu name="downloads">
-                                       <link name="${project.artifactId}-${project.releaseVersion}"
-                                               src="${gc.url}${project.artifactId}-${project.releaseVersion}.zip" />
+                                       <link name="Maven Central (2.0.0+)"
+                                               src="http://search.maven.org/#search|ga|1|com.gitblit.iciql" />
                                        <divider />
-                                       <link name="Maven Repository" src="${project.mavenUrl}" />
+                                       <link name="Iciql Maven Repository (pre-2.0.0)" src="${project.mavenUrl}" />
                                </menu>
 
                                <menu name="links">
                                        <link name="Github" src="${project.scmUrl}" />
                                        <link name="Issues" src="${project.issuesUrl}" />
-                                       <link name="Maven Repository" src="${project.mavenUrl}" />
                                </menu>
                                <divider />
                        </structure>

diff --git a/releases.moxie b/releases.moxie
index 3630f1df28b91ac2dbb92a8eaa0ccf7711f7aac5..4bc7d55a77295b08c9d425964d8c5517cff97f61 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,10 @@
 #
-# ${project.version} release
+# 2.0.0 release
 #
 r30: {
-    title: ${project.name} ${project.version} released
-    id: ${project.version}
-    date: ${project.buildDate}
+    title: Iciql 2.0.0 released
+    id: 2.0.0
+    date: 2016-04-04
     note: 'The groupId has changed to com.gitblit.iciql'
     html: ~
     text: ~
@@ -667,6 +667,6 @@ r1: {
 #
 # Release log data
 #
-release: &r29
-snapshot: &r30
-releases: &r[1..29]
+release: &r30
+# snapshot: &r30
+releases: &r[1..30]

diff --git a/src/site/index.mkd b/src/site/index.mkd
index 73c24bb571c79a2b7f8b55af5ac48029a9452aa2..85d51b72175ac691aa66e9ca39f450e2088a7a9b 100644 (file)
--- a/src/site/index.mkd
+++ b/src/site/index.mkd
@@ -109,7 +109,7 @@ Support for others is possible and may only require creating a simple "dialect"
 \r
 As of 2.0.0 iciql is now distributed through Maven Central and it's coordinates have changed slightly.\r
 \r
-```xml\r
+---XML---\r
 <dependencies>\r
     <dependency>\r
         <groupId>com.gitblit.iciql</groupId>\r
@@ -117,7 +117,7 @@ As of 2.0.0 iciql is now distributed through Maven Central and it's coordinates
         <version>2.0.0/version>\r
     </dependency>\r
 </dependencies>\r
-```\r
+---XML---\r
 \r
 ### Java Runtime Requirement\r
 \r