Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Snyk] Upgrade commons-logging:commons-logging from 1.1.1 to 1.2 #160

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Snyk] Upgrade commons-logging:commons-logging from 1.1.1 to 1.2 #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 19 additions & 27 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -160,11 +160,11 @@
<exportAntProperties>true</exportAntProperties>
<target name="check-platform">
<condition property="windows">
<os family="windows" />
<os family="windows"/>
</condition>
<condition property="non-windows">
<not>
<isset property="windows" />
<isset property="windows"/>
</not>
</condition>
</target>
Expand Down Expand Up @@ -221,14 +221,13 @@
<format property="build_time" pattern="MM/dd/yyyy hh:mm aa" timezone="GMT"/>
</tstamp>
<exec executable="sh" outputproperty="build_revision">
<arg value="scripts/get_build_revision.sh" />
<arg value="scripts/get_build_revision.sh"/>
</exec>
<exec executable="whoami" outputproperty="build_author"/>
<exec executable="uname" outputproperty="build_os">
<arg value="-a"/>
</exec>
<propertyfile file="${project.build.outputDirectory}/hadoop-lzo-build.properties"
comment="This file is automatically generated - DO NOT EDIT">
<propertyfile file="${project.build.outputDirectory}/hadoop-lzo-build.properties" comment="This file is automatically generated - DO NOT EDIT">
<entry key="build_time" value="${build_time}"/>
<entry key="build_revision" value="${build_revision}"/>
<entry key="build_author" value="${build_author}"/>
Expand All @@ -250,10 +249,9 @@
<format property="build_time" pattern="MM/dd/yyyy hh:mm aa" timezone="GMT"/>
</tstamp>
<exec executable="sh" outputproperty="build_revision">
<arg value="scripts/get_build_revision.sh" />
<arg value="scripts/get_build_revision.sh"/>
</exec>
<propertyfile file="${project.build.outputDirectory}/hadoop-lzo-build.properties"
comment="This file is automatically generated - DO NOT EDIT">
<propertyfile file="${project.build.outputDirectory}/hadoop-lzo-build.properties" comment="This file is automatically generated - DO NOT EDIT">
<entry key="build_time" value="${build_time}"/>
<entry key="build_revision" value="${build_revision}"/>
<entry key="build_author" value="${env.USERNAME}"/>
Expand Down Expand Up @@ -311,12 +309,9 @@
<mkdir dir="${build.native.target}/lib"/>
<mkdir dir="${build.native}/src/com/hadoop/compression/lzo"/>

<javah classpath="${build.classes}"
destdir="${build.native}/src/com/hadoop/compression/lzo"
force="yes"
verbose="yes">
<class name="com.hadoop.compression.lzo.LzoCompressor" />
<class name="com.hadoop.compression.lzo.LzoDecompressor" />
<javah classpath="${build.classes}" destdir="${build.native}/src/com/hadoop/compression/lzo" force="yes" verbose="yes">
<class name="com.hadoop.compression.lzo.LzoCompressor"/>
<class name="com.hadoop.compression.lzo.LzoDecompressor"/>
</javah>

<exec dir="${build.native}" executable="sh" failonerror="true">
Expand Down Expand Up @@ -359,23 +354,20 @@
<mkdir dir="${build.native.target}/lib"/>
<mkdir dir="${build.native}/src/com/hadoop/compression/lzo"/>

<javah classpath="${build.classes}"
destdir="${build.native}/src/com/hadoop/compression/lzo"
force="yes"
verbose="yes">
<class name="com.hadoop.compression.lzo.LzoCompressor" />
<class name="com.hadoop.compression.lzo.LzoDecompressor" />
<javah classpath="${build.classes}" destdir="${build.native}/src/com/hadoop/compression/lzo" force="yes" verbose="yes">
<class name="com.hadoop.compression.lzo.LzoCompressor"/>
<class name="com.hadoop.compression.lzo.LzoDecompressor"/>
</javah>

<exec dir="${build.native}" executable="msbuild" failonerror="true">
<arg value="${basedir}/src/main/native/gplcompression.sln" />
<arg value="/nologo" />
<arg value="/p:Configuration=Release" />
<arg value="/p:IntDir=${build.native}/" />
<arg value="/p:OutDir=${build.native}/" />
<arg value="${basedir}/src/main/native/gplcompression.sln"/>
<arg value="/nologo"/>
<arg value="/p:Configuration=Release"/>
<arg value="/p:IntDir=${build.native}/"/>
<arg value="/p:OutDir=${build.native}/"/>
</exec>

<copy file="${build.native}/gplcompression.dll" todir="${build.native}/lib" />
<copy file="${build.native}/gplcompression.dll" todir="${build.native}/lib"/>

<copy todir="${build.native.target}/lib">
<fileset dir="${build.native}/lib"/>
Expand Down