--- lz4-java-1.3.0/build.xml 2014-11-26 20:04:10.000000000 +0100
+++ lz4-java-1.3.0/build.xml.build 2015-07-21 15:15:49.041845748 +0200
@@ -15,8 +15,7 @@
<project name="lz4" default="dist" basedir="."
xmlns:cpptasks="antlib:net.sf.antcontrib.cpptasks"
xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:junit4="antlib:com.carrotsearch.junit4"
- xmlns:mvn="antlib:org.apache.maven.artifact.ant">
+ xmlns:junit4="antlib:com.carrotsearch.junit4">
<property name="src" location="src"/>
<property name="build" location="build"/>
@@ -56,8 +55,6 @@
</target>
<target name="-ivy-install" unless="ivy.available">
- <mkdir dir="${user.home}/.ant/lib" />
- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest="${user.home}/.ant/lib/${ivy.jar.name}"/>
</target>
<target name="install-cpptasks" unless="cpptasks.available">
@@ -68,10 +65,6 @@
</target>
<target name="install-maven-ant-tasks" unless="maven-ant-tasks.available">
- <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
- inline="true" conf="default" transitive="true" pathid="maven-ant-tasks.classpath"/>
- <taskdef uri="antlib:org.apache.maven.artifact.ant" resource="org/apache/maven/artifact/ant/antlib.xml" classpathref="maven-ant-tasks.classpath"/>
- <property name="maven-ant-tasks.available" value="true"/>
</target>
<target name="install-forbidden-apis" unless="forbidden-apis.available">
@@ -83,10 +76,6 @@
<target name="install-bnd" unless="bnd.available">
<!-- using bnd 1.50.0 because more recent versions have broken JAR wrapping -->
- <ivy:cachepath organisation="biz.aQute" module="bnd" revision="1.50.0"
- inline="true" conf="default" transitive="true" pathid="bnd.classpath"/>
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
- <property name="bnd.available" value="true"/>
</target>
<target name="init">
@@ -104,9 +93,15 @@
<property name="junit4.available" value="true" />
</target>
+ <path id="mvel.classpath">
+ <fileset dir="/usr/share/java">
+ <include name="mvel.jar"/>
+ <include name="objectweb-asm/asm.jar"/>
+ <include name="objectweb-asm/asm-util.jar"/>
+ </fileset>
+ </path>
+
<target name="generate-sources" depends="init">
- <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.1.5.Final"
- inline="true" conf="default" transitive="true" pathid="mvel.classpath"/>
<mkdir dir="${build}/java" />
<java
fork="true"
@@ -263,7 +258,9 @@
overview="${src}/java/overview.html"
packagenames="net.jpountz.lz4,net.jpountz.xxhash"
windowtitle="lz4 / xxhash - Java API ${ivy.revision}"
- destDir="${build}/docs">
+ destDir="${build}/docs"
+ encoding="UTF-8"
+ additionalparam="-Xdoclint:none">
<link href="http://download.oracle.com/javase/6/docs/api/" />
<sourcepath>
<pathelement location="${src}/java"/>
@@ -288,8 +285,12 @@
</jar>
</target>
- <target name="bundle" description="makes the JAR a valid OSGi bundle" depends="install-bnd, jar">
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
+ <target name="bundle" description="makes the JAR a valid OSGi bundle" depends="jar">
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" >
+ <classpath>
+ <fileset dir="/usr/share/java/aqute-bnd"/>
+ </classpath>
+ </taskdef>
<property name="packages.version" value="${ivy.revision}"/>
<!-- We need to remove potential -SNAPSHOT qualifiers as package versions... -->
<script language="javascript">
@@ -319,7 +320,7 @@
<target name="dist" description="package" depends="bundle,docs,sources,makepom" />
- <target name="forbidden-apis" description="check API usage" depends="install-forbidden-apis,compile">
+ <target name="forbidden-apis" description="check API usage" depends="compile">
<forbidden-apis internalRuntimeForbidden="true" classpathref="forbidden-apis.classpath">
<bundledSignatures name="jdk-unsafe-${javac.target}"/>
<bundledSignatures name="jdk-deprecated-${javac.target}"/>
@@ -337,37 +338,21 @@
<attribute name="repositoryid" />
<attribute name="repositoryurl" />
<sequential>
- <mvn:mvn>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file" />
- <arg value="-Durl=@{repositoryurl}" />
- <arg value="-DrepositoryId=@{repositoryid}" />
- <arg value="-DpomFile=${dist}/${ivy.module}-${ivy.revision}.pom" />
- <arg value="-Dfile=${dist}/${ivy.module}-${ivy.revision}.jar" />
- <arg value="-Dfiles=${dist}/${ivy.module}-${ivy.revision}-sources.jar,${dist}/${ivy.module}-${ivy.revision}-javadoc.jar" />
- <arg value="-Dclassifiers=sources,javadoc" />
- <arg value="-Dtypes=jar,jar" />
- <arg value="-Pgpg" />
- </mvn:mvn>
</sequential>
</macrodef>
<target name="deploy" description="deploy snapshot to snapshot repo" depends="install-maven-ant-tasks">
- <property name="skip.jni" value="true" />
- <antcall target="-deploy" />
</target>
<target name="-deploy" depends="clean,dist">
- <deploy repositoryid="sonatype-nexus-snapshots" repositoryurl="https://oss.sonatype.org/content/repositories/snapshots" />
</target>
<!-- before this, update project version from SNAPSHOT to RELEASE -->
<target name="stage" description="deploy to release repo" depends="install-maven-ant-tasks,test,forbidden-apis">
- <property name="skip.jni" value="true" />
- <antcall target="-stage" />
+
</target>
<target name="-stage" depends="clean,dist">
- <deploy repositoryid="sonatype-nexus-staging" repositoryurl="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
</target>
</project>