From a09f77d3b14d4bbcee3feb407fd2d8ea2cf62d64 Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Sun, 18 Oct 2015 10:26:44 +0200 Subject: [PATCH] Set version to 1.7.3 --- geowebcache/arcgiscache/pom.xml | 2 +- geowebcache/core/pom.xml | 2 +- geowebcache/diskquota/bdb/pom.xml | 2 +- geowebcache/diskquota/core/pom.xml | 2 +- geowebcache/diskquota/jdbc/pom.xml | 2 +- geowebcache/diskquota/pom.xml | 2 +- geowebcache/distributed/pom.xml | 2 +- geowebcache/georss/pom.xml | 2 +- geowebcache/gmaps/pom.xml | 2 +- geowebcache/kml/pom.xml | 2 +- geowebcache/pom.xml | 6 +- geowebcache/pom.xml~ | 656 +++++++++++++++++++++++++++++ geowebcache/release/doc.xml | 2 +- geowebcache/release/doc.xml~ | 16 + geowebcache/release/src.xml | 2 +- geowebcache/release/src.xml~ | 26 ++ geowebcache/rest/pom.xml | 2 +- geowebcache/stylesheet.css | 38 ++ geowebcache/tms/pom.xml | 2 +- geowebcache/ve/pom.xml | 2 +- geowebcache/web/pom.xml | 2 +- geowebcache/wms/pom.xml | 2 +- geowebcache/wmts/pom.xml | 2 +- 23 files changed, 757 insertions(+), 21 deletions(-) create mode 100644 geowebcache/pom.xml~ create mode 100644 geowebcache/release/doc.xml~ create mode 100644 geowebcache/release/src.xml~ create mode 100644 geowebcache/stylesheet.css diff --git a/geowebcache/arcgiscache/pom.xml b/geowebcache/arcgiscache/pom.xml index 3db394ffb..b8171d3e7 100644 --- a/geowebcache/arcgiscache/pom.xml +++ b/geowebcache/arcgiscache/pom.xml @@ -5,7 +5,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-arcgiscache diff --git a/geowebcache/core/pom.xml b/geowebcache/core/pom.xml index b0cda32d6..78e49f531 100644 --- a/geowebcache/core/pom.xml +++ b/geowebcache/core/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-core diff --git a/geowebcache/diskquota/bdb/pom.xml b/geowebcache/diskquota/bdb/pom.xml index 56143a2c4..f23586005 100644 --- a/geowebcache/diskquota/bdb/pom.xml +++ b/geowebcache/diskquota/bdb/pom.xml @@ -5,7 +5,7 @@ org.geowebcache gwc-diskquota - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-diskquota-bdb diff --git a/geowebcache/diskquota/core/pom.xml b/geowebcache/diskquota/core/pom.xml index d7d70b9a9..59801a793 100644 --- a/geowebcache/diskquota/core/pom.xml +++ b/geowebcache/diskquota/core/pom.xml @@ -5,7 +5,7 @@ org.geowebcache gwc-diskquota - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-diskquota-core diff --git a/geowebcache/diskquota/jdbc/pom.xml b/geowebcache/diskquota/jdbc/pom.xml index de77d0f7e..b7c006230 100644 --- a/geowebcache/diskquota/jdbc/pom.xml +++ b/geowebcache/diskquota/jdbc/pom.xml @@ -6,7 +6,7 @@ org.geowebcache gwc-diskquota - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-diskquota-jdbc diff --git a/geowebcache/diskquota/pom.xml b/geowebcache/diskquota/pom.xml index b69cca116..85018db5f 100644 --- a/geowebcache/diskquota/pom.xml +++ b/geowebcache/diskquota/pom.xml @@ -5,7 +5,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-diskquota diff --git a/geowebcache/distributed/pom.xml b/geowebcache/distributed/pom.xml index 23b1cd52b..f58f7f7a1 100644 --- a/geowebcache/distributed/pom.xml +++ b/geowebcache/distributed/pom.xml @@ -5,7 +5,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-distributed diff --git a/geowebcache/georss/pom.xml b/geowebcache/georss/pom.xml index 664f71b00..8870b2b01 100644 --- a/geowebcache/georss/pom.xml +++ b/geowebcache/georss/pom.xml @@ -5,7 +5,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-georss diff --git a/geowebcache/gmaps/pom.xml b/geowebcache/gmaps/pom.xml index 7f8423e4b..6f7060b75 100644 --- a/geowebcache/gmaps/pom.xml +++ b/geowebcache/gmaps/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-gmaps diff --git a/geowebcache/kml/pom.xml b/geowebcache/kml/pom.xml index b1b000cf4..8cf46f4cb 100644 --- a/geowebcache/kml/pom.xml +++ b/geowebcache/kml/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-kml diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml index 3567f677e..35b3efad2 100644 --- a/geowebcache/pom.xml +++ b/geowebcache/pom.xml @@ -5,12 +5,12 @@ org.geowebcache geowebcache pom - 1.7-SNAPSHOT + 1.7.3 geowebcache http://geowebcache.org - 13-SNAPSHOT + 13.3 1.13 3.1.1.RELEASE 1.0.8 @@ -600,7 +600,7 @@ release/war.xml release/doc.xml - geowebcache-1.7-SNAPSHOT + geowebcache-1.7.3 ${project.build.directory}/release diff --git a/geowebcache/pom.xml~ b/geowebcache/pom.xml~ new file mode 100644 index 000000000..70ebf37bf --- /dev/null +++ b/geowebcache/pom.xml~ @@ -0,0 +1,656 @@ + + + 4.0.0 + org.geowebcache + geowebcache + pom + 1.5.4 + geowebcache + http://geowebcache.org + + + 11-SNAPSHOT + 1.13 + 3.1.1.RELEASE + 1.0.8 + 1.4.3 + 1.0.7 + 1.1.1 + 2.1 + 1.3 + 2.4 + 3.1 + 11.0.1 + 1.2.14 + 1.1.119 + 8.4-701.jdbc3 + + true + disabled + disabled + 64M + + 1.1.10 + + + + + boundless + Boundless Maven Repository + http://repo.boundlessgeo.com/main + + true + + + + osgeo + Open Source Geospatial Foundation Repository + http://download.osgeo.org/webdav/geotools/ + + + codehaus + Code Haus + http://repository.codehaus.org + + + maven-restlet + Public online Restlet repository + http://maven.restlet.org + + + oracleReleases + Oracle Released Java Packages + http://download.oracle.com/maven + default + + + + + + boundless + Boundless + http://repo.boundlessgeo.com/main + false + + + boundless + false + Boundless Maven Repository + http://repo.boundlessgeo.com/main + + + + + + + org.geowebcache + gwc-core + ${project.version} + tests + test + + + + javax.servlet + servlet-api + 2.5 + provided + + + + com.google.guava + guava + ${guava.version} + + + + commons-logging + commons-logging + ${commons-logging.version} + + + avalon-framework + avalon-framework + + + + + commons-dbcp + commons-dbcp + ${commons-dbcp.version} + + + commons-io + commons-io + ${commons-io.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-collections + commons-collections + ${commons-collections.version} + + + + log4j + log4j + ${log4j.version} + + + + + it.geosolutions.imageio-ext + imageio-ext-png + ${imageio-ext.version} + + + + it.geosolutions.imageio-ext + imageio-ext-streams + ${imageio-ext.version} + + + + + + junit + junit + 4.10 + test + + + org.hamcrest + hamcrest-library + 1.1 + test + + + org.hamcrest + hamcrest-integration + 1.1 + test + + + + org.easymock + easymock + 2.5.2 + test + + + org.easymock + easymockclassextension + 2.5.2 + test + + + org.mockito + mockito-all + 1.8.5 + + + httpunit + httpunit + 1.6 + test + + + com.mockrunner + mockrunner + 0.3.6 + test + + + xmlunit + xmlunit + 1.3 + + + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + + + org.springframework + spring-jdbc + ${spring.version} + + + + + + org.mortbay.jetty + jetty + 6.1.20 + test + + + org.mortbay.jetty + jsp-2.0 + 6.1.20 + pom + test + + + org.slf4j + slf4j-simple + + + org.slf4j + jcl104-over-slf4j + + + org.slf4j + slf4j-api + + + + + + org.freemarker + freemarker + 2.3.18 + + + + + org.restlet + org.restlet + ${restlet.version} + + + + com.noelios.restlet + com.noelios.restlet + ${restlet.version} + + + + com.noelios.restlet + com.noelios.restlet.ext.simple + ${restlet.version} + + + + org.restlet + org.restlet.ext.freemarker + ${restlet.version} + + + + org.restlet + org.restlet.ext.spring + ${restlet.version} + + + + org.restlet + org.restlet.ext.json + ${restlet.version} + + + + com.noelios.restlet + com.noelios.restlet.ext.servlet + ${restlet.version} + + + + net.sf.json-lib + json-lib + 2.1 + jdk13 + + + + com.thoughtworks.xstream + xstream + ${xstream.version} + + + + + org.acegisecurity + acegi-security + ${acegi.version} + + + org.springframework + spring-remoting + + + org.springframework + spring-jdbc + + + org.springframework + spring-support + + + + + + org.codehaus.jettison + jettison + 1.0.1 + + + + stax + stax-api + 1.0.1 + + + + + stax + stax + 1.2.0 + + + + com.h2database + h2 + ${h2.version} + + + + postgresql + postgresql + ${postgresql.version} + + + + ojdbc14 + com.oracle + ${oracle.version} + + + + + com.sleepycat + je + 4.1.10 + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + html + xml + + + + + + maven-javadoc-plugin + + 1.5 + false + all + 256M + ISO-8859-1 + -keywords + + + todo + tfmc + TODO: + + + task + tfmc + TODO: + + + revisit + tfmc + TODO: + + + + http://java.sun.com/j2se/1.5/docs/api + http://docs.geotools.org/stable/javadocs/ + + + + + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0-beta-3 + + + validate + + create + + + + + {0,date,yyyy-MM-dd HH:mm:ss} + + timestamp + + false + false + + + + + maven-jar-plugin + + + package + + test-jar + + + + + + true + + false + + + org.geowebcache + ${project.version} + ${pom.url} + org.geowebcache + ${build.branch}/${build.commit.id} + ${pom.url} + + + + + + + org.codehaus.mojo + tomcat-maven-plugin + + http://localhost:8080/manager + localhost + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + maven-source-plugin + + true + + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + pertest + ${maven.test.jvmargs} + + + + + + pl.project13.maven + git-commit-id-plugin + 2.0.4 + + + + revision + + + + + build + false + false + + + + + maven-assembly-plugin + 2.2 + + + + release/src.xml + release/war.xml + release/doc.xml + + geowebcache-1.5.4 + ${project.build.directory}/release + + + + + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-2 + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + + + + + + deploy.boundless + + + boundless + false + Boundless Maven Repository + http://repo.boundlessgeo.com/main + + + boundless + false + Boundless Maven Repository + http://repo.boundlessgeo.com/main + + + + + + + core + georss + gmaps + kml + rest + tms + ve + wms + wmts + web + diskquota + arcgiscache + + diff --git a/geowebcache/release/doc.xml b/geowebcache/release/doc.xml index a33e804e9..1029a7610 100644 --- a/geowebcache/release/doc.xml +++ b/geowebcache/release/doc.xml @@ -7,7 +7,7 @@ ../documentation/en/user/build/html - geowebcache-1.7-SNAPSHOT/doc + geowebcache-1.7.3/doc **/* diff --git a/geowebcache/release/doc.xml~ b/geowebcache/release/doc.xml~ new file mode 100644 index 000000000..22b09468b --- /dev/null +++ b/geowebcache/release/doc.xml~ @@ -0,0 +1,16 @@ + + doc + + zip + + false + + + ../documentation/en/user/build/html + geowebcache-1.6-SNAPSHOT/doc + + **/* + + + + diff --git a/geowebcache/release/src.xml b/geowebcache/release/src.xml index f7af8f4b9..87199fb4f 100644 --- a/geowebcache/release/src.xml +++ b/geowebcache/release/src.xml @@ -7,7 +7,7 @@ ${project.basedir} - geowebcache-1.7-SNAPSHOT/ + geowebcache-1.7.3/ true **/${project.build.directory}/** diff --git a/geowebcache/release/src.xml~ b/geowebcache/release/src.xml~ new file mode 100644 index 000000000..83ecf06b1 --- /dev/null +++ b/geowebcache/release/src.xml~ @@ -0,0 +1,26 @@ + + src + + zip + + false + + + ${project.basedir} + geowebcache-1.6-SNAPSHOT/ + true + + **/${project.build.directory}/** + target + **/target/** + .settings + **/.settings/** + **/.settings + .project + **/.project + .classpath + **/.classpath + + + + diff --git a/geowebcache/rest/pom.xml b/geowebcache/rest/pom.xml index 8b77e79c1..21e47cf50 100644 --- a/geowebcache/rest/pom.xml +++ b/geowebcache/rest/pom.xml @@ -5,7 +5,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-rest diff --git a/geowebcache/stylesheet.css b/geowebcache/stylesheet.css new file mode 100644 index 000000000..158e0b361 --- /dev/null +++ b/geowebcache/stylesheet.css @@ -0,0 +1,38 @@ +body { background-color: #FFFFFF; } + +p { margin: 3px; } + +.TableHeadingColor { background: #CCCCFF } +.TableSubHeadingColor { background: #EEEEFF } +.TableRowColor { background: #FFFFFF } + +.NavBarCell1 { background-color:#EEEEFF;}/* Light mauve */ +.NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */ +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + +.FrameTitleFont { font-size: normal; font-family: normal } +.FrameHeadingFont { font-size: normal; font-family: normal } +.FrameItemFont { font-size: normal; font-family: normal } + +div.code span.elem { color: darkred; } +div.code span.attr { color: red; } +div.code span.cont { color: black; } +div.code span.oper { color: blue; } +div.code span.comm { color: grey; } +div.code span.cdat { color: black; } +div.code span.proc { color: lightseagreen; } +div.code span.doct { color: dark-blue; } +div.code span.anno { color: #888888; } + +div.hierar { margin-left: 1em; text-indent: 0em; border-style:solid; border-width:1px; border-color: #D0D0D0;} +ul { margin-top: 0px; margin-bottom: 0px; } +li { margin-top: 0px; margin-bottom: 0px; } + +dt { font-weight: bold; } + +.anno { color: #888888; } +.smal { font-size: 60%; font-weight: bold; } diff --git a/geowebcache/tms/pom.xml b/geowebcache/tms/pom.xml index dd3f86ea1..eec90d3f0 100644 --- a/geowebcache/tms/pom.xml +++ b/geowebcache/tms/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-tms diff --git a/geowebcache/ve/pom.xml b/geowebcache/ve/pom.xml index 614c4d9bd..647b94a34 100644 --- a/geowebcache/ve/pom.xml +++ b/geowebcache/ve/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-ve diff --git a/geowebcache/web/pom.xml b/geowebcache/web/pom.xml index b4101698e..9b4ec6c37 100644 --- a/geowebcache/web/pom.xml +++ b/geowebcache/web/pom.xml @@ -5,7 +5,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-web diff --git a/geowebcache/wms/pom.xml b/geowebcache/wms/pom.xml index 59b8f62d2..ebc3c0ea4 100644 --- a/geowebcache/wms/pom.xml +++ b/geowebcache/wms/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-wms diff --git a/geowebcache/wmts/pom.xml b/geowebcache/wmts/pom.xml index 815ff1c5b..a166b3aa9 100644 --- a/geowebcache/wmts/pom.xml +++ b/geowebcache/wmts/pom.xml @@ -6,7 +6,7 @@ org.geowebcache geowebcache - 1.7-SNAPSHOT + 1.7.3 org.geowebcache gwc-wmts