You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/04/07 11:06:02 UTC
svn commit: r1585433 - in /tomee/sandbox/release-tools: ./
src/main/java/org/apache/openejb/tools/release/cmd/ src/main/resources/
Author: andygumbrecht
Date: Mon Apr 7 09:06:01 2014
New Revision: 1585433
URL: http://svn.apache.org/r1585433
Log:
Fix tentacles usage
Modified:
tomee/sandbox/release-tools/ (props changed)
tomee/sandbox/release-tools/pom.xml
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
tomee/sandbox/release-tools/src/main/resources/release-tasks.xml
Propchange: tomee/sandbox/release-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 7 09:06:01 2014
@@ -0,0 +1,4 @@
+.idea
+target
+*.iml
+*.bat
Modified: tomee/sandbox/release-tools/pom.xml
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/pom.xml?rev=1585433&r1=1585432&r2=1585433&view=diff
==============================================================================
--- tomee/sandbox/release-tools/pom.xml (original)
+++ tomee/sandbox/release-tools/pom.xml Mon Apr 7 09:06:01 2014
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
- <version>1.6.2</version>
+ <version>1.6.3-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java?rev=1585433&r1=1585432&r2=1585433&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java Mon Apr 7 09:06:01 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tools.release.cmd;
+import org.apache.creadur.tentacles.Platform;
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Files;
@@ -61,7 +62,7 @@ public class Binaries {
System.out.println("Downloads: " + dir.getAbsolutePath());
- final NexusClient client = new NexusClient();
+ final NexusClient client = new NexusClient(Platform.aPlatform());
final UriSet all = new UriSet(client.crawl(repo));
UriSet binaries = all.include(".*\\.(zip|gz|war).*");
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java?rev=1585433&r1=1585432&r2=1585433&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java Mon Apr 7 09:06:01 2014
@@ -16,10 +16,12 @@
*/
package org.apache.openejb.tools.release.cmd;
+import org.apache.creadur.tentacles.Platform;
+import org.apache.creadur.tentacles.TemplateBuilder;
+import org.apache.creadur.tentacles.Templates;
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Exec;
-import org.apache.creadur.tentacles.Templates;
import java.io.IOException;
import java.io.OutputStream;
@@ -33,7 +35,7 @@ public class Preview {
public static void main(String... args) throws IOException {
- final Templates.Builder template = Templates.template("preview.vm");
+ final TemplateBuilder template = new Templates(Platform.aPlatform()).template("preview.vm");
for (Field field : Release.class.getFields()) {
try {
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java?rev=1585433&r1=1585432&r2=1585433&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java Mon Apr 7 09:06:01 2014
@@ -16,12 +16,14 @@
*/
package org.apache.openejb.tools.release.cmd;
+import org.apache.creadur.tentacles.Platform;
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Commit;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Exec;
import org.apache.openejb.tools.release.util.ObjectList;
import org.apache.creadur.tentacles.Templates;
+import org.apache.creadur.tentacles.TemplateBuilder;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
@@ -50,7 +52,7 @@ public class Revote {
commits.removeAll(message);
commits = commits.ascending("revision");
- final Templates.Builder template = Templates.template("revote.vm");
+ final TemplateBuilder template = new Templates(Platform.aPlatform()).template("revote.vm");
template.add("commits", commits);
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java?rev=1585433&r1=1585432&r2=1585433&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java Mon Apr 7 09:06:01 2014
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.tools.release.cmd;
+import org.apache.creadur.tentacles.Platform;
+import org.apache.creadur.tentacles.TemplateBuilder;
+import org.apache.creadur.tentacles.Templates;
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Release;
-import org.apache.openejb.tools.release.util.Exec;
-import org.apache.creadur.tentacles.Templates;
import java.io.IOException;
-import java.io.OutputStream;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -36,7 +36,7 @@ public class Vote {
public static void main(String[] args) throws IOException {
- final Templates.Builder template = Templates.template("vote.vm");
+ final TemplateBuilder template = new Templates(Platform.aPlatform()).template("vote.vm");
for (Field field : Release.class.getFields()) {
try {
Modified: tomee/sandbox/release-tools/src/main/resources/release-tasks.xml
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/resources/release-tasks.xml?rev=1585433&r1=1585432&r2=1585433&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/resources/release-tasks.xml (original)
+++ tomee/sandbox/release-tools/src/main/resources/release-tasks.xml Mon Apr 7 09:06:01 2014
@@ -13,7 +13,7 @@
</task>
<task summary="Ensure Build is passing">
- http://ci.apache.org/builders/openejb-trunk-ubuntu
+ http://http://ci.apache.org/builders/tomee-trunk-ubuntu
</task>
<task summary="Ensure JIRAs have been filed for commits" commands="ReviewCommits"/>
<task summary="Update fixVersions for JIRAs used in svn commits" commands="UpdateJiras" />