diff --git a/fips-pom.xml b/fips-pom.xml index 224e149c..9ca94656 100644 --- a/fips-pom.xml +++ b/fips-pom.xml @@ -2,7 +2,14 @@ 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 + + + com.snowflake + snowpark-parent + 1.10.0-SNAPSHOT + ./parent-pom.xml + + snowpark-fips 1.10.0-SNAPSHOT ${project.artifactId} @@ -11,8 +18,8 @@ 2018 - Snowflake License - https://www.snowflake.com/legal/ + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt @@ -26,65 +33,16 @@ - scm:git:git://github.com/snowflakedb/snowpark - http://github.com/snowflakedb/snowpark/tree/master + scm:git:git://github.com/snowflakedb/snowpark-java-scala + https://github.com/snowflakedb/snowpark-java-scala/tree/main - 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 + 1.0.2.1 + 1.0.5 - - 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 @@ -93,70 +51,13 @@ org.bouncycastle bc-fips - 1.0.2.1 + ${bc.fips.version} test org.bouncycastle bcpkix-fips - 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} + ${bcpkix.fips.version} test @@ -173,7 +74,7 @@ org.antipathy mvn-scalafmt_${version.scala.binary} - 1.0.2 + ${mvn.scalafmt.version} ${project.basedir}/.scalafmt.conf false @@ -200,7 +101,7 @@ com.coveo fmt-maven-plugin - 2.9.1 + ${fmt.maven.plugin.version} compile @@ -213,7 +114,7 @@ org.scalastyle scalastyle-maven-plugin - 1.0.0 + ${scalastyle.maven.plugin.version} false true @@ -284,7 +185,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven.compiler.version} ${java.version} ${java.version} @@ -295,7 +196,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + ${maven.surefire.version} true @@ -306,7 +207,7 @@ org.scalatest scalatest-maven-plugin - 2.0.0 + ${scalatest.maven.plugin.version} ${project.build.directory}/surefire-reports @@ -363,7 +264,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + ${maven.assembly.version} + + 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 e2dfac23..e6eb3c24 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,14 @@ 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 + + + com.snowflake + snowpark-parent + 1.10.0-SNAPSHOT + ./parent-pom.xml + + snowpark 1.10.0-SNAPSHOT ${project.artifactId} @@ -31,124 +38,16 @@ - 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 - @@ -163,7 +62,7 @@ org.antipathy mvn-scalafmt_${version.scala.binary} - 1.0.2 + ${mvn.scalafmt.version} ${project.basedir}/.scalafmt.conf false @@ -190,7 +89,7 @@ com.coveo fmt-maven-plugin - 2.9.1 + ${fmt.maven.plugin.version} compile @@ -203,7 +102,7 @@ org.scalastyle scalastyle-maven-plugin - 1.0.0 + ${scalastyle.maven.plugin.version} false true @@ -274,7 +173,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven.compiler.version} ${java.version} ${java.version} @@ -285,7 +184,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + ${maven.surefire.version} true @@ -296,7 +195,7 @@ org.scalatest scalatest-maven-plugin - 2.2.0 + ${scalatest.maven.plugin.version} ${project.build.directory}/surefire-reports @@ -353,7 +252,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + ${maven.assembly.version}