adjusting examples to be run with optional JAXB Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml index c2292c1..921c84f 100644 --- a/examples/bookstore-webapp/pom.xml +++ b/examples/bookstore-webapp/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -73,18 +73,12 @@ <plugins> <!-- Run the application using "mvn jetty:run" --> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> <webApp> <contextPath>/bookstore-webapp</contextPath> </webApp> - <connectors> - <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>8080</port> - <responseHeaderSize>16192</responseHeaderSize> - </connector> - </connectors> </configuration> </plugin> </plugins> @@ -92,6 +86,19 @@ <profiles> <profile> + <id>jdk11+</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-osgi</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> <!-- mvn test -Prun-external-tests --> <id>run-external-tests</id> <build>
diff --git a/examples/https-clientserver-grizzly/pom.xml b/examples/https-clientserver-grizzly/pom.xml index 0d1f721..0ab0f7e 100644 --- a/examples/https-clientserver-grizzly/pom.xml +++ b/examples/https-clientserver-grizzly/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v. 1.0, which is available at @@ -82,6 +82,13 @@ <!-- https://bugs.openjdk.java.net/browse/JDK-8211426 --> <surefire.security.argline>-Djdk.tls.server.protocols=TLSv1.2</surefire.security.argline> </properties> + <dependencies> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-osgi</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> </profile> <profile> <id>pre-release</id>
diff --git a/examples/jaxb/pom.xml b/examples/jaxb/pom.xml index f447238..b309c5c 100644 --- a/examples/jaxb/pom.xml +++ b/examples/jaxb/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v. 1.0, which is available at @@ -38,6 +38,10 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> <version>4.1.2</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-jaxb</artifactId> </dependency> <dependency> @@ -74,7 +78,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-osgi</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile>
diff --git a/examples/json-jackson1/pom.xml b/examples/json-jackson1/pom.xml index ac02ed7..6f55bf7 100644 --- a/examples/json-jackson1/pom.xml +++ b/examples/json-jackson1/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v. 1.0, which is available at @@ -74,7 +74,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-osgi</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile>
diff --git a/examples/multipart-webapp/pom.xml b/examples/multipart-webapp/pom.xml index 619f878..4f434d3 100644 --- a/examples/multipart-webapp/pom.xml +++ b/examples/multipart-webapp/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v. 1.0, which is available at @@ -62,7 +62,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-osgi</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile>