Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions component-runtime-beam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
<spark-scala.version>@spark-scala.version@</spark-scala.version>
<spark.version>3.2.2</spark.version>
<spark.version>3.5.0</spark.version>
</systemPropertyVariables>
<classpathDependencyExcludes> <!-- shaded and would lead to logging errors -->
<classpathDependencyExclude>org.slf4j:slf4j-api</classpathDependencyExclude>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class SerializationOverClusterIT {
private static final TemporaryFolder TEMPORARY_FOLDER = new TemporaryFolder();

private static final SparkClusterRule SPARK = new SparkClusterRule(
System.getProperty("spark-scala.version", "2.12"), System.getProperty("spark.version", "3.2.2"), 1);
System.getProperty("spark-scala.version", "2.12"), System.getProperty("spark.version", "3.5.0"), 1);

@ClassRule
public static final TestRule RULE = outerRule(TEMPORARY_FOLDER).around(SPARK);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
9 changes: 0 additions & 9 deletions component-runtime-testing/component-runtime-junit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
37 changes: 0 additions & 37 deletions component-runtime-testing/component-runtime-testing-spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@
<version>${spark.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand All @@ -102,35 +94,6 @@
<artifactId>avro</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
14 changes: 0 additions & 14 deletions component-studio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,6 @@
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release-zl</id>
Expand Down
9 changes: 0 additions & 9 deletions component-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
9 changes: 0 additions & 9 deletions documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -841,15 +841,6 @@
<webapp>${project.build.directory}/${project.build.finalName}</webapp>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
9 changes: 0 additions & 9 deletions images/component-server-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
31 changes: 8 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,9 @@
<junit5.version>5.10.0</junit5.version>
<mockito4.version>4.8.1</mockito4.version>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.16.0</jackson.version>
<jackson-databind.version>2.16.0</jackson-databind.version>
<jackson.version>2.20.2</jackson.version>
<jackson-databind.version>2.20.2</jackson-databind.version>
<jackson-annotations.version>2.20</jackson-annotations.version>
<avro-jackson.version>1.9.13</avro-jackson.version>
<avro.version>1.11.5</avro.version>
<jsoup.version>1.15.3</jsoup.version>
Expand All @@ -227,7 +228,7 @@
<!-- should follow beam-sdk-java-core version -->
<joda.time.version>2.10.10</joda.time.version>

<spark.version>3.2.2</spark.version>
<spark.version>3.5.0</spark.version>
<spark-scala.version>2.12</spark-scala.version>

<groovy.version>3.0.18</groovy.version>
Expand Down Expand Up @@ -281,11 +282,11 @@
<ant.version>1.10.12</ant.version>
<jcommander.version>1.82</jcommander.version>
<snakeyaml.version>2.0</snakeyaml.version>
<google-oauth-client.version>1.34.1</google-oauth-client.version>
<google-oauth-client.version>1.39.0</google-oauth-client.version>
<nekohtml.version>1.9.6.2</nekohtml.version>
<gson.version>2.9.1</gson.version>
<ivy.version>2.5.2</ivy.version>
<aws-java-sdk-s3.version>1.12.285</aws-java-sdk-s3.version>
<ivy.version>2.5.3</ivy.version>
<aws-java-sdk-s3.version>1.12.629</aws-java-sdk-s3.version>
<testng.version>7.7.1</testng.version>
<jakarta.version>4.0.2</jakarta.version>

Expand Down Expand Up @@ -450,7 +451,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -1755,22 +1756,6 @@
<fail>true</fail>
</configuration>
</execution>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>joda-time:joda-time</exclude>
</excludes>
</bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
</execution>
<execution>
<id>mandatory-checks-on-project</id>
<goals>
Expand Down
9 changes: 0 additions & 9 deletions reporting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions sample-parent/sample-beam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-banned-joda-time-dependency</id>
<phase>none</phase>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
Loading