From 1c53abf6747c8dcce9d549bfdf113b07f2be7ec1 Mon Sep 17 00:00:00 2001 From: mrizzi Date: Fri, 29 Nov 2019 14:31:24 +0100 Subject: [PATCH] WINDUPRULE-392 Java Version - Maven dependecies --- .../pom.xml | 9 -- .../tests/maven-dependencies.rhamt.test.xml | 83 ------------------- .../tests/xml-java-versions.windup.test.xml | 47 +++++++++++ ...rhamt.xml => xml-java-versions.windup.xml} | 74 ++--------------- 4 files changed, 54 insertions(+), 159 deletions(-) rename rules-reviewed/camel3/camel2/tests/data/{maven-dependencies => xml-java-versions}/pom.xml (62%) delete mode 100644 rules-reviewed/camel3/camel2/tests/maven-dependencies.rhamt.test.xml create mode 100644 rules-reviewed/camel3/camel2/tests/xml-java-versions.windup.test.xml rename rules-reviewed/camel3/camel2/{maven-dependencies.rhamt.xml => xml-java-versions.windup.xml} (60%) diff --git a/rules-reviewed/camel3/camel2/tests/data/maven-dependencies/pom.xml b/rules-reviewed/camel3/camel2/tests/data/xml-java-versions/pom.xml similarity index 62% rename from rules-reviewed/camel3/camel2/tests/data/maven-dependencies/pom.xml rename to rules-reviewed/camel3/camel2/tests/data/xml-java-versions/pom.xml index da4afdf84..711ecb4e0 100644 --- a/rules-reviewed/camel3/camel2/tests/data/maven-dependencies/pom.xml +++ b/rules-reviewed/camel3/camel2/tests/data/xml-java-versions/pom.xml @@ -7,15 +7,6 @@ Sample Project - - org.apache.camel - camel-http4 - - - org.apache.camel - camel-linkedin - - diff --git a/rules-reviewed/camel3/camel2/tests/maven-dependencies.rhamt.test.xml b/rules-reviewed/camel3/camel2/tests/maven-dependencies.rhamt.test.xml deleted file mode 100644 index 0f221cb31..000000000 --- a/rules-reviewed/camel3/camel2/tests/maven-dependencies.rhamt.test.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - data/maven-dependencies - ../maven-dependencies.rhamt.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rules-reviewed/camel3/camel2/tests/xml-java-versions.windup.test.xml b/rules-reviewed/camel3/camel2/tests/xml-java-versions.windup.test.xml new file mode 100644 index 000000000..741b42ec0 --- /dev/null +++ b/rules-reviewed/camel3/camel2/tests/xml-java-versions.windup.test.xml @@ -0,0 +1,47 @@ + + + data/xml-java-versions + ../xml-java-versions.windup.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rules-reviewed/camel3/camel2/maven-dependencies.rhamt.xml b/rules-reviewed/camel3/camel2/xml-java-versions.windup.xml similarity index 60% rename from rules-reviewed/camel3/camel2/maven-dependencies.rhamt.xml rename to rules-reviewed/camel3/camel2/xml-java-versions.windup.xml index 57f338e6f..bf7592175 100644 --- a/rules-reviewed/camel3/camel2/maven-dependencies.rhamt.xml +++ b/rules-reviewed/camel3/camel2/xml-java-versions.windup.xml @@ -1,5 +1,5 @@ - @@ -12,39 +12,7 @@ - - - - - - - - - - - - - - - - com.sun.activation - javax.activation - ${javax.activation.version} - - ``` - ]]> - - - - - - + @@ -67,7 +35,7 @@ javax.xml.bind jaxb-api - ${jaxb.api.version} + 2.3.1 ``` ]]> @@ -76,7 +44,7 @@ - + @@ -99,7 +67,7 @@ com.sun.xml.bind jaxb-core - ${jaxb.api.version} + 2.3.0.1 ``` ]]> @@ -108,7 +76,7 @@ - + @@ -131,7 +99,7 @@ com.sun.xml.bind jaxb-impl - ${jaxb.api.version} + 2.3.2 ``` ]]> @@ -140,33 +108,5 @@ - - - - - - - - - `org.apache.camel:camel-linkedin` artifact has been removed in Apache Camel 3 so it won't be available - - - - - - - - - - - - `org.apache.camel:camel-http4` artifact has been moved in Apache Camel 3 to `org.apache.camel:camel-http` artifact - - camel-http - camel-http4 - - - -