Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.

Commit 599de20

Browse files
author
xieqi
authored
Prepare for release v2.4.0 (#41)
1 parent 0587524 commit 599de20

3 files changed

Lines changed: 14 additions & 191 deletions

File tree

‎hadoop_qat_wrapper/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.intel.qat</groupId>
2323
<artifactId>qat-parent</artifactId>
24-
<version>2.4.0-SNAPSHOT</version>
24+
<version>2.4.0</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎pom.xml‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,17 @@
2020

2121
<groupId>com.intel.qat</groupId>
2222
<artifactId>qat-parent</artifactId>
23-
<version>2.4.0-SNAPSHOT</version>
23+
<version>2.4.0</version>
2424
<packaging>pom</packaging>
2525

2626
<name>QATCodec</name>
2727
<description>QAT Codec for Apache Hadoop and Spark</description>
2828
<url>https://github.com/intel-hadoop/IntelQATCodec</url>
29-
29+
3030
<properties>
3131
<qatzip.libs>/usr/lib64/</qatzip.libs>
3232
<qatzip.src>/opt/intel/QATzip</qatzip.src>
33-
</properties>
34-
35-
<repositories>
36-
<repository>
37-
<id>cdh.repo</id>
38-
<url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
39-
<name>Cloudera Repositories</name>
40-
<snapshots>
41-
<enabled>false</enabled>
42-
</snapshots>
43-
</repository>
44-
</repositories>
33+
</properties>
4534

4635
<licenses>
4736
<license>
@@ -54,9 +43,6 @@
5443
<modules>
5544
<module>hadoop_qat_wrapper</module>
5645
<module>spark_qat_wrapper</module>
57-
<module>carbondata_qat_wrapper</module>
58-
<module>kafka_qat_wrapper</module>
59-
<module>assembly</module>
6046
</modules>
6147

6248
</project>

‎spark_qat_wrapper/pom.xml‎

Lines changed: 10 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.intel.qat</groupId>
2020
<artifactId>qat-parent</artifactId>
21-
<version>2.4.0-SNAPSHOT</version>
21+
<version>2.4.0</version>
2222
<relativePath>../pom.xml</relativePath>
2323
</parent>
2424

@@ -34,15 +34,13 @@
3434
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
3535
<basedir>./</basedir>
3636
<java.version>1.8</java.version>
37-
<maven.version>3.3.9</maven.version>
38-
<scala.version>2.11.12</scala.version>
39-
<scala.binary.version>2.11</scala.binary.version>
40-
<spark.version>2.4.8.7.2.12.0-291</spark.version>
37+
<maven.version>3.6.3</maven.version>
38+
<scala.version>2.12.10</scala.version>
39+
<scala.binary.version>2.12</scala.binary.version>
40+
<spark.version>3.0.0</spark.version>
4141
<spark-scope>provided</spark-scope>
42-
<hadoop-common.version>3.2.4</hadoop-common.version>
43-
<!--<hadoop-common.version>2.6.0-cdh5.10.1</hadoop-common.version>-->
44-
<scalatest.version>2.2.6</scalatest.version>
45-
<scalacheck.version>1.12.5</scalacheck.version> <!-- 1.13.0 appears incompatible with scalatest 2.2.6 -->
42+
<scalatest.version>3.0.8</scalatest.version>
43+
<scalacheck.version>1.14.2</scalacheck.version>
4644
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
4745
<scalatest-maven-plugin.version>1.0</scalatest-maven-plugin.version>
4846
<scalastyle-maven-plugin.version>0.8.0</scalastyle-maven-plugin.version>
@@ -60,7 +58,6 @@
6058
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
6159
<maven-dependency-plugin.version>3.0.0</maven-dependency-plugin.version>
6260
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
63-
<junit.version>4.13.1</junit.version>
6461

6562
<!-- Modules that copy jars to the build directory should do so under this location. -->
6663
<jars.target.dir>${project.build.directory}/jars</jars.target.dir>
@@ -72,55 +69,6 @@
7269
<CodeCacheSize>512m</CodeCacheSize>
7370
</properties>
7471

75-
<repositories>
76-
<repository>
77-
<id>mavencentral</id>
78-
<name>maven central repository</name>
79-
<url>http://repo1.maven.org/maven2</url>
80-
<layout>default</layout>
81-
<releases>
82-
<enabled>true</enabled>
83-
<checksumPolicy>warn</checksumPolicy>
84-
</releases>
85-
<snapshots>
86-
<enabled>false</enabled>
87-
</snapshots>
88-
</repository>
89-
<repository>
90-
<id>datanucleus</id>
91-
<name>datanucleus maven repository</name>
92-
<url>http://www.datanucleus.org/downloads/maven2</url>
93-
<layout>default</layout>
94-
<releases>
95-
<enabled>true</enabled>
96-
<checksumPolicy>warn</checksumPolicy>
97-
</releases>
98-
<snapshots>
99-
<enabled>false</enabled>
100-
</snapshots>
101-
</repository>
102-
<repository>
103-
<id>glassfish-repository</id>
104-
<url>http://maven.glassfish.org/content/groups/glassfish</url>
105-
<releases>
106-
<enabled>false</enabled>
107-
</releases>
108-
<snapshots>
109-
<enabled>false</enabled>
110-
</snapshots>
111-
</repository>
112-
<repository>
113-
<id>sonatype-snapshot</id>
114-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
115-
<releases>
116-
<enabled>false</enabled>
117-
</releases>
118-
<snapshots>
119-
<enabled>false</enabled>
120-
</snapshots>
121-
</repository>
122-
</repositories>
123-
12472
<pluginRepositories>
12573
<pluginRepository>
12674
<id>central</id>
@@ -135,32 +83,7 @@
13583
</pluginRepositories>
13684

13785
<dependencies>
138-
<dependency>
139-
<groupId>org.scala-lang</groupId>
140-
<artifactId>scala-library</artifactId>
141-
<version>${scala.version}</version>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.scala-lang</groupId>
145-
<artifactId>scala-compiler</artifactId>
146-
<version>${scala.version}</version>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.scala-lang</groupId>
150-
<artifactId>scala-reflect</artifactId>
151-
<version>${scala.version}</version>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.scala-lang</groupId>
155-
<artifactId>scala-actors</artifactId>
156-
<version>${scala.version}</version>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.scala-lang</groupId>
160-
<artifactId>scalap</artifactId>
161-
<version>${scala.version}</version>
162-
</dependency>
163-
<!-- Disable due to security issue, please enable it when compile
86+
<!-- Disable due to security issue, please enable it when compile-->
16487
<dependency>
16588
<groupId>org.apache.spark</groupId>
16689
<artifactId>spark-core_${scala.binary.version}</artifactId>
@@ -177,48 +100,6 @@
177100
</exclusion>
178101
</exclusions>
179102
</dependency>
180-
<dependency>
181-
<groupId>org.apache.spark</groupId>
182-
<artifactId>spark-mllib_${scala.binary.version}</artifactId>
183-
<version>${spark.version}</version>
184-
<scope>${spark-scope}</scope>
185-
</dependency>
186-
<dependency>
187-
<groupId>org.apache.spark</groupId>
188-
<artifactId>spark-sql_${scala.binary.version}</artifactId>
189-
<version>${spark.version}</version>
190-
<scope>${spark-scope}</scope>
191-
</dependency>
192-
<dependency>
193-
<groupId>org.apache.spark</groupId>
194-
<artifactId>spark-hive_${scala.binary.version}</artifactId>
195-
<version>${spark.version}</version>
196-
<scope>${spark-scope}</scope>
197-
<exclusions>
198-
<exclusion>
199-
<groupId>log4j</groupId>
200-
<artifactId>apache-log4j-extras</artifactId>
201-
</exclusion>
202-
</exclusions>
203-
</dependency>
204-
<dependency>
205-
<groupId>org.apache.spark</groupId>
206-
<artifactId>spark-graphx_${scala.binary.version}</artifactId>
207-
<version>${spark.version}</version>
208-
<scope>${spark-scope}</scope>
209-
</dependency>
210-
<dependency>
211-
<groupId>org.apache.spark</groupId>
212-
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
213-
<version>${spark.version}</version>
214-
<scope>${spark-scope}</scope>
215-
</dependency>
216-
<dependency>
217-
<groupId>org.apache.spark</groupId>
218-
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
219-
<version>${spark.version}</version>
220-
<scope>${spark-scope}</scope>
221-
</dependency>
222103
<dependency>
223104
<groupId>org.apache.spark</groupId>
224105
<artifactId>spark-core_${scala.binary.version}</artifactId>
@@ -236,52 +117,6 @@
236117
</exclusion>
237118
</exclusions>
238119
</dependency>
239-
<dependency>
240-
<groupId>org.apache.spark</groupId>
241-
<artifactId>spark-sql_${scala.binary.version}</artifactId>
242-
<version>${spark.version}</version>
243-
<type>test-jar</type>
244-
<scope>test</scope>
245-
</dependency>
246-
<dependency>
247-
<groupId>org.apache.spark</groupId>
248-
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
249-
<version>${spark.version}</version>
250-
<type>test-jar</type>
251-
<scope>test</scope>
252-
</dependency>
253-
-->
254-
<dependency>
255-
<groupId>org.apache.hadoop</groupId>
256-
<artifactId>hadoop-common</artifactId>
257-
<version>${hadoop-common.version}</version>
258-
<scope>compile</scope>
259-
<exclusions>
260-
<exclusion>
261-
<groupId>log4j</groupId>
262-
<artifactId>log4j</artifactId>
263-
</exclusion>
264-
</exclusions>
265-
</dependency>
266-
<dependency>
267-
<groupId>org.apache.hadoop</groupId>
268-
<artifactId>hadoop-common</artifactId>
269-
<version>${hadoop-common.version}</version>
270-
<type>test-jar</type>
271-
<scope>test</scope>
272-
<exclusions>
273-
<exclusion>
274-
<groupId>log4j</groupId>
275-
<artifactId>log4j</artifactId>
276-
</exclusion>
277-
</exclusions>
278-
</dependency>
279-
<dependency>
280-
<groupId>junit</groupId>
281-
<artifactId>junit</artifactId>
282-
<version>${junit.version}</version>
283-
<scope>test</scope>
284-
</dependency>
285120
<dependency>
286121
<groupId>org.scalacheck</groupId>
287122
<artifactId>scalacheck_${scala.binary.version}</artifactId>
@@ -484,8 +319,10 @@
484319
<configuration>
485320
<tasks>
486321
<property name="native.src.dir" value="${basedir}/src/main/native"/>
322+
<echo>Java Home: ${java.home}</echo>
487323
<exec dir="${native.src.dir}" executable="make" failonerror="true">
488324
<env key="QATZIPSRC" value="${qatzip.src}" />
325+
<env key="JAVA_HOME" value="${java.home}/.." />
489326
</exec>
490327
</tasks>
491328
</configuration>

0 commit comments

Comments
 (0)