From 27722eb4033351e5230172d0f2b3fcf26b4a847f Mon Sep 17 00:00:00 2001 From: Bing Li Date: Tue, 12 Dec 2023 17:00:40 -0800 Subject: [PATCH 1/3] Revert "SNOW-989128 Create Parent POM (#73)" This reverts commit 545617482320e9ba07ec28331c259f40399d15e2. --- fips-pom.xml | 320 ++++++++++++++++++++++++++++++------------------- java_doc.xml | 8 +- parent-pom.xml | 135 --------------------- pom.xml | 283 +++++++++++++++++++++++++++++-------------- 4 files changed, 394 insertions(+), 352 deletions(-) delete mode 100644 parent-pom.xml diff --git a/fips-pom.xml b/fips-pom.xml index 9ca94656..224e149c 100644 --- a/fips-pom.xml +++ b/fips-pom.xml @@ -2,14 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - - com.snowflake - snowpark-parent - 1.10.0-SNAPSHOT - ./parent-pom.xml - - + com.snowflake snowpark-fips 1.10.0-SNAPSHOT ${project.artifactId} @@ -18,8 +11,8 @@ 2018 - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + Snowflake License + https://www.snowflake.com/legal/ @@ -33,16 +26,65 @@ - scm:git:git://github.com/snowflakedb/snowpark-java-scala - https://github.com/snowflakedb/snowpark-java-scala/tree/main + scm:git:git://github.com/snowflakedb/snowpark + http://github.com/snowflakedb/snowpark/tree/master - 1.0.2.1 - 1.0.5 + 1.8 + 1.8 + UTF-8 + 2.12.18 + 2.12 + 4.2.0 + 3.14.4 + ${scala.compat.version} + Snowpark ${project.version} + 1.64 + 4.3.0 + 2.13.2 + 2.13.4.2 + + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang + scala-compiler + ${scala.version} + + + commons-io + commons-io + 2.11.0 + + + javax.xml.bind + jaxb-api + 2.2.2 + + + org.slf4j + slf4j-api + 1.7.32 + + + org.slf4j + slf4j-simple + 1.7.32 + + + commons-codec + commons-codec + 1.15 + + + + net.snowflake snowflake-jdbc-fips @@ -51,13 +93,70 @@ org.bouncycastle bc-fips - ${bc.fips.version} + 1.0.2.1 test org.bouncycastle bcpkix-fips - ${bcpkix.fips.version} + 1.0.5 + test + + + + com.github.vertical-blank + sql-formatter + 1.0.2 + + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + + junit + junit + 4.13.1 + test + + + org.mockito + mockito-core + 2.23.0 + test + + + + org.scalatest + scalatest_${scala.compat.version} + 3.0.5 + test + + + org.specs2 + specs2-core_${scala.compat.version} + ${spec2.version} + test + + + org.specs2 + specs2-junit_${scala.compat.version} + ${spec2.version} test @@ -74,7 +173,7 @@ org.antipathy mvn-scalafmt_${version.scala.binary} - ${mvn.scalafmt.version} + 1.0.2 ${project.basedir}/.scalafmt.conf false @@ -101,7 +200,7 @@ com.coveo fmt-maven-plugin - ${fmt.maven.plugin.version} + 2.9.1 compile @@ -114,7 +213,7 @@ org.scalastyle scalastyle-maven-plugin - ${scalastyle.maven.plugin.version} + 1.0.0 false true @@ -185,7 +284,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} + 3.8.1 ${java.version} ${java.version} @@ -196,7 +295,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.version} + 2.21.0 true @@ -207,7 +306,7 @@ org.scalatest scalatest-maven-plugin - ${scalatest.maven.plugin.version} + 2.0.0 ${project.build.directory}/surefire-reports @@ -264,7 +363,7 @@ org.apache.maven.plugins maven-assembly-plugin - ${maven.assembly.version} + 3.3.0 - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.core.version} - test - - - org.scalatest - scalatest_${scala.compat.version} - ${scalatest.version} - test - - - org.specs2 - specs2-core_${scala.compat.version} - ${spec2.version} - test - - - org.specs2 - specs2-junit_${scala.compat.version} - ${spec2.version} - test - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index e6eb3c24..e2dfac23 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - - - com.snowflake - snowpark-parent - 1.10.0-SNAPSHOT - ./parent-pom.xml - - + com.snowflake snowpark 1.10.0-SNAPSHOT ${project.artifactId} @@ -38,16 +31,124 @@ + 1.8 + 1.8 + UTF-8 + 2.12.18 + 2.12 + 4.2.0 + 3.14.4 + ${scala.compat.version} + Snowpark ${project.version} 1.4.11 + 1.64 true + 4.3.0 + 2.13.2 + 2.13.4.2 + + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang + scala-compiler + ${scala.version} + + + commons-io + commons-io + 2.11.0 + + + javax.xml.bind + jaxb-api + 2.2.2 + + + org.slf4j + slf4j-api + 1.7.32 + + + org.slf4j + slf4j-simple + 1.7.32 + + + commons-codec + commons-codec + 1.15 + + + + net.snowflake snowflake-jdbc ${snowflake.jdbc.version} + + + com.github.vertical-blank + sql-formatter + 1.0.2 + + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + + junit + junit + 4.13.1 + test + + + org.mockito + mockito-core + 2.23.0 + test + + + + org.scalatest + scalatest_${scala.compat.version} + 3.0.5 + test + + + org.specs2 + specs2-core_${scala.compat.version} + ${spec2.version} + test + + + org.specs2 + specs2-junit_${scala.compat.version} + ${spec2.version} + test + @@ -62,7 +163,7 @@ org.antipathy mvn-scalafmt_${version.scala.binary} - ${mvn.scalafmt.version} + 1.0.2 ${project.basedir}/.scalafmt.conf false @@ -89,7 +190,7 @@ com.coveo fmt-maven-plugin - ${fmt.maven.plugin.version} + 2.9.1 compile @@ -102,7 +203,7 @@ org.scalastyle scalastyle-maven-plugin - ${scalastyle.maven.plugin.version} + 1.0.0 false true @@ -173,7 +274,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} + 3.8.1 ${java.version} ${java.version} @@ -184,7 +285,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.version} + 2.21.0 true @@ -195,7 +296,7 @@ org.scalatest scalatest-maven-plugin - ${scalatest.maven.plugin.version} + 2.2.0 ${project.build.directory}/surefire-reports @@ -252,7 +353,7 @@ org.apache.maven.plugins maven-assembly-plugin - ${maven.assembly.version} + 3.3.0