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 2015/11/26 23:04:49 UTC
svn commit: r1716775 - in /tomee/sandbox/release-tools: ./
src/main/java/org/apache/openejb/tools/release/
src/main/java/org/apache/openejb/tools/release/cmd/ src/main/resources/
Author: andygumbrecht
Date: Thu Nov 26 22:04:49 2015
New Revision: 1716775
URL: http://svn.apache.org/viewvc?rev=1716775&view=rev
Log:
Windows fixes
Modified:
tomee/sandbox/release-tools/pom.xml
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/Legal.java
tomee/sandbox/release-tools/src/main/resources/vote.vm
Modified: tomee/sandbox/release-tools/pom.xml
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/pom.xml?rev=1716775&r1=1716774&r2=1716775&view=diff
==============================================================================
--- tomee/sandbox/release-tools/pom.xml (original)
+++ tomee/sandbox/release-tools/pom.xml Thu Nov 26 22:04:49 2015
@@ -21,226 +21,237 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>17</version>
- </parent>
-
- <groupId>org.apache.openejb.tools</groupId>
- <artifactId>release-tools</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Release Tools</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <slf4j-version>1.7.7</slf4j-version>
- </properties>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.openejb.tools.release.Main</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j-version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-stream</artifactId>
- <version>1.6.3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-jirareport</artifactId>
- <version>1.6.2</version>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.creadur.tentacles</groupId>
- <artifactId>apache-tentacles</artifactId>
- <version>0.2-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>plexus-utils</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- </exclusion>
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-io</artifactId>
- <groupId>commons-io</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
- <artifactId>velocity</artifactId>
- <groupId>org.apache.velocity</groupId>
- </exclusion>
- <exclusion>
- <artifactId>apache-rat-plugin</artifactId>
- <groupId>org.apache.rat</groupId>
- </exclusion>
- <exclusion>
- <artifactId>swizzle-stream</artifactId>
- <groupId>org.codehaus.swizzle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>2.0.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.11</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.5</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>3.0.5</version>
- <exclusions>
- <exclusion>
- <artifactId>plexus-utils</artifactId>
- <groupId>org.codehaus.plexus</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>17</version>
+ </parent>
+
+ <groupId>org.apache.openejb.tools</groupId>
+ <artifactId>release-tools</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Release Tools</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <slf4j-version>1.7.7</slf4j-version>
+ </properties>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.7.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.apache.openejb.tools.release.Main</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ <version>1.6.3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-jirareport</artifactId>
+ <version>1.6.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.creadur.tentacles</groupId>
+ <artifactId>apache-tentacles</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>velocity</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>apache-rat-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>swizzle-stream</artifactId>
+ <groupId>org.codehaus.swizzle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <version>3.11</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.3.5</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
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=1716775&r1=1716774&r2=1716775&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 Thu Nov 26 22:04:49 2015
@@ -32,8 +32,8 @@ import java.util.regex.Pattern;
*/
public class Release {
- public static String openejbVersion = "7.0.0-M1";
- public static String tomeeVersion = "7.0.0-M1";
+ public static String openejbVersion = "4.7.3";
+ public static String tomeeVersion = "1.7.3";
public static String openejbVersionName = "openejb-${openejbVersion}";
public static String tomeeVersionName = "tomee-${tomeeVersion}";
@@ -44,9 +44,9 @@ 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 = "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 build = "1071";
+ public static String mvnStaging = "https://repository.apache.org/content/repositories/orgapachetomee-"+build+"/";
+ public static String staging = "https://repository.apache.org/content/repositories/orgapachetomee-"+build+"/";
//public static String ciBuilder = "openejb-4.5.1";
//public static String ciBuildNumber = "1";
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=1716775&r1=1716774&r2=1716775&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 Thu Nov 26 22:04:49 2015
@@ -73,6 +73,7 @@ public class Binaries {
for (final URI uri : binaries) {
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/Legal.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java?rev=1716775&r1=1716774&r2=1716775&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 Thu Nov 26 22:04:49 2015
@@ -81,7 +81,7 @@ public class Legal {
if (!f.isDirectory()) {
return false;
}
- File[] list = f.listFiles();
+ final File[] list = f.listFiles();
return (list == null || list.length == 0);
}
Modified: tomee/sandbox/release-tools/src/main/resources/vote.vm
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/resources/vote.vm?rev=1716775&r1=1716774&r2=1716775&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/resources/vote.vm (original)
+++ tomee/sandbox/release-tools/src/main/resources/vote.vm Thu Nov 26 22:04:49 2015
@@ -6,7 +6,11 @@ From: $from
SVN Tag:
- $tags$tomeeVersionName/
+ release-tomee-7.0.0-M1
+
+ git checkout -b tagged-tomee-7.0.0-M1 release-tomee-7.0.0-M1
+
+$tags$tomeeVersionName/
Maven Repo: