Skip to content

Commit

Permalink
pom cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonalgoyal
sonalgoyal committed Mar 2, 2023
1 parent 0aee820 commit ece99b9
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 122 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"editor.definitionLinkOpensInPeek": true,
"java.dependency.syncWithFolderExplorer": true
"java.dependency.syncWithFolderExplorer": true,
"java.configuration.updateBuildConfiguration": "interactive"
}
35 changes: 3 additions & 32 deletions common/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,11 @@
</parent>
<artifactId>zingg-common-client</artifactId>
<packaging>jar</packaging>
<properties>
<fasterxml.jackson.version>2.12.6</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.12.6.1</fasterxml.jackson.databind.version>
</properties>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<sourcepath>${basedir}/src/main/java/zingg/client</sourcepath>
</configuration>
</plugin>
</plugins>
</build>
</project>
7 changes: 1 addition & 6 deletions log4j.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,5 @@ log4j.logger.org.spark_project=OFF
log4j.logger.org.sparkproject=OFF
log4j.logger.org.elasticsearch.hadoop=INFO
log4j.logger.akka=WARN, FILE
log4j.logger.breeze=INFO, FILE
log4j.logger.breeze=WARN, FILE
log4j.logger.zingg=INFO
log4j.logger.zingg.hash=INFO
log4j.logger.zingg.block.Block=INFO
log4j.logger.zingg.Matcher=INFO
log4j.logger.zingg.Model=INFO
log4j.logger.com.datastax.spark=INFO
83 changes: 0 additions & 83 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@
</repositories>

<dependencies>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand All @@ -138,14 +133,6 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<!--<dependency>
<groupId>com.crealytics</groupId>
<artifactId>spark-excel_2.11</artifactId>
<version>0.10.0</version>
</dependency>
-->

<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand Down Expand Up @@ -208,44 +195,6 @@
</plugins>
</pluginManagement>
<plugins>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
-->

<!-- This plugin compiles Scala files -->


<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
Expand All @@ -255,38 +204,6 @@
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<!--<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<includes>
<include>
${project.parent.basedir}/python/phases
</include>
</includes>
</configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<systemProperties>
<property>
<name>dataDir</name>
<value>${project.parent.basedir}/examples</value>
</property>
<property>
<name>license</name>
<value>${project.parent.basedir}/license/zinggLicense</value>
</property>
</systemProperties>
<additionalClasspathElements>
<additionalClasspathElement>${project.parent.basedir}/client/target/classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>

</plugins>

</build>
Expand Down
32 changes: 32 additions & 0 deletions spark/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,36 @@
<version>${zingg.version}</version>
</dependency>
</dependencies>
<build>


<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
</configuration>
</plugin>
</plugins>

</build>
</project>
2 changes: 2 additions & 0 deletions spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@
<version>${graphframes.version}</version>
</dependency>
</dependencies>


</project>

0 comments on commit ece99b9

Please sign in to comment.