Merged branch master into avrorpc
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ec89c4..d88b954 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,12 @@
Apache OODT Change Log
======================
+Release 0.13 - 06/21/2016
+
+* OODT-925 - Update schema.xml field defs for SOLR 5.x
+* OODT-926 - Fix pom versioning
+* OODT-927 - Sanitize SQL commands in CAS DatasourceIngestMapper
+* OODT-928 - UPdate maven-compiler-plugin
+
Release 0.12 - 02/10/2016
* OODT-781 Add missing XMLRPC endpoint for remove hashtable. (magicaltrout)
diff --git a/agility/setup.py b/agility/setup.py
index 30af7aa..a7bb15e 100644
--- a/agility/setup.py
+++ b/agility/setup.py
@@ -25,7 +25,7 @@
# ------------
_name = 'oodt'
-_version = '0.11'
+_version = '0.12'
_description = 'Apache OODT'
_url = 'http://oodt.apache.org/'
_downloadURL = 'http://pypi.python.org/pypi/oodt/'
diff --git a/app/fmbrowser/pom.xml b/app/fmbrowser/pom.xml
index 0f2c27e..a3a2ce6 100644
--- a/app/fmbrowser/pom.xml
+++ b/app/fmbrowser/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-fm-browser</artifactId>
diff --git a/app/weditor/pom.xml b/app/weditor/pom.xml
index 13868bb..107e4a4 100644
--- a/app/weditor/pom.xml
+++ b/app/weditor/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>weditor</artifactId>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 442bb05..72c538b 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-catalog</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6e94f75..acb4a49 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-cli</artifactId>
diff --git a/commons/pom.xml b/commons/pom.xml
index c344bdd..1d9ee9b 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-commons</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index a8dd0b3..ccebd33 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OODT Core</name>
<properties>
diff --git a/crawler/pom.xml b/crawler/pom.xml
index 28807da..5428b53 100644
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-crawler</artifactId>
diff --git a/curator/services/pom.xml b/curator/services/pom.xml
index 008a571..dfe83ed 100644
--- a/curator/services/pom.xml
+++ b/curator/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>curator-services</artifactId>
diff --git a/curator/webapp/pom.xml b/curator/webapp/pom.xml
index b7a5880..5dd050a 100644
--- a/curator/webapp/pom.xml
+++ b/curator/webapp/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-curator</artifactId>
diff --git a/filemgr/pom.xml b/filemgr/pom.xml
index c5bb6be..f85b88b 100644
--- a/filemgr/pom.xml
+++ b/filemgr/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-filemgr</artifactId>
diff --git a/grid/pom.xml b/grid/pom.xml
index f3b9801..59a355d 100644
--- a/grid/pom.xml
+++ b/grid/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>web-grid</artifactId>
diff --git a/metadata/pom.xml b/metadata/pom.xml
index d6ab647..0510389 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-metadata</artifactId>
diff --git a/mvn/archetypes/opsui/pom.xml b/mvn/archetypes/opsui/pom.xml
index bf8ffaf..a2ca03a 100644
--- a/mvn/archetypes/opsui/pom.xml
+++ b/mvn/archetypes/opsui/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../../core</relativePath>
</parent>
<artifactId>opsui-archetype</artifactId>
diff --git a/mvn/archetypes/pom.xml b/mvn/archetypes/pom.xml
index fea79db..09bc258 100644
--- a/mvn/archetypes/pom.xml
+++ b/mvn/archetypes/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core</relativePath>
</parent>
diff --git a/mvn/archetypes/radix/pom.xml b/mvn/archetypes/radix/pom.xml
index e4f30e1..1754725 100644
--- a/mvn/archetypes/radix/pom.xml
+++ b/mvn/archetypes/radix/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../../core</relativePath>
</parent>
<artifactId>radix-archetype</artifactId>
diff --git a/mvn/archetypes/radix/src/main/resources/bin/radix b/mvn/archetypes/radix/src/main/resources/bin/radix
index 5493bde..b70bb95 100755
--- a/mvn/archetypes/radix/src/main/resources/bin/radix
+++ b/mvn/archetypes/radix/src/main/resources/bin/radix
@@ -14,6 +14,6 @@
# limitations under the License.
mvn archetype:generate -DarchetypeGroupId=org.apache.oodt \
- -DarchetypeArtifactId=radix-archetype -DarchetypeVersion=0.12 \
- -Doodt=0.12 -DgroupId=com.mycompany \
+ -DarchetypeArtifactId=radix-archetype -DarchetypeVersion=1.0 \
+ -Doodt=1.0 -DgroupId=com.mycompany \
-DartifactId=oodt -Dversion=0.1
diff --git a/mvn/plugins/cas-install/pom.xml b/mvn/plugins/cas-install/pom.xml
index 9bf6455..b64c98f 100644
--- a/mvn/plugins/cas-install/pom.xml
+++ b/mvn/plugins/cas-install/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<artifactId>maven-cas-install-plugin</artifactId>
diff --git a/opendapps/pom.xml b/opendapps/pom.xml
index f2624a3..7f7f051 100644
--- a/opendapps/pom.xml
+++ b/opendapps/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>opendapps</artifactId>
diff --git a/pcs/core/pom.xml b/pcs/core/pom.xml
index c310f0f..70b922a 100644
--- a/pcs/core/pom.xml
+++ b/pcs/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-core</artifactId>
diff --git a/pcs/input/pom.xml b/pcs/input/pom.xml
index 9fa1607..06a5745 100644
--- a/pcs/input/pom.xml
+++ b/pcs/input/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-input</artifactId>
diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml
index a078b16..ab6fad9 100755
--- a/pcs/opsui/pom.xml
+++ b/pcs/opsui/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-opsui</artifactId>
diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml
index ac165ea..8ee1d4d 100644
--- a/pcs/services/pom.xml
+++ b/pcs/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-services</artifactId>
diff --git a/pge/pom.xml b/pge/pom.xml
index 3aab5ff..5f86380 100644
--- a/pge/pom.xml
+++ b/pge/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-pge</artifactId>
diff --git a/pom.xml b/pom.xml
index 4b99b3c..f5b1c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>core/pom.xml</relativePath>
</parent>
diff --git a/product/pom.xml b/product/pom.xml
index 0e57cb9..aa00f92 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-product</artifactId>
diff --git a/profile/pom.xml b/profile/pom.xml
index 9ff764b..3d67496 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-profile</artifactId>
diff --git a/protocol/api/pom.xml b/protocol/api/pom.xml
index cae19d5..0cbe0a4 100644
--- a/protocol/api/pom.xml
+++ b/protocol/api/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-protocol-api</artifactId>
diff --git a/protocol/ftp/pom.xml b/protocol/ftp/pom.xml
index 9ecf2fa..7c500d5 100644
--- a/protocol/ftp/pom.xml
+++ b/protocol/ftp/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-protocol-ftp</artifactId>
diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml
index cdd64ea..22013f5 100644
--- a/protocol/http/pom.xml
+++ b/protocol/http/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-protocol-http</artifactId>
diff --git a/protocol/imaps/pom.xml b/protocol/imaps/pom.xml
index b91e031..9e54a1f 100644
--- a/protocol/imaps/pom.xml
+++ b/protocol/imaps/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-protocol-imaps</artifactId>
diff --git a/protocol/sftp/pom.xml b/protocol/sftp/pom.xml
index fdbea55..71ab9df 100644
--- a/protocol/sftp/pom.xml
+++ b/protocol/sftp/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-protocol-sftp</artifactId>
diff --git a/pushpull/pom.xml b/pushpull/pom.xml
index cc3307b..a451ce2 100644
--- a/pushpull/pom.xml
+++ b/pushpull/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-pushpull</artifactId>
diff --git a/resource/pom.xml b/resource/pom.xml
index 2b4f3d5..6ccb724 100644
--- a/resource/pom.xml
+++ b/resource/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-resource</artifactId>
diff --git a/sso/pom.xml b/sso/pom.xml
index 6eea62e..cdb59a2 100644
--- a/sso/pom.xml
+++ b/sso/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-sso</artifactId>
diff --git a/webapp/components/pom.xml b/webapp/components/pom.xml
index 48abbdd..ebe39de 100644
--- a/webapp/components/pom.xml
+++ b/webapp/components/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-webapp-components</artifactId>
diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml
index e5cea81..dd22f8d 100644
--- a/webapp/fmbrowser/pom.xml
+++ b/webapp/fmbrowser/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>fmbrowser</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>CAS File Manager Browser Web App</name>
<properties>
diff --git a/webapp/fmprod/pom.xml b/webapp/fmprod/pom.xml
index f2ebd24..f5e4646 100644
--- a/webapp/fmprod/pom.xml
+++ b/webapp/fmprod/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-product</artifactId>
diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml
index fa57986..c97132b 100644
--- a/webapp/wmonitor/pom.xml
+++ b/webapp/wmonitor/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>wmonitor</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>CAS Workflow Manager Monitor Web App</name>
<properties>
diff --git a/workflow/pom.xml b/workflow/pom.xml
index 6a099b9..7cd03eb 100644
--- a/workflow/pom.xml
+++ b/workflow/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-workflow</artifactId>
diff --git a/xmlps/pom.xml b/xmlps/pom.xml
index ba2a4e8..01b49c3 100644
--- a/xmlps/pom.xml
+++ b/xmlps/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-xmlps</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>XML-configured, DBMS-based Product and Profile Server</name>
<description>An XML-configured DBMS-based Product and Profile meant to easily
sit on top of Web-Grid and other Product and Profile server contexts
diff --git a/xmlquery/pom.xml b/xmlquery/pom.xml
index af0ce9a..f227b81 100644
--- a/xmlquery/pom.xml
+++ b/xmlquery/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-xmlquery</artifactId>
