Author: andygumbrecht
Date: Tue Nov 17 11:33:14 2015
New Revision: 1714757
URL: http://svn.apache.org/viewvc?rev=1714757&view=rev
Log:
Improve Binaries + Tentacles (Patch submitted)
Added:
tomee/sandbox/release-tools/src/main/resources/log4j.properties
Modified:
tomee/sandbox/release-tools/ (props changed)
tomee/sandbox/release-tools/pom.xml
tomee/sandbox/release-tools/run.sh
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java
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/CompareLibraries.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java
Propchange: tomee/sandbox/release-tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 17 11:33:14 2015
@@ -2,3 +2,4 @@
target
*.iml
*.bat
+velocity.log
Modified: tomee/sandbox/release-tools/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/sandbox/release-tools/pom.xml?rev=1714757&r1=1714756&r2=1714757&view=diff
==============================================================================
--- tomee/sandbox/release-tools/pom.xml (original)
+++ tomee/sandbox/release-tools/pom.xml Tue Nov 17 11:33:14 2015
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>17</version>
</parent>
<groupId>org.apache.openejb.tools</groupId>
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
+ <version>1.7.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-jirareport</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.2</version>
<exclusions>
<exclusion>
<groupId>velocity</groupId>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.creadur.tentacles</groupId>
<artifactId>apache-tentacles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>plexus-utils</artifactId>
Modified: tomee/sandbox/release-tools/run.sh
URL:
http://svn.apache.org/viewvc/tomee/sandbox/release-tools/run.sh?rev=1714757&r1=1714756&r2=1714757&view=diff
==============================================================================
--- tomee/sandbox/release-tools/run.sh (original)
+++ tomee/sandbox/release-tools/run.sh Tue Nov 17 11:33:14 2015
@@ -4,4 +4,4 @@ clear
MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m
-Xss2048k"
-java -cp target/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar
org.apache.openejb.tools.release.Main $*
+d:/java/jdk7/bin/java.exe -cp
target/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar
org.apache.openejb.tools.release.Main $*
Modified:
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java
URL:
http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java?rev=1714757&r1=1714756&r2=1714757&view=diff
==============================================================================
---
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java
(original)
+++
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java
Tue Nov 17 11:33:14 2015
@@ -32,8 +32,8 @@ import java.util.regex.Pattern;
*/
public class Release {
- public static String openejbVersion = "4.7.2";
- public static String tomeeVersion = "1.7.2";
+ public static String openejbVersion = "7.0.0-M1";
+ public static String tomeeVersion = "7.0.0-M1";
public static String openejbVersionName = "openejb-${openejbVersion}";
public static String tomeeVersionName = "tomee-${tomeeVersion}";
@@ -44,16 +44,16 @@ public class Release {
public static String tckBranches =
"https://svn.apache.org/repos/tck/tomee-tck/branches/";;
public static String tckTrunk =
"https://svn.apache.org/repos/tck/tomee-tck/trunk";;
- public static String build = "1042";
- public static String mvnStaging =
"https://repository.apache.org/content/repositories/orgapachetomee-${build}/";;
- public static String staging =
"https://dist.apache.org/repos/dist/dev/tomee/staging-${build}/";;
+ public static String build = "1069";
+ public static String mvnStaging =
"https://repository.apache.org/content/repositories/orgapachetomee-1069/";;
+ public static String staging =
"https://repository.apache.org/content/repositories/orgapachetomee-1069/";;
//public static String ciBuilder = "openejb-4.5.1";
//public static String ciBuildNumber = "1";
- public static String builddir = "/tmp/downloads";
- public static String workdir = "/tmp/release";
+ public static String builddir = System.getProperty("user.home") +
"/tmp/downloads";
+ public static String workdir = System.getProperty("user.home") +
"/tmp/release";
public static String mavenOpts = "-Xmx1024m -XX:MaxPermSize=512m";
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=1714757&r1=1714756&r2=1714757&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
Tue Nov 17 11:33:14 2015
@@ -61,6 +61,7 @@ public class Binaries {
final URI repo = URI.create(Release.staging);
System.out.println("Downloads: " + dir.getAbsolutePath());
+ System.out.println("Repo: " + repo.toASCIIString());
final NexusClient client = new NexusClient(Platform.aPlatform());
final UriSet all = new UriSet(client.crawl(repo));
@@ -71,7 +72,7 @@ public class Binaries {
binaries = binaries.exclude(".*karafee.*");
for (final URI uri : binaries) {
- final File file = new File(dir, uri.getPath().replaceAll(".*/",
""));
+ final File file = new File(dir, uri.getPath().replaceAll(".*/",
"")).getAbsoluteFile();
System.out.println("Downloading " + file.getName());
client.download(uri, file);
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=1714757&r1=1714756&r2=1714757&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
Tue Nov 17 11:33:14 2015
@@ -38,12 +38,12 @@ public class CompareLibraries {
//
/Users/dblevins/.m2/repository/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.zip
- diff(repository, "apache-tomee", "1.7.0", "1.7.1-SNAPSHOT",
"webprofile");
- diff(repository, "apache-tomee", "1.7.0", "1.7.1-SNAPSHOT", "jaxrs");
- diff(repository, "apache-tomee", "1.7.0", "1.7.1-SNAPSHOT", "plus");
- diff(repository, "apache-tomee", "1.7.0", "1.7.1-SNAPSHOT", "plume");
+ diff(repository, "apache-tomee", "1.7.2", "7.0.0-M1", "webprofile");
+ diff(repository, "apache-tomee", "1.7.2", "7.0.0-M1", "jaxrs");
+ diff(repository, "apache-tomee", "1.7.2", "7.0.0-M1", "plus");
+ diff(repository, "apache-tomee", "1.7.2", "7.0.0-M1", "plume");
- diff(repository, "openejb-standalone", "4.7.0", "4.7.1", null);
+ diff(repository, "openejb-standalone", "4.7.2", "7.0.0-M1", null);
}
Modified:
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java
URL:
http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java?rev=1714757&r1=1714756&r2=1714757&view=diff
==============================================================================
---
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java
(original)
+++
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java
Tue Nov 17 11:33:14 2015
@@ -5,14 +5,14 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.tools.release.util;
Added: tomee/sandbox/release-tools/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/resources/log4j.properties?rev=1714757&view=auto
==============================================================================
--- tomee/sandbox/release-tools/src/main/resources/log4j.properties (added)
+++ tomee/sandbox/release-tools/src/main/resources/log4j.properties Tue Nov 17
11:33:14 2015
@@ -0,0 +1,8 @@
+# Root logger option
+log4j.rootLogger=INFO, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p
%c{1}:%L - %m%n
\ No newline at end of file
