Some maven magic to get rid of dependency problems.

Evolveum · Jan 24, 2017 · 67a118d · 67a118d
1 parent 4ebbb52
commit 67a118d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -314,11 +314,27 @@
                 <!-- <version>20100725</version> -->
                 <version>20110809</version>
             </dependency>
+            <dependency>
+                <groupId>commons-validator</groupId>
+                <artifactId>commons-validator</artifactId>
+                <version>1.5.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-digester</groupId>
+                        <artifactId>commons-digester</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
                 <version>1.8.3</version>
             </dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils-core</artifactId>
+                <version>1.8.3</version>
+            </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -329,15 +345,10 @@
                 <artifactId>commons-collections</artifactId>
                 <version>3.2.2</version>
             </dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils-core</artifactId>
-                <version>1.8.0</version>
-            </dependency>
             <dependency>
                 <groupId>commons-configuration</groupId>
                 <artifactId>commons-configuration</artifactId>
-                <version>1.6</version>
+                <version>1.10</version>
                 <exclusions>
 					<exclusion> <!-- Conflicting version with Spring core -->
                         <groupId>commons-logging</groupId>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -537,7 +537,6 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.5.1</version>
         </dependency>
 
         <dependency>
@@ -606,8 +605,12 @@
 		</dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>
+            <artifactId>commons-beanutils</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>commons-beanutils</groupId>-->
+            <!--<artifactId>commons-beanutils-core</artifactId>-->
+        <!--</dependency>-->
 		<dependency>
 			<groupId>commons-javaflow</groupId>
 			<artifactId>commons-javaflow</artifactId>

diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
@@ -158,7 +158,6 @@
             <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
                 <executions>
                     <execution>
                         <id>unpack-prism-schema-files</id>

diff --git a/samples/model-client-sample/pom.xml b/samples/model-client-sample/pom.xml
@@ -82,7 +82,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.6</version>
                 <executions>
                      <execution>
                          <id>copy-dependencies</id>

diff --git a/tools/repo-ninja/pom.xml b/tools/repo-ninja/pom.xml
@@ -154,7 +154,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.6</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>