You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by le...@apache.org on 2016/11/13 20:33:45 UTC

[1/3] incubator-joshua git commit: [maven-release-plugin] rollback the release of apache-joshua-6.1

Repository: incubator-joshua
Updated Branches:
  refs/heads/master 885389d51 -> 2c3836fb8


[maven-release-plugin] rollback the release of apache-joshua-6.1


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/21da5e11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/21da5e11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/21da5e11

Branch: refs/heads/master
Commit: 21da5e11094dbd512cf8304d4c9fd083043f249f
Parents: ced37ea
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Sun Nov 13 12:29:00 2016 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Sun Nov 13 12:29:00 2016 -0800

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/21da5e11/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c52a82..8b136ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <groupId>org.apache.joshua</groupId>
   <artifactId>joshua</artifactId>
   <packaging>jar</packaging>
-  <version>6.2-SNAPSHOT</version>
+  <version>6.1-SNAPSHOT</version>
   <name>Apache Joshua Machine Translation Toolkit</name>
   <description>Joshua is an open-source statistical machine
   translation decoder for phrase-based, hierarchical,


[2/3] incubator-joshua git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-joshua

Posted by le...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-joshua


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/8ef8803c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/8ef8803c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/8ef8803c

Branch: refs/heads/master
Commit: 8ef8803c35075175482e3392591388960b477c79
Parents: 21da5e1 885389d
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Sun Nov 13 12:29:32 2016 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Sun Nov 13 12:29:32 2016 -0800

----------------------------------------------------------------------
 scripts/training/templates/thrax-hiero.conf     | 2 +-
 scripts/training/templates/thrax-phrasal.conf   | 2 +-
 scripts/training/templates/thrax-phrase-gt.conf | 2 +-
 scripts/training/templates/thrax-phrase.conf    | 2 +-
 scripts/training/templates/thrax-samt.conf      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[3/3] incubator-joshua git commit: JOSHUA-323 Joshua 6.1 Release Management

Posted by le...@apache.org.
JOSHUA-323 Joshua 6.1 Release Management


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/2c3836fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/2c3836fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/2c3836fb

Branch: refs/heads/master
Commit: 2c3836fb8e36d7ffd18755124cc6a9ff8329d6a0
Parents: 8ef8803
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Sun Nov 13 12:33:44 2016 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Sun Nov 13 12:33:44 2016 -0800

----------------------------------------------------------------------
 pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/2c3836fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8b136ad..8912237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
     <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
     <checksum-maven-plugin.version>1.3</checksum-maven-plugin.version>
     <maven-scm-provider-gitexe.version>1.9.5</maven-scm-provider-gitexe.version>
+    <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
     <javac.src.version>1.8</javac.src.version>
     <javac.target.version>1.8</javac.target.version>
   </properties>
@@ -111,7 +112,6 @@
     <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>
-    <tag>apache-joshua-6.1</tag>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -165,6 +165,14 @@
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>${maven-deploy-plugin.version}</version>
+          <inherited>true</inherited>
+          <configuration>
+            <updateReleaseInfo>true</updateReleaseInfo>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>