Merge pull request #87 from bd2019us/JOSHUA-342 Using replace() instead of replaceAll() for non-regex patterns

commit: 07fcd3b5bf7e02838b5fdd5fd67b077b797d93f5 [log] [tgz]
author: Tommaso Teofili <tommaso@apache.org> Sun May 12 17:19:10 2019 +0200
committer: GitHub <noreply@github.com> Sun May 12 17:19:10 2019 +0200
tree: b3503404580c744bf7192acfcac5f20643aca99b
parent: 83ed9b7dda64da4667951b41b16f3a4f3b47d3f5 [diff]
parent: f586fffeadb9538d85492da51878e1054ed4d957 [diff]
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
deleted file mode 100644
index cafe13a..0000000
--- a/DISCLAIMER.txt
+++ /dev/null

@@ -1,7 +0,0 @@
-Apache Joshua is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by the Apache Incubator project. Incubation is required of all newly accepted
-projects until a further review indicates that the infrastructure, communications, and
-decision making process have stabilized in a manner consistent with other successful
-ASF projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
\ No newline at end of file

diff --git a/README.md b/README.md
index c4089b8..b585dd9 100644
--- a/README.md
+++ b/README.md

@@ -1,11 +1,11 @@
-[![Build Status](https://travis-ci.org/apache/incubator-joshua.svg?branch=master)](https://travis-ci.org/apache/incubator-joshua)
+[![Build Status](https://travis-ci.org/apache/joshua.svg?branch=master)](https://travis-ci.org/apache/joshua)
 [![homebrew](https://img.shields.io/homebrew/v/joshua.svg?maxAge=2592000?style=plastic)](http://braumeister.org/formula/joshua)
-[![license](https://img.shields.io/github/license/apache/incubator-joshua.svg?maxAge=2592000?style=plastic)](http://www.apache.org/licenses/LICENSE-2.0)
+[![license](https://img.shields.io/github/license/apache/joshua.svg?maxAge=2592000?style=plastic)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Jenkins](https://img.shields.io/jenkins/s/https/builds.apache.org/joshua_master.svg?maxAge=2592000?style=plastic)](https://builds.apache.org/job/joshua_master/)
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.joshua/joshua-incubating.svg)](http://search.maven.org/#search|ga|1|a%3A%22joshua-incubating%22)
 [![Twitter Follow](https://img.shields.io/twitter/follow/ApacheJoshua.svg?style=social&label=Follow&maxAge=2592000?style=plastic)](https://twitter.com/ApacheJoshua)
 
-# Welcome to Apache Joshua (Incubating)
+# Welcome to Apache Joshua
 <img src="https://s.apache.org/joshua_logo" align="right" width="300" />
 
 Joshua is a statistical machine translation toolkit for both phrase-based (new in version 6.0) and syntax-based decoding. It can be run with pre-built language packs available for download, and can also be used to build models for new language pairs. Among the many features of
@@ -16,7 +16,7 @@
  * [Thrax](https://github.com/joshua-decoder/thrax): a Hadoop-based, scalable grammar extractor
  * A [sparse feature architecture](http://cs.jhu.edu/~post/joshua-docs/md_sparse_features.html) supporting an arbitrary number of features
 
-The latest release of Joshua is always linked to directly from the [Home Page](http://joshua.incubator.apache.org)
+The latest release of Joshua is always linked to directly from the [Home Page](http://joshua.apache.org)
 
 ## New in 6.X
 
@@ -54,7 +54,7 @@
 
     cat SOURCE | $JOSHUA/bin/joshua-decoder -m MEM -c CONFIG OPTIONS > OUTPUT
 
-Some example usage scenarios and scripts can be found in the [examples/](https://github.com/apache/incubator-joshua/tree/master/examples) directory.
+Some example usage scenarios and scripts can be found in the [examples/](https://github.com/apache/joshua/tree/master/examples) directory.
 
 ## Development With Eclipse
 
@@ -65,7 +65,7 @@
 
 ## Working with "language packs"
 
-Joshua includes a number of "language packs", which are pre-built models that allow you to use the translation system as a black box, without worrying too much about how machine translation works. You can browse the models available for download on the [Joshua website](http://joshua.incubator.apache.org/language-packs/).
+Joshua includes a number of "language packs", which are pre-built models that allow you to use the translation system as a black box, without worrying too much about how machine translation works. You can browse the models available for download on the [Joshua website](http://joshua.apache.org/language-packs/).
 
 ## Building new models
 

diff --git a/distribution/docker/kenlm/Dockerfile b/distribution/docker/kenlm/Dockerfile
index 0feed0b..fd82090 100644
--- a/distribution/docker/kenlm/Dockerfile
+++ b/distribution/docker/kenlm/Dockerfile

@@ -40,7 +40,7 @@
 # download Joshua source and compile KenLM
 RUN mkdir -p /code
 WORKDIR /code
-RUN curl -L https://api.github.com/repos/apache/incubator-joshua/tarball | tar --strip-components=1 -xzvf -
+RUN curl -L https://api.github.com/repos/apache/joshua/tarball | tar --strip-components=1 -xzvf -
 RUN echo y | bash download-deps.sh kenlm
 
 # TODO: check that the LP version is correct

diff --git a/distribution/joshua-full/README.md b/distribution/joshua-full/README.md
index c98fdee..bd311d4 100644
--- a/distribution/joshua-full/README.md
+++ b/distribution/joshua-full/README.md

@@ -32,11 +32,11 @@
 # Contact Information
 
 To contact the authors swing by the dev mailing list:
-dev@joshua.incubator.apache.org
+dev@joshua.apache.org
 
 ## Apache Joshua
 
-  - http://joshua.incubator.apache.org
+  - http://joshua.apache.org
   - https://issues.apache.org/jira/browse/joshua
-  - dev@joshua.incubator.apache.org
+  - dev@joshua.apache.org
 

diff --git a/distribution/joshua-full/layer.yaml b/distribution/joshua-full/layer.yaml
index 2c76838..4a5747a 100644
--- a/distribution/joshua-full/layer.yaml
+++ b/distribution/joshua-full/layer.yaml

@@ -17,4 +17,4 @@
 #
 
 includes: ['layer:basic', 'interface:java', 'layer:hadoop-client']
-repo: https://github.com/buggtb/incubator-joshua.git
+repo: https://github.com/buggtb/joshua.git

diff --git a/distribution/joshua-full/metadata.yaml b/distribution/joshua-full/metadata.yaml
index e6f3ca6..7cb476c 100644
--- a/distribution/joshua-full/metadata.yaml
+++ b/distribution/joshua-full/metadata.yaml

@@ -16,9 +16,9 @@
 #
 
 name: joshua-full
-summary: Joshua Runtime environment for language translation.
-maintainer: Joshua Project <dev@joshua.incubator.apache.org>
-description: Joshua is an open-source statistical machine translation decoder for phrase-based (new in 6.0), hierarchical, and syntax-based machine translation, written in Java. It is developed at the Human Language Technology Center of Excellence at Johns Hopkins University. Currently under incubation at the ASF.
+summary: Apache Joshua Runtime environment for language translation.
+maintainer: Apache Joshua PMC <dev@joshua.apache.org>
+description: Apache Joshua is an open-source statistical machine translation decoder for phrase-based (new in 6.0), hierarchical, and syntax-based machine translation, written in Java. It is developed at the Human Language Technology Center of Excellence at Johns Hopkins Universit and now a topl level project at the Apache Software Foundation.
 tags:
   - big_data
 series:

diff --git a/distribution/joshua-runtime/README.md b/distribution/joshua-runtime/README.md
index a92af59..6ac758b 100644
--- a/distribution/joshua-runtime/README.md
+++ b/distribution/joshua-runtime/README.md

@@ -32,11 +32,11 @@
 # Contact Information
 
 To contact the authors swing by the dev mailing list:
-dev@joshua.incubator.apache.org
+dev@joshua.apache.org
 
 ## Apache Joshua
 
-  - http://joshua.incubator.apache.org
+  - http://joshua.apache.org
   - https://issues.apache.org/jira/browse/joshua
-  - dev@joshua.incubator.apache.org
+  - dev@joshua.apache.org
 

diff --git a/distribution/joshua-runtime/layer.yaml b/distribution/joshua-runtime/layer.yaml
index 482fed0..0814105 100644
--- a/distribution/joshua-runtime/layer.yaml
+++ b/distribution/joshua-runtime/layer.yaml

@@ -16,4 +16,4 @@
 #
 
 includes: ['layer:basic', 'interface:java']
-repo: https://github.com/buggtb/incubator-joshua.git
+repo: https://github.com/buggtb/joshua.git

diff --git a/distribution/joshua-runtime/metadata.yaml b/distribution/joshua-runtime/metadata.yaml
index 5f34d1a..23510a0 100644
--- a/distribution/joshua-runtime/metadata.yaml
+++ b/distribution/joshua-runtime/metadata.yaml

@@ -16,9 +16,9 @@
 #
 
 name: joshua-runtime
-summary: Joshua Runtime environment for language translation.
-maintainer: Joshua Project <dev@joshua.incubator.apache.org>
-description: Joshua is an open-source statistical machine translation decoder for phrase-based (new in 6.0), hierarchical, and syntax-based  machine translation, written in Java. It is developed at the Human Language Technology Center of Excellence at Johns Hopkins  University. Currently under incubation at the ASF.
+summary: Apache Joshua Runtime environment for language translation.
+maintainer: Apache Joshua PMC <dev@joshua.apache.org>
+description: Apache Joshua is an open-source statistical machine translation decoder for phrase-based (new in 6.0), hierarchical, and syntax-based machine translation, written in Java. It is developed at the Human Language Technology Center of Excellence at Johns Hopkins Universit and now a topl level project at the Apache Software Foundation.
 tags:
   - big_data
 series:

diff --git a/doap_joshua.rdf b/doap_joshua.rdf
index e5f28ae..b1616dd 100644
--- a/doap_joshua.rdf
+++ b/doap_joshua.rdf

@@ -43,14 +43,14 @@
     </release>
     <repository>
       <SVNRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/incubator-joshua.git"/>
-        <browse rdf:resource="https://github.com/apache/incubator-joshua"/>
+        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/joshua.git"/>
+        <browse rdf:resource="https://github.com/apache/joshua"/>
       </SVNRepository>
     </repository>
     <maintainer>
       <foaf:Person>
         <foaf:name>Joshua Development Team</foaf:name>
-          <foaf:mbox rdf:resource="mailto:dev@joshua.incubator.apache.org"/>
+          <foaf:mbox rdf:resource="mailto:dev@joshua.apache.org"/>
       </foaf:Person>
     </maintainer>
   </Project>

diff --git a/examples/README.md b/examples/README.md
index 72e8347..4650919 100644
--- a/examples/README.md
+++ b/examples/README.md

@@ -10,7 +10,7 @@
 The decoding examples and model training examples in the subdirectories of this
 directory assume you have downloaded the Fisher Spanish--English dataset, which
 contains speech-recognizer output paired with English translations. This data
-can be downloaded by running the [download.sh](https://github.com/apache/incubator-joshua/blob/master/examples/download.sh) script.
+can be downloaded by running the [download.sh](https://github.com/apache/joshua/blob/master/examples/download.sh) script.
 
 # Building a Spanish --> English Translation Model using the Fisher Spanish CALLHOME corpus
 
@@ -26,7 +26,7 @@
 $ mv joshua-decoder-*/ fisher-callhome-corpus
 ```
 
-B) Download and install Joshua as per the [Quickstart](https://github.com/apache/incubator-joshua#quick-start).
+B) Download and install Joshua as per the [Quickstart](https://github.com/apache/joshua#quick-start).
 
 C) Train the model:
 ```

diff --git a/pom.xml b/pom.xml
index c3bb3d6..b667f04 100644
--- a/pom.xml
+++ b/pom.xml

@@ -23,7 +23,7 @@
     <version>18</version>
   </parent>
   <groupId>org.apache.joshua</groupId>
-  <artifactId>joshua-incubating</artifactId>
+  <artifactId>joshua</artifactId>
   <packaging>jar</packaging>
   <version>6.2-SNAPSHOT</version>
   <name>Apache Joshua Machine Translation Toolkit</name>
@@ -31,7 +31,7 @@
   translation decoder for phrase-based, hierarchical,
   and syntax-based machine translation, written in Java.
   </description>
-  <url>http://joshua.incubator.apache.org</url>
+  <url>http://joshua.apache.org</url>
   <inceptionYear>2016</inceptionYear>
 
   <properties>
@@ -184,33 +184,33 @@
   <mailingLists>
     <mailingList>
       <name>Dev Mailing List</name>
-      <post>dev[at]joshua[dot]incubator[dot]apache[dot]org</post>
-      <subscribe>dev-subscribe[at]joshua[dot]incubator[dot]apache[dot]org</subscribe>
-      <unsubscribe>dev-unsubscribe[at]joshua[dot]incubator[dot]apache[dot]org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-joshua-dev/</archive>
+      <post>dev[at]joshua[dot]apache[dot]org</post>
+      <subscribe>dev-subscribe[at]joshua[dot]apache[dot]org</subscribe>
+      <unsubscribe>dev-unsubscribe[at]joshua[dot]apache[dot]org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/joshua-dev/</archive>
     </mailingList>
 
     <mailingList>
       <name>User Mailing List</name>
-      <post>user[at]joshua[dot]incubator[dot]apache[dot]org</post>
-      <subscribe>user-subscribe[at]joshua[dot]incubator[dot]apache[dot]org</subscribe>
-      <unsubscribe>user-unsubscribe[at]joshua[dot]incubator[dot]apache[dot]org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-joshua-user/</archive>
+      <post>user[at]joshua[dot]apache[dot]org</post>
+      <subscribe>user-subscribe[at]joshua[dot]apache[dot]org</subscribe>
+      <unsubscribe>user-unsubscribe[at]joshua[dot]apache[dot]org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/joshua-user/</archive>
     </mailingList>
 
     <mailingList>
       <name>Commits Mailing List</name>
-      <post>commits[at]joshua[dot]incubator[dot]apache[dot]org</post>
-      <subscribe>commits-subscribe[at]joshua[dot]incubator[dot]apache[dot]org</subscribe>
-      <unsubscribe>commits-unsubscribe[at]joshua[dot]incubator[dot]apache[dot]org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-joshua-commits/</archive>
+      <post>commits[at]joshua[dot]apache[dot]org</post>
+      <subscribe>commits-subscribe[at]joshua[dot]apache[dot]org</subscribe>
+      <unsubscribe>commits-unsubscribe[at]joshua[dot]apache[dot]org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/joshua-commits/</archive>
     </mailingList>
   </mailingLists>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-joshua.git</connection>
-    <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-joshua.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf/incubator-joshua.git</url>
+    <connection>scm:git:http://github.com/apache/joshua.git</connection>
+    <developerConnection>scm:git:http://github.com/apache/joshua.git</developerConnection>
+    <url>https://github.com/apache/joshua.git</url>
     <tag>HEAD</tag>
   </scm>
   <issueManagement>

diff --git a/src/overview.html b/src/overview.html
index 7efe5b3..cbd3839 100644
--- a/src/overview.html
+++ b/src/overview.html

@@ -34,7 +34,7 @@
 
 <!-- Put @see and @since tags down here. -->
 
-@see <a href="http://joshua.incubator.apache.org/">Joshua Website</a>
+@see <a href="http://joshua.apache.org/">Joshua Website</a>
 
 
 </body>
commit	07fcd3b5bf7e02838b5fdd5fd67b077b797d93f5	[log] [tgz]
author	Tommaso Teofili <tommaso@apache.org>	Sun May 12 17:19:10 2019 +0200
committer	GitHub <noreply@github.com>	Sun May 12 17:19:10 2019 +0200
tree	b3503404580c744bf7192acfcac5f20643aca99b
parent	83ed9b7dda64da4667951b41b16f3a4f3b47d3f5 [diff]
parent	f586fffeadb9538d85492da51878e1054ed4d957 [diff]