Repository: metamodel Updated Branches: refs/heads/master 9f81506fe -> 09e4beb78
METAMODEL-1205: Updated SugarCRM JAX-WS/WSDL codegen to work in JDK9+ Closes #196 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/09e4beb7 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/09e4beb7 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/09e4beb7 Branch: refs/heads/master Commit: 09e4beb78e97616e336454d73d88be18c5dbf7b6 Parents: 9f81506 Author: Kasper Sørensen <[email protected]> Authored: Mon Nov 26 18:41:38 2018 -0800 Committer: Kasper Sørensen <[email protected]> Committed: Mon Nov 26 18:41:38 2018 -0800 ---------------------------------------------------------------------- sugarcrm/pom.xml | 71 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/09e4beb7/sugarcrm/pom.xml ---------------------------------------------------------------------- diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml index 9119dc6..4a17f45 100644 --- a/sugarcrm/pom.xml +++ b/sugarcrm/pom.xml @@ -17,7 +17,9 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <artifactId>MetaModel</artifactId> <groupId>org.apache.metamodel</groupId> @@ -27,12 +29,28 @@ under the License. <artifactId>MetaModel-sugarcrm</artifactId> <name>MetaModel module for SugarCRM</name> + <properties> + <jaxws.version>2.3.1</jaxws.version> + </properties> + + <profiles> + <profile> + <id>jdk8</id> + <activation> + <jdk>1.8</jdk> + </activation> + <properties> + <jaxws.version>2.2.10</jaxws.version> + </properties> + </profile> + </profiles> + <build> <plugins> <plugin> - <groupId>org.jvnet.jax-ws-commons</groupId> + <groupId>com.helger.maven</groupId> <artifactId>jaxws-maven-plugin</artifactId> - <version>2.2</version> + <version>2.6</version> <executions> <execution> <id>import-sugarcrm-wsdl</id> @@ -54,24 +72,17 @@ under the License. <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-tools</artifactId> - <version>2.1.7</version> - <exclusions> - <exclusion> - <groupId>org.jvnet.staxex</groupId> - <artifactId>stax-ex</artifactId> - </exclusion> - </exclusions> + <version>${jaxws.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.version}</version> </dependency> <dependency> - <groupId>org.jvnet.staxex</groupId> - <artifactId>stax-ex</artifactId> - <version>1.2</version> - <exclusions> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> </dependency> </dependencies> </plugin> @@ -139,12 +150,28 @@ under the License. <artifactId>commons-codec</artifactId> </dependency> - <!-- provided --> + <!-- JAX WS --> <dependency> <groupId>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId> - <version>2.0</version> - <scope>provided</scope> + <version>${jaxws.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>${jaxws.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- test -->
