You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2011/06/02 18:13:18 UTC
svn commit: r1130626 - in /thrift/trunk/lib/java: build.properties build.xml
Author: jfarrell
Date: Thu Jun 2 16:13:18 2011
New Revision: 1130626
URL: http://svn.apache.org/viewvc?rev=1130626&view=rev
Log:
Thrift-1194: Java lib does not install artifacts to local dir correctly
Client: java
Patch: Jake Farrell
Fixes broken java lib install target to work properly and cleans up build.properties.
Modified:
thrift/trunk/lib/java/build.properties
thrift/trunk/lib/java/build.xml
Modified: thrift/trunk/lib/java/build.properties
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/build.properties?rev=1130626&r1=1130625&r2=1130626&view=diff
==============================================================================
--- thrift/trunk/lib/java/build.properties (original)
+++ thrift/trunk/lib/java/build.properties Thu Jun 2 16:13:18 2011
@@ -25,102 +25,3 @@ thrift.groupid=org.apache.thrift
# Jar Versions
mvn.ant.task.version=2.1.3
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-thrift.version=0.7.0
-thrift.groupid=org.apache.thrift
-
-# Jar Versions
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish
-license=http://www.apache.org/licenses/LICENSE-2.0.txt"
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
Modified: thrift/trunk/lib/java/build.xml
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/build.xml?rev=1130626&r1=1130625&r2=1130626&view=diff
==============================================================================
--- thrift/trunk/lib/java/build.xml (original)
+++ thrift/trunk/lib/java/build.xml Thu Jun 2 16:13:18 2011
@@ -131,12 +131,11 @@
<target name="install" depends="dist,javadoc">
<copy todir="${install.path}">
- <fileset dir="."><include name="*.jar"/></fileset>
+ <fileset dir="${build.dir}" includes="*.jar"/>
+ <fileset dir="${build.lib.dir}" includes="*.jar"/>
</copy>
<copy todir="${install.javadoc.path}">
- <fileset dir="${javadoc.dir}">
- <include name="**/*"/>
- </fileset>
+ <fileset dir="${javadoc.dir}" includes="**/*"/>
</copy>
</target>