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/08/04 21:23:17 UTC
svn commit: r1615732 - in
/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd:
CompareLibraries.java Deploy.java Legal.java
Author: andygumbrecht
Date: Mon Aug 4 19:23:17 2014
New Revision: 1615732
URL: http://svn.apache.org/r1615732
Log:
Legal cleanup
Modified:
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java?rev=1615732&r1=1615731&r2=1615732&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java Mon Aug 4 19:23:17 2014
@@ -41,7 +41,7 @@ public class CompareLibraries {
diff(repository, "apache-tomee", "1.6.0.2", "1.7.0", "webprofile");
diff(repository, "apache-tomee", "1.6.0.2", "1.7.0", "jaxrs");
diff(repository, "apache-tomee", "1.6.0.2", "1.7.0", "plus");
-// diff(repository, "apache-tomee", "1.6.0.2", "1.7.0", "plume");
+ diff(repository, "apache-tomee", "1.6.0.2", "1.7.0", "plume");
diff(repository, "openejb-standalone", "4.6.0.2", "4.7.0", null);
@@ -61,12 +61,12 @@ public class CompareLibraries {
for (final String key : a.keySet()) {
if (b.containsKey(key)) continue;
- System.out.printf(" D %s\n", path(a, key));
+ System.out.printf(" DEL %s\n", path(a, key));
}
for (final String key : b.keySet()) {
if (a.containsKey(key)) continue;
- System.out.printf(" A %s\n", path(b, key));
+ System.out.printf(" ADD %s\n", path(b, key));
}
System.out.println();
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java?rev=1615732&r1=1615731&r2=1615732&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java Mon Aug 4 19:23:17 2014
@@ -48,10 +48,13 @@ public class Deploy {
Exec.export("JAVA_HOME", System.getProperty("java.home"));
Exec.export("MAVEN_OPTS", Release.mavenOpts);
- //mvn -rf :bval-tomee -Darguments=-Dmaven.test.skip=true -DfailIfNoTests=false release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-1.6.0.2
+ //mvn -B -rf :bval-tomee -Darguments=-Dmaven.test.skip=true -DfailIfNoTests=false release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-1.6.0.2
final int exec = Exec.exec("mvn",
- "-Darguments=-Dmaven.test.skip=true -DfailIfNoTests=false",
+ "-Darguments=-Dmaven.test.skip=true -DfailIfNoTests=false -DskipTests -DretryFailedDeploymentCount=10",
+ "-DfailIfNoTests=false",
+ "-B",
+ "-DretryFailedDeploymentCount=10",
"release:perform",
format("-DconnectionUrl=scm:svn:%s", tag)
);
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java?rev=1615732&r1=1615731&r2=1615732&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java Mon Aug 4 19:23:17 2014
@@ -20,6 +20,10 @@ import org.apache.openejb.tools.release.
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Files;
+import java.io.File;
+
+import static org.apache.openejb.tools.release.util.Exec.exec;
+
/**
* @version $Rev$ $Date$
*/
@@ -27,9 +31,43 @@ import org.apache.openejb.tools.release.
public class Legal {
public static void main(final String[] args) throws Exception {
+ String legal = Files.file(Release.builddir, "staging-" + Release.build, "legal").getAbsolutePath();
org.apache.creadur.tentacles.Main.main(new String[]{
Release.staging,
- Files.file(Release.builddir, "staging-" + Release.build, "legal").getAbsolutePath()
+ legal
});
+
+ //We no longer need repo
+ final File repo = new File(legal, "repo");
+ if (repo.exists() && repo.isDirectory()) {
+ exec("rm", "-R", repo.getAbsolutePath());
+ }
+
+ legal = new File(legal,"content").getAbsolutePath();
+
+ //Clean up other files
+ exec("find", legal, "-name", "*.class", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.properties", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.gif", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.png", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.jpg", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.j", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.js", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.jar", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.sh", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.exe", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.zip", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.gz", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.java", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.original", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.xml", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.xsd", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.dtd", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.htm", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.html", "-type", "f", "-delete");
+ exec("find", legal, "-name", "*.conf", "-type", "f", "-delete");
+
+ exec("find", legal, "-type", "d", "-name", "\"*-javadoc.*\"", "-delete");
+ exec("find", legal, "-empty", "-type", "d", "-delete");
}
}