You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by im...@apache.org on 2021/10/03 06:46:41 UTC
[oodt] 01/02: Merge remote-tracking branch 'upstream/master' into
development
This is an automated email from the ASF dual-hosted git repository.
imesha pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/oodt.git
commit 26f4c32ec2c24b78d2f60092683eb7c5e3107e23
Merge: 749af12 07a7378
Author: Imesha Sudasingha <im...@gmail.com>
AuthorDate: Sun Oct 3 12:14:04 2021 +0530
Merge remote-tracking branch 'upstream/master' into development
# Conflicts:
# CHANGES.txt
# mvn/archetypes/radix/src/main/resources/bin/radix
CHANGES.txt | 2 +-
KEYS | 49 ++++++++++++++++++++++
mvn/archetypes/radix/src/main/resources/bin/radix | 6 +--
.../system/TestAvroRpcWorkflowManager.java | 5 ++-
4 files changed, 56 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index 88efe57,85b23cb..c55f718
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -2,16 -2,7 +2,16 @@@ Apache OODT Change Lo
======================
=======
+Release 2.0 - In Progress
+
+NOTE: Avro RPC becomes the default method of communication from this version. XML RPC is made deprecated.
+
+* OODT-1006 Introduce docker images for file manager, resource manager, ReactJs based OPSUI and file manager/workflow manager REST APIs
+
+* OODT-1006 Add Dockerfile for OODT deployment
+
+=======
- Release 1.9.1 - In Progress
+ Release 1.9.1 - 25/09/2021
* OODT-1031 OODT 1.9 should default to XMLRpc versions of FM/RESMGR/WMGR instead of Avro versions
diff --cc mvn/archetypes/radix/src/main/resources/bin/radix
index c241ddf,003d8d2..a662f9e
--- a/mvn/archetypes/radix/src/main/resources/bin/radix
+++ b/mvn/archetypes/radix/src/main/resources/bin/radix
@@@ -13,11 -13,7 +13,11 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
-mvn archetype:generate -DarchetypeGroupId=org.apache.oodt \
- -DarchetypeArtifactId=radix-archetype -DarchetypeVersion=1.9.1 \
- -Doodt=1.9.1 -DgroupId=com.mycompany \
- -DartifactId=oodt -Dversion=0.1
+mvn archetype:generate \
+ -DarchetypeGroupId=org.apache.oodt \
+ -DarchetypeArtifactId=radix-archetype \
- -DarchetypeVersion=1.9 \
- -Doodt=1.9 \
++ -DarchetypeVersion=1.9.1 \
++ -Doodt=1.9.1 \
+ -DgroupId=com.mycompany \
- -DartifactId=radix-build \
++ -DartifactId=oodt \
+ -Dversion=1.0-SNAPSHOT