Merge pull request #477 from axonivy-market/fix2

fix2
axonivy-market · Oct 27, 2023 · f166f41 · f166f41
2 parents 903efaf + b74953e
commit f166f41
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 41 deletions.
diff --git a/connectivity/connectivity-demos-test/pom.xml b/connectivity/connectivity-demos-test/pom.xml
@@ -10,6 +10,7 @@
     <wss4j.version>2.4.1</wss4j.version>
     <jersey.version>2.41</jersey.version>
     <project-build-plugin>11.2.0-SNAPSHOT</project-build-plugin>
+    <web.tester.version>11.1.0</web.tester.version>
   </properties>
 
   <pluginRepositories>
@@ -68,13 +69,23 @@
           <artifactId>opensaml-xacml-saml-impl</artifactId>
           <groupId>org.opensaml</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.axonivy.ivy.webtest</groupId>
       <artifactId>web-tester</artifactId>
-      <version>9.3.0</version>
+      <version>${web.tester.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
@@ -125,15 +136,6 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <test.environment>dev-axonivy</test.environment>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

diff --git a/connectivity/connectivity-demos/pom.xml b/connectivity/connectivity-demos/pom.xml
@@ -63,36 +63,6 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.8,)</versionRange>
-                    <goals>
-                      <goal>copy-dependencies</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    </plugins>   
   </build>
-
 </project>