revert everything

cloudera · Feb 12, 2024 · d86eb40 · d86eb40
1 parent e45cb36
commit d86eb40
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 27 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -25,15 +25,16 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '8'
-          distribution: 'adopt'
-#          cache: maven
+          distribution: 'temurin'
+          cache: maven
       - name: Build with Maven
+#        FIXME once flink-stellar builds as expected, remove the following part: -pl flink-stellar -am
         run: mvn -B -DskipTests=true package --file flink-cyber/pom.xml -pl flink-stellar -am
       - name: Test with Maven
         run: mvn -B test --file flink-cyber/pom.xml -pl flink-stellar -am
 
       # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-#      - name: Update dependency graph
-#        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
-#        with:
-#          directory: /home/runner/work/cybersec/cybersec/flink-cyber
+      - name: Update dependency graph
+        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+        with:
+          directory: /home/runner/work/cybersec/cybersec/flink-cyber
diff --git a/flink-cyber/cyber-jobs/pom.xml b/flink-cyber/cyber-jobs/pom.xml
@@ -118,7 +118,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>

diff --git a/flink-cyber/flink-enrichment/metron-enrichment-common/pom.xml b/flink-cyber/flink-enrichment/metron-enrichment-common/pom.xml
@@ -320,12 +320,9 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/assembly.xml</descriptor>
-                    </descriptors>
+                    <descriptor>src/main/assembly/assembly.xml</descriptor>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/flink-cyber/flink-stellar/pom.xml b/flink-cyber/flink-stellar/pom.xml
@@ -477,7 +477,6 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <descriptors>

diff --git a/...r/src/test/java/org/apache/metron/stellar/dsl/functions/RestFunctionsIntegrationTest.java b/...r/src/test/java/org/apache/metron/stellar/dsl/functions/RestFunctionsIntegrationTest.java
@@ -71,7 +71,6 @@ public class RestFunctionsIntegrationTest {
   @BeforeEach
   public void setup() throws Exception {
     mockServerClient = startClientAndServer(MOCK_PROXY_PORT);
-//    System.out.println("TESTING MOCK_PROXY_PORT: " + MOCK_PROXY_PORT);
 
     context = new Context.Builder()
             .with(Context.Capabilities.GLOBAL_CONFIG, HashMap::new)

diff --git a/flink-cyber/metron-common/pom.xml b/flink-cyber/metron-common/pom.xml
@@ -425,12 +425,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/assembly.xml</descriptor>
-                    </descriptors>
+                    <descriptor>src/main/assembly/assembly.xml</descriptor>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/flink-cyber/metron-parser-chain/pom.xml b/flink-cyber/metron-parser-chain/pom.xml
@@ -50,6 +50,7 @@
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+        <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <frontend-maven-plugin.nodeVersion>v14.16.0</frontend-maven-plugin.nodeVersion>
 
@@ -326,6 +327,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${maven-assembly-plugin.version}</version>
                     <configuration>
                         <descriptors>
                             <descriptor>src/assembly/bin.xml</descriptor>

diff --git a/flink-cyber/pom.xml b/flink-cyber/pom.xml
@@ -74,9 +74,8 @@
         <multiline-string.version>0.1.2</multiline-string.version>
         <testcontainers.version>1.15.0</testcontainers.version>
         <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-        <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
-        <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <solr.version>8.4.1.${cdh.version}</solr.version>
         <maxmind.version>2.13.1</maxmind.version>
@@ -572,13 +571,6 @@
                     </executions>
                 </plugin>
 
-                <!-- Assembly -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${maven-assembly-plugin.version}</version>
-                </plugin>
-
                 <!-- NiFi Nar Builder -->
                 <plugin>
                     <groupId>org.apache.nifi</groupId>