[ https://issues.apache.org/jira/browse/CXF-7600?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16500960#comment-16500960 ]
ASF GitHub Bot commented on CXF-7600: ------------------------------------- reta closed pull request #420: CXF-7600: Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility URL: https://github.com/apache/cxf/pull/420 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/core/pom.xml b/core/pom.xml index 0832a7b7e7c..4019e789bd4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -31,6 +31,7 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.core</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.bus.osgi.CXFActivator</cxf.bundle.activator> <cxf.osgi.export> !org.apache.cxf.internal, diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index c93183f9cc9..aa49e9ff69d 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.javadoc</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml index 24fd9cd0f0e..53c7916ad94 100644 --- a/distribution/manifest/pom.xml +++ b/distribution/manifest/pom.xml @@ -33,6 +33,7 @@ <properties> <maven.test.skip>true</maven.test.skip> <cxf.version>${project.version}</cxf.version> + <cxf.module.name>org.apache.cxf.manifest</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml index 077a1e88891..b2e22730a34 100644 --- a/integration/cdi/pom.xml +++ b/integration/cdi/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> + <cxf.module.name>org.apache.cxf.cdi</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", javax.enterprise*;version="${cxf.cda.api.osgi.range}", diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml index 8096170d4c3..fe63da879d7 100644 --- a/integration/jca/pom.xml +++ b/integration/jca/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.jca</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml index f5a243ee123..ea8903ccc03 100644 --- a/integration/spring-boot/autoconfigure/pom.xml +++ b/integration/spring-boot/autoconfigure/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.spring.boot.autoconfigure</cxf.module.name> + </properties> <build> <plugins> <plugin> diff --git a/integration/spring-boot/starter-jaxrs/pom.xml b/integration/spring-boot/starter-jaxrs/pom.xml index 76d528fdcc6..3ca0945dc18 100644 --- a/integration/spring-boot/starter-jaxrs/pom.xml +++ b/integration/spring-boot/starter-jaxrs/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.spring.boot.jaxrs</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/integration/spring-boot/starter-jaxws/pom.xml b/integration/spring-boot/starter-jaxws/pom.xml index 775ded4aa6e..9e544848550 100644 --- a/integration/spring-boot/starter-jaxws/pom.xml +++ b/integration/spring-boot/starter-jaxws/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.spring.boot.jaxws</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/integration/tracing/tracing-brave/pom.xml b/integration/tracing/tracing-brave/pom.xml index 0a2ea937e65..5738ca5bdaf 100644 --- a/integration/tracing/tracing-brave/pom.xml +++ b/integration/tracing/tracing-brave/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> + <cxf.module.name>org.apache.cxf.tracing.brave</cxf.module.name> <cxf.osgi.export> org.apache.cxf.tracing, org.apache.cxf.tracing.brave, diff --git a/integration/tracing/tracing-htrace/pom.xml b/integration/tracing/tracing-htrace/pom.xml index 47481d08c4f..97fef6c20b6 100644 --- a/integration/tracing/tracing-htrace/pom.xml +++ b/integration/tracing/tracing-htrace/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> + <cxf.module.name>org.apache.cxf.tracing.htrace</cxf.module.name> <cxf.osgi.export> org.apache.cxf.tracing </cxf.osgi.export> diff --git a/integration/tracing/tracing-opentracing/pom.xml b/integration/tracing/tracing-opentracing/pom.xml index ce1274dbea5..c173a72f725 100644 --- a/integration/tracing/tracing-opentracing/pom.xml +++ b/integration/tracing/tracing-opentracing/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> + <cxf.module.name>org.apache.cxf.tracing.opentracing</cxf.module.name> <cxf.osgi.export> org.apache.cxf.tracing, org.apache.cxf.tracing.opentracing, diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml index 80d0d9035c1..33799e9b364 100644 --- a/maven-plugins/codegen-plugin/pom.xml +++ b/maven-plugins/codegen-plugin/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-maven-plugins</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.plugin.codegen</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml index a3d195a80a1..34a396b38f2 100644 --- a/maven-plugins/corba/pom.xml +++ b/maven-plugins/corba/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-maven-plugins</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.plugin.corbatools</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml index d2a8549c275..0f570c8374c 100644 --- a/maven-plugins/java2swagger-plugin/pom.xml +++ b/maven-plugins/java2swagger-plugin/pom.xml @@ -33,6 +33,7 @@ <version>3.2.5-SNAPSHOT</version> </parent> <properties> + <cxf.module.name>org.apache.cxf.plugin.java2swagger</cxf.module.name> <cxf.manifest.location /> </properties> diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml index bd9ba0a43d9..e27e20fa29d 100644 --- a/maven-plugins/java2wadl-plugin/pom.xml +++ b/maven-plugins/java2wadl-plugin/pom.xml @@ -34,6 +34,7 @@ <version>3.2.5-SNAPSHOT</version> </parent> <properties> + <cxf.module.name>org.apache.cxf.plugin.java2wadl</cxf.module.name> <cxf.manifest.location /> </properties> diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml index 9598bb03991..a4af2fc8d0f 100644 --- a/maven-plugins/java2ws-plugin/pom.xml +++ b/maven-plugins/java2ws-plugin/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-maven-plugins</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.plugin.java2ws</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml index 7b8c4585a29..8749b312bec 100644 --- a/maven-plugins/wadl2java-plugin/pom.xml +++ b/maven-plugins/wadl2java-plugin/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-maven-plugins</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.plugin.wadl2java</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml index d34c5fc36e2..a43e53af26c 100644 --- a/maven-plugins/wsdl-validator-plugin/pom.xml +++ b/maven-plugins/wsdl-validator-plugin/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-maven-plugins</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.plugin.wsdl.validator</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml index f37bdc65bb5..92a76e376f8 100644 --- a/osgi/bundle/compatible/pom.xml +++ b/osgi/bundle/compatible/pom.xml @@ -31,6 +31,7 @@ </parent> <properties> <cxf.osgi.symbolic.name>${project.groupId}.bundle</cxf.osgi.symbolic.name> + <cxf.module.name>org.apache.cxf.bundle</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml index c768c2cdd33..98487bdcbb6 100644 --- a/osgi/karaf/commands/pom.xml +++ b/osgi/karaf/commands/pom.xml @@ -27,6 +27,9 @@ <packaging>bundle</packaging> <name>Apache CXF Karaf Commands</name> <description>Apache CXF Karaf Commands</description> + <properties> + <cxf.module.name>org.apache.cxf.karaf.commands</cxf.module.name> + </properties> <dependencies> <!-- cxf --> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 5367d3af283..68f084a4b33 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -478,6 +478,7 @@ <Implementation-Title>${project.name}</Implementation-Title> <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> + <Automatic-Module-Name>${cxf.module.name}</Automatic-Module-Name> </manifestEntries> </archive> </configuration> @@ -631,6 +632,7 @@ ${cxf.export.service} </Export-Service> <Bundle-Activator>${cxf.bundle.activator}</Bundle-Activator> + <Automatic-Module-Name>${cxf.module.name}</Automatic-Module-Name> </instructions> <niceManifest>true</niceManifest> </configuration> diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml index cdf6afb2e13..33e9ba0d47b 100644 --- a/rt/bindings/coloc/pom.xml +++ b/rt/bindings/coloc/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.binding.coloc</cxf.module.name> <cxf.osgi.import> org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml index f94ebaf7d95..a63b4c5b387 100644 --- a/rt/bindings/corba/pom.xml +++ b/rt/bindings/corba/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.binding.corba</cxf.module.name> <cxf.checkstyle.extension>-corba</cxf.checkstyle.extension> <cxf.osgi.import> org.objectweb.asm*;version="${cxf.osgi.asm.version}", diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml index cf0f9d3d848..9605d6f115f 100644 --- a/rt/bindings/soap/pom.xml +++ b/rt/bindings/soap/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.binding.soap</cxf.module.name> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml index d62fe24d041..c4be6319362 100644 --- a/rt/bindings/xml/pom.xml +++ b/rt/bindings/xml/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.binding.xml</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml index a29f3565f02..96c618bfea9 100644 --- a/rt/databinding/aegis/pom.xml +++ b/rt/databinding/aegis/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> + <cxf.module.name>org.apache.cxf.databinding.aegis</cxf.module.name> <cxf.osgi.import> javax.xml.bind*;version="${cxf.osgi.javax.bind.version}", javax.activation;version="${cxf.osgi.javax.activation.version}", diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml index 03c98127d83..6004a6060d2 100644 --- a/rt/databinding/jaxb/pom.xml +++ b/rt/databinding/jaxb/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.databinding.jaxb</cxf.module.name> <cxf.osgi.import> javax.activation;version="${cxf.osgi.javax.activation.version}", javax.xml.bind*;version="${cxf.osgi.javax.bind.version}", diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml index c27a0c1b8dc..d0fbeb80d1d 100644 --- a/rt/features/clustering/pom.xml +++ b/rt/features/clustering/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.clustering</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.clustering.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml index 821b1ccece1..922c17b634d 100644 --- a/rt/features/logging/pom.xml +++ b/rt/features/logging/pom.xml @@ -10,6 +10,7 @@ <packaging>bundle</packaging> <properties> + <cxf.module.name>org.apache.cxf.logging</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.ext.logging.osgi.Activator</cxf.bundle.activator> </properties> diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml index e5104c6af7b..d3597c0947f 100644 --- a/rt/features/metrics/pom.xml +++ b/rt/features/metrics/pom.xml @@ -11,6 +11,10 @@ <name>Apache CXF Metrics Feature</name> <description>Apache CXF Metrics Feature</description> + <properties> + <cxf.module.name>org.apache.cxf.metrics</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/features/throttling/pom.xml b/rt/features/throttling/pom.xml index d2e389d65ae..c07de75f9be 100644 --- a/rt/features/throttling/pom.xml +++ b/rt/features/throttling/pom.xml @@ -10,6 +10,10 @@ <packaging>bundle</packaging> <name>Apache CXF Throttling Feature</name> <description>Apache CXF Throttling Feature</description> + + <properties> + <cxf.module.name>org.apache.cxf.throttling</cxf.module.name> + </properties> <dependencies> <dependency> @@ -17,8 +21,6 @@ <artifactId>cxf-core</artifactId> <version>${project.version}</version> </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml index 4acdfca2bfd..8e66c5bfbd4 100644 --- a/rt/frontend/jaxrs/pom.xml +++ b/rt/frontend/jaxrs/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.frontend.jaxrs</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml index 779ca82a446..455964fa5e2 100644 --- a/rt/frontend/jaxws/pom.xml +++ b/rt/frontend/jaxws/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.frontend.jaxws</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml index 5752c386652..0a42af8e736 100644 --- a/rt/frontend/js/pom.xml +++ b/rt/frontend/js/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.frontend.js</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>rhino</groupId> diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml index d64152b3e7b..5dcb081d145 100644 --- a/rt/frontend/simple/pom.xml +++ b/rt/frontend/simple/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.frontend.simple</cxf.module.name> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, com.sun.tools*;resolution:=optional, diff --git a/rt/javascript/javascript-rt/pom.xml b/rt/javascript/javascript-rt/pom.xml index 44c93af624c..760e082e317 100644 --- a/rt/javascript/javascript-rt/pom.xml +++ b/rt/javascript/javascript-rt/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-runtime-javascript</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.js</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index 5cecf43330e..ec111f5f40b 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -29,6 +29,9 @@ <artifactId>cxf-runtime-javascript</artifactId> <version>3.2.5-SNAPSHOT</version> </parent> + <properties> + <cxf.module.name>org.apache.cxf.js.tests</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/management/pom.xml b/rt/management/pom.xml index 934bbd4d9bd..f3bfe1baa5a 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.management</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index e21e57db822..efbde77d6a6 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.client</cxf.module.name> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" diff --git a/rt/rs/description-openapi-v3/pom.xml b/rt/rs/description-openapi-v3/pom.xml index e200e45f08b..a48b97dca88 100644 --- a/rt/rs/description-openapi-v3/pom.xml +++ b/rt/rs/description-openapi-v3/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.openapi.v3</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", javax.annotation;version="${cxf.osgi.javax.annotation.version}", diff --git a/rt/rs/description-swagger-ui/pom.xml b/rt/rs/description-swagger-ui/pom.xml index 1dbdfde9653..db43561ed08 100644 --- a/rt/rs/description-swagger-ui/pom.xml +++ b/rt/rs/description-swagger-ui/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.swagger.ui</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>${cxf.servlet-api.group}</groupId> diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index fa2cc660e24..358b25052c4 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.swagger</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", javax.annotation;version="${cxf.osgi.javax.annotation.version}", diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index 00c98dc7aa3..71f3715a48e 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.wadl</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", </cxf.osgi.import> diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index 9c72ff22802..518e3a7d571 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.json</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index b22567933c4..f6ad677705b 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.providers</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", </cxf.osgi.import> diff --git a/rt/rs/extensions/reactivestreams/pom.xml b/rt/rs/extensions/reactivestreams/pom.xml index a2416495a52..14157cda1ef 100644 --- a/rt/rs/extensions/reactivestreams/pom.xml +++ b/rt/rs/extensions/reactivestreams/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.reactivestreams</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/extensions/reactor/pom.xml b/rt/rs/extensions/reactor/pom.xml index 87bf983c1e4..15548445b3c 100644 --- a/rt/rs/extensions/reactor/pom.xml +++ b/rt/rs/extensions/reactor/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.reactor</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/extensions/rx/pom.xml b/rt/rs/extensions/rx/pom.xml index 6b6f42891c0..dd24c3c4d9e 100644 --- a/rt/rs/extensions/rx/pom.xml +++ b/rt/rs/extensions/rx/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.rx</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/extensions/rx2/pom.xml b/rt/rs/extensions/rx2/pom.xml index 98f196c88a9..85233a8f176 100644 --- a/rt/rs/extensions/rx2/pom.xml +++ b/rt/rs/extensions/rx2/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.rx2</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index 7c005a2aa4c..2e892a43257 100644 --- a/rt/rs/extensions/search/pom.xml +++ b/rt/rs/extensions/search/pom.xml @@ -33,6 +33,7 @@ <properties> <hibernate.em.version>4.1.0.Final</hibernate.em.version> <hsqldb.version>1.8.0.10</hsqldb.version> + <cxf.module.name>org.apache.cxf.rs.search</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml index 0669dd3ee7e..47228b81401 100644 --- a/rt/rs/http-sci/pom.xml +++ b/rt/rs/http-sci/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.sci</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", </cxf.osgi.import> diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index dc1e8a33b9f..2253e22467b 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.client.mp</cxf.module.name> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}", diff --git a/rt/rs/security/cors/pom.xml b/rt/rs/security/cors/pom.xml index 25727065883..4aae7ed1b57 100644 --- a/rt/rs/security/cors/pom.xml +++ b/rt/rs/security/cors/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.security.cors</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/rt/rs/security/jcs-parent/jcs/pom.xml b/rt/rs/security/jcs-parent/jcs/pom.xml index 0fa7125b6c1..63c20d9b1a3 100644 --- a/rt/rs/security/jcs-parent/jcs/pom.xml +++ b/rt/rs/security/jcs-parent/jcs/pom.xml @@ -30,6 +30,9 @@ <version>3.2.1-SNAPSHOT</version> <relativePath>../../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.security.jcs</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml index a03603c6323..be94ef019d9 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml +++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.security.jose.jaxrs</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/security/jose-parent/jose/pom.xml b/rt/rs/security/jose-parent/jose/pom.xml index 49090c38615..ca5a0248816 100644 --- a/rt/rs/security/jose-parent/jose/pom.xml +++ b/rt/rs/security/jose-parent/jose/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.rs.security.jose</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml index ef89134470d..2066711d6d0 100644 --- a/rt/rs/security/oauth-parent/oauth/pom.xml +++ b/rt/rs/security/oauth-parent/oauth/pom.xml @@ -31,6 +31,7 @@ <relativePath>../pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.security.oauth</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", </cxf.osgi.import> diff --git a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml index 21718dbefba..7c4caf8b6ed 100644 --- a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml @@ -31,6 +31,7 @@ <relativePath>../pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.security.oauth2.saml</cxf.module.name> <cxf.osgi.import> org.opensaml*;version="${cxf.opensaml.osgi.version.range}", </cxf.osgi.import> diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index 9e48c92f023..7b21f98fab4 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -31,6 +31,7 @@ <relativePath>../pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.security.oauth2</cxf.module.name> <cxf.osgi.import> net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)", javax.servlet*;version="${cxf.osgi.javax.servlet.version}" diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index 86894fbb4f5..000995ced32 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -34,6 +34,7 @@ <hibernate.em.version>4.1.0.Final</hibernate.em.version> <hsqldb.version>1.8.0.10</hsqldb.version> <compilerArguments>-Aopenjpa.source=7 -Aopenjpa.metamodel=true</compilerArguments> + <cxf.module.name>org.apache.cxf.rs.security.sso.oidc</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml index c1ec95752ad..8dbe50307df 100644 --- a/rt/rs/security/sso/saml/pom.xml +++ b/rt/rs/security/sso/saml/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.security.sso.saml</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)", diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml index 8be0372689b..de36c5dd92a 100644 --- a/rt/rs/security/xml/pom.xml +++ b/rt/rs/security/xml/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.security.xml</cxf.module.name> <cxf.osgi.import> org.opensaml*;version="${cxf.opensaml.osgi.version.range}", </cxf.osgi.import> diff --git a/rt/rs/sse/pom.xml b/rt/rs/sse/pom.xml index 58ae3af61cf..a2287dc0b07 100644 --- a/rt/rs/sse/pom.xml +++ b/rt/rs/sse/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.rs.sse</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", </cxf.osgi.import> diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml index 1d9a3737bdf..5c4be305d63 100644 --- a/rt/security-saml/pom.xml +++ b/rt/security-saml/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.security.saml</cxf.module.name> <cxf.osgi.import> org.opensaml*;version="${cxf.opensaml.osgi.version.range}", </cxf.osgi.import> diff --git a/rt/security/pom.xml b/rt/security/pom.xml index b431e63ff2d..6cb6114c9e3 100644 --- a/rt/security/pom.xml +++ b/rt/security/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.security</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml index 8c7baa0b6a4..a5cd92fde14 100644 --- a/rt/transports/http-hc/pom.xml +++ b/rt/transports/http-hc/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.transport.http.hc</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.transport.http.asyncclient.Activator</cxf.bundle.activator> <cxf.osgi.import> javax.annotation;version="${cxf.osgi.javax.annotation.version}", diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml index 6b63de44773..368c2de76a6 100644 --- a/rt/transports/http-jetty/pom.xml +++ b/rt/transports/http-jetty/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.transport.http.jetty</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.transport.http_jetty.osgi.HTTPJettyTransportActivator</cxf.bundle.activator> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", diff --git a/rt/transports/http-netty/netty-client/pom.xml b/rt/transports/http-netty/netty-client/pom.xml index 6b2bc6e689d..b9be777f4c5 100644 --- a/rt/transports/http-netty/netty-client/pom.xml +++ b/rt/transports/http-netty/netty-client/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.transport.http.netty.client</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="[2,4)", io.netty.*;version="${cxf.netty.version.range}", diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index c3b1cbc240a..76d90865f57 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.transport.http.netty.server</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.transport.http.netty.server.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> javax.servlet*;version="[2,4)", diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml index 8609a6e7486..0b8a216b51f 100644 --- a/rt/transports/http-undertow/pom.xml +++ b/rt/transports/http-undertow/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.transport.http.undertow</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.transport.http_undertow.osgi.HTTPUndertowTransportActivator</cxf.bundle.activator> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index b9129e1f0b8..05d5ab5c0e2 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.transport.http</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.transport.http.osgi.HTTPTransportActivator</cxf.bundle.activator> <cxf.osgi.import> javax.net, diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index 361cc26aa0d..3f7113c7393 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -25,6 +25,7 @@ <properties> <cxf.spi-dir>spi-2.1</cxf.spi-dir> <cxf.osgi.import>javax.jms;version="[1.1,3)"</cxf.osgi.import> + <cxf.module.name>org.apache.cxf.transport.jms</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/rt/transports/local/pom.xml b/rt/transports/local/pom.xml index 5d8401da0f6..7b948fd14a7 100644 --- a/rt/transports/local/pom.xml +++ b/rt/transports/local/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.transport.local</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/rt/transports/udp/pom.xml b/rt/transports/udp/pom.xml index a6d997dbb03..df37617d5d7 100644 --- a/rt/transports/udp/pom.xml +++ b/rt/transports/udp/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.transport.udp</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml index e4661e2999c..9959726ce07 100644 --- a/rt/transports/websocket/pom.xml +++ b/rt/transports/websocket/pom.xml @@ -36,6 +36,7 @@ org.eclipse.jetty.websocket;version="${cxf.jetty.osgi.version}";resolution:=optional, --> + <cxf.module.name>org.apache.cxf.transport.websocket</cxf.module.name> <cxf.osgi.import> javax.servlet*;version="${cxf.osgi.javax.servlet.version}", org.eclipse.jetty*;version="${cxf.jetty.osgi.version}";resolution:=optional, diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml index 9f7121f8db1..371fe236200 100644 --- a/rt/ws/addr/pom.xml +++ b/rt/ws/addr/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.ws.addr</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.ws.addressing.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}", diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml index f5a5291caae..fded4c46306 100644 --- a/rt/ws/eventing/pom.xml +++ b/rt/ws/eventing/pom.xml @@ -12,6 +12,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.ws.eventing</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml index 355251962c3..d1b32ffc183 100644 --- a/rt/ws/mex/pom.xml +++ b/rt/ws/mex/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.ws.mex</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index 58062d3e730..50bcaff6eed 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.ws.policy</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.ws.policy.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}", diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index 0a8316d3bdb..271d9ef587f 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.ws.rm</cxf.module.name> <cxf.bundle.activator>org.apache.cxf.ws.rm.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index 57ed69f3cd7..615852de1e4 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.ws.security</cxf.module.name> <cxf.osgi.import> net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)", org.opensaml*;version="${cxf.opensaml.osgi.version.range}", diff --git a/rt/ws/transfer/pom.xml b/rt/ws/transfer/pom.xml index ab80edc8625..e1d7d9908b6 100644 --- a/rt/ws/transfer/pom.xml +++ b/rt/ws/transfer/pom.xml @@ -15,6 +15,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <cxf.module.name>org.apache.cxf.ws.transfer</cxf.module.name> </properties> <dependencies> diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml index a246dc15e6a..1ad71f504c3 100644 --- a/rt/wsdl/pom.xml +++ b/rt/wsdl/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.wsdl</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml index 6e0c29f209f..564ffa93d87 100644 --- a/services/sts/sts-core/pom.xml +++ b/services/sts/sts-core/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.sts.core</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml index 8afe2d94c0f..ee2ff1a8e4d 100644 --- a/services/sts/systests/advanced/pom.xml +++ b/services/sts/systests/advanced/pom.xml @@ -30,6 +30,11 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + + <properties> + <cxf.module.name>org.apache.cxf.systests.sts.advanced</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml index 0d0f53c8534..715fed95dd1 100644 --- a/services/sts/systests/basic/pom.xml +++ b/services/sts/systests/basic/pom.xml @@ -30,6 +30,11 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + + <properties> + <cxf.module.name>org.apache.cxf.systests.sts.basic</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/services/sts/systests/sts-itests/pom.xml b/services/sts/systests/sts-itests/pom.xml index 7376c02d92f..6674ec1cb31 100644 --- a/services/sts/systests/sts-itests/pom.xml +++ b/services/sts/systests/sts-itests/pom.xml @@ -29,6 +29,11 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + + <properties> + <cxf.module.name>org.apache.cxf.systests.sts.integration</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.osgi</groupId> diff --git a/services/sts/systests/sts-osgi/pom.xml b/services/sts/systests/sts-osgi/pom.xml index 368d4a89430..b6d98d2e729 100644 --- a/services/sts/systests/sts-osgi/pom.xml +++ b/services/sts/systests/sts-osgi/pom.xml @@ -30,6 +30,11 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + + <properties> + <cxf.module.name>org.apache.cxf.systests.sts.osgi</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf.services.sts</groupId> diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml index a1662e4641c..aeeb65a0d76 100644 --- a/services/ws-discovery/ws-discovery-api/pom.xml +++ b/services/ws-discovery/ws-discovery-api/pom.xml @@ -32,6 +32,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.ws.discovery</cxf.module.name> <cxf.osgi.export> =org.apache.cxf.ws.discovery.internal, org.apache.cxf.ws.discovery.*, diff --git a/services/ws-discovery/ws-discovery-service/pom.xml b/services/ws-discovery/ws-discovery-service/pom.xml index e5d2016c436..674e0b84b48 100644 --- a/services/ws-discovery/ws-discovery-service/pom.xml +++ b/services/ws-discovery/ws-discovery-service/pom.xml @@ -32,6 +32,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.ws.discovery.service</cxf.module.name> <cxf.osgi.import>org.apache.cxf.ws.discovery.listeners</cxf.osgi.import> </properties> <dependencies> diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml index 6b3561b51d4..dbe7f9d8b8e 100644 --- a/services/wsn/wsn-api/pom.xml +++ b/services/wsn/wsn-api/pom.xml @@ -31,6 +31,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.wsn</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index a79ffd94b95..f09b1836233 100644 --- a/services/wsn/wsn-core/pom.xml +++ b/services/wsn/wsn-core/pom.xml @@ -32,6 +32,7 @@ <relativePath>../../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.wsn.core</cxf.module.name> <cxf.server.launcher.vmargs /> <cxf.surefire.enable.assertions>false</cxf.surefire.enable.assertions> </properties> diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml index 7110b2388ed..491e1f91f38 100644 --- a/services/wsn/wsn-osgi/pom.xml +++ b/services/wsn/wsn-osgi/pom.xml @@ -31,6 +31,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.wsn.osgi</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf.services.wsn</groupId> diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index cb99e8e2dfb..f4e34176a4a 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.client</cxf.module.name> + </properties> <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index 72fed212b13..914ef99bea3 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.common</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/services/xkms/xkms-features/pom.xml b/services/xkms/xkms-features/pom.xml index 21af20d572e..4df222c8c51 100644 --- a/services/xkms/xkms-features/pom.xml +++ b/services/xkms/xkms-features/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.features</cxf.module.name> + </properties> <build> <resources> <resource> diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index 3b0e1433d71..4d17bca0574 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -29,12 +29,14 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.itests</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> </dependency> - <dependency> <groupId>org.apache.cxf.services.xkms</groupId> <artifactId>cxf-services-xkms-common</artifactId> diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml index fc39a6b0954..b72d2c79047 100644 --- a/services/xkms/xkms-osgi/pom.xml +++ b/services/xkms/xkms-osgi/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.osgi</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf.services.xkms</groupId> diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index e20a8b2907d..8b35e25471f 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.service</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf.services.xkms</groupId> diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index f651578fa38..6c40f813a9c 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.xkms.x509.handlers</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index d175a361531..409056e1235 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++ b/services/xkms/xkms-x509-repo-ldap/pom.xml @@ -12,6 +12,10 @@ <name>Apache CXF XKMS LDAP repository</name> <url>http://cxf.apache.org</url> + <properties> + <cxf.module.name>org.apache.cxf.xkms.x509.ldap</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf.services.xkms</groupId> diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml index b43d921ddef..8298a0e00fd 100644 --- a/systests/cdi/base/pom.xml +++ b/systests/cdi/base/pom.xml @@ -28,6 +28,11 @@ <artifactId>cxf-systests-cdi-base</artifactId> <name>Apache CXF CDI Integration System Tests - Base</name> + + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.base</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml index 7ef4f5516ff..581c85429e4 100644 --- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml @@ -29,4 +29,8 @@ <name>Apache CXF CDI Integration System Tests - OWB with multiple apps</name> <description>Apache CXF CDI Integration System Tests - OpenWebBeans with multiple apps</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.owb.multiapp</cxf.module.name> + </properties> </project> diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml b/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml index 591001b2cbf..f589ad0270e 100644 --- a/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml @@ -30,4 +30,8 @@ <name>Apache CXF CDI Integration System Tests - OWB with no apps</name> <description>Apache CXF CDI Integration System Tests - OpenWebBeans with no apps</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.owb.noapp</cxf.module.name> + </properties> </project> \ No newline at end of file diff --git a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml index 67c8e699c47..5e16ebcafb3 100644 --- a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml @@ -31,6 +31,10 @@ <description>Apache CXF CDI Integration System Tests - OpenWebBeans with producers</description> <url>http://cxf.apache.org</url> + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.owb.producers</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml index effafe18b68..15cd83ab680 100644 --- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml @@ -29,4 +29,9 @@ <name>Apache CXF CDI Integration System Tests - Weld with multiple apps</name> <description>Apache CXF CDI Integration System Tests - Weld with multiple apps</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.weld.multiapp</cxf.module.name> + </properties> + </project> diff --git a/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml b/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml index 00b0c4573ad..df262f27d05 100644 --- a/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml @@ -30,4 +30,9 @@ <name>Apache CXF CDI Integration System Tests - Weld with no apps</name> <description>Apache CXF CDI Integration System Tests - Weld with no apps</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.weld.noapp</cxf.module.name> + </properties> + </project> \ No newline at end of file diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml index 62192bba183..51104c3a280 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml @@ -31,6 +31,10 @@ <description>Apache CXF CDI Integration System Tests - Weld with producers</description> <url>http://cxf.apache.org</url> + <properties> + <cxf.module.name>org.apache.cxf.systests.cdi.weld.producers</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml index ca8fcc3363a..a4f7ec1f6e4 100644 --- a/systests/cdi/pom.xml +++ b/systests/cdi/pom.xml @@ -142,18 +142,27 @@ </dependencies> </dependencyManagement> <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> </project> diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml index e913cbdb45d..fa40ab0f6e5 100644 --- a/systests/container-integration/grizzly/pom.xml +++ b/systests/container-integration/grizzly/pom.xml @@ -28,6 +28,11 @@ <artifactId>cxf-systests-ci-grizzly</artifactId> <name>Apache CXF Container Integration Test Grizzly</name> <description>Apache CXF Container Integration Test Grizzly</description> + + <properties> + <cxf.module.name>org.apache.cxf.systests.ci.grizzly</cxf.module.name> + </properties> + <repositories> <repository> <id>maven2-repository.dev.java.net</id> diff --git a/systests/container-integration/webapp/pom.xml b/systests/container-integration/webapp/pom.xml index d865b9e7561..3e568d821d9 100644 --- a/systests/container-integration/webapp/pom.xml +++ b/systests/container-integration/webapp/pom.xml @@ -29,6 +29,11 @@ <name>Apache CXF Container Integration Test Webapp</name> <description>Apache CXF Container Integration Test Webapp</description> <packaging>war</packaging> + + <properties> + <cxf.module.name>org.apache.cxf.systests.ci.webapp</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml index c5820f6b502..fde3c6d7b10 100644 --- a/systests/databinding/pom.xml +++ b/systests/databinding/pom.xml @@ -33,6 +33,7 @@ <properties> <hello.world.binding.file>hello_world.xml</hello.world.binding.file> <doc.lit.bare.binding.file>doc_lit_bare.xml</doc.lit.bare.binding.file> + <cxf.module.name>org.apache.cxf.systests.databinding</cxf.module.name> </properties> <build> <plugins> @@ -44,6 +45,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 73e3d0b4258..f48fab88a5f 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -33,6 +33,7 @@ <properties> <cxf.el.api.version>3.0-b02</cxf.el.api.version> <cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version> + <cxf.module.name>org.apache.cxf.systests.jaxrs</cxf.module.name> </properties> <dependencies> <dependency> @@ -556,6 +557,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml index 4bb9c26f052..a0fdc228a9c 100644 --- a/systests/jaxws/pom.xml +++ b/systests/jaxws/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF JAX-WS System Tests</name> <description>Apache CXF JAX-WS System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.jaxws</cxf.module.name> + </properties> + <build> <plugins> <plugin> @@ -68,6 +73,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml index 41bda7a8a07..f4ebfa1edca 100644 --- a/systests/kerberos/pom.xml +++ b/systests/kerberos/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF Kerberos Integration System Tests</name> <description>Apache CXF Kerberos Integration System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.kerberos</cxf.module.name> + </properties> + <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> @@ -81,6 +86,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/ldap/pom.xml b/systests/ldap/pom.xml index c81076b88cd..250c8b3e48d 100644 --- a/systests/ldap/pom.xml +++ b/systests/ldap/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF LDAP Integration System Tests</name> <description>Apache CXF LDAP Integration System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.ldap</cxf.module.name> + </properties> + <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> @@ -55,6 +60,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/microprofile/client/weld/pom.xml b/systests/microprofile/client/weld/pom.xml index cf817fe0995..0af48de2417 100644 --- a/systests/microprofile/client/weld/pom.xml +++ b/systests/microprofile/client/weld/pom.xml @@ -25,10 +25,15 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>cxf-systests-microprofile-weld</artifactId> <name>Apache CXF System Tests - MicroProfile Rest Client TCK on Weld</name> + + <properties> + <cxf.module.name>org.apache.cxf.systests.microprofile.weld</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.jboss.arquillian.testng</groupId> diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml index 47daf9fba5e..9d8272cbe3a 100644 --- a/systests/rs-http-sci/pom.xml +++ b/systests/rs-http-sci/pom.xml @@ -32,6 +32,7 @@ <url>http://cxf.apache.org</url> <properties> <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version> + <cxf.module.name>org.apache.cxf.systests.rs.sci</cxf.module.name> </properties> <dependencies> <dependency> @@ -135,6 +136,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index ec8a6a6b543..f316634dff1 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -32,6 +32,7 @@ <url>http://cxf.apache.org</url> <properties> <oauth.version>20100527</oauth.version> + <cxf.module.name>org.apache.cxf.systests.security</cxf.module.name> </properties> <dependencies> <dependency> @@ -206,6 +207,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/rs-sse/pom.xml b/systests/rs-sse/pom.xml index e6bece28f22..329afaee0ef 100644 --- a/systests/rs-sse/pom.xml +++ b/systests/rs-sse/pom.xml @@ -94,19 +94,28 @@ </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> <profiles> <profile> diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml index 260f609b23f..cbef87562ce 100644 --- a/systests/rs-sse/rs-sse-base/pom.xml +++ b/systests/rs-sse/rs-sse-base/pom.xml @@ -30,6 +30,10 @@ <description>Apache CXF SSE Integration System base classes</description> <url>http://cxf.apache.org</url> + <properties> + <cxf.module.name>org.apache.cxf.systests.rs.sse.base</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/systests/rs-sse/rs-sse-jetty/pom.xml b/systests/rs-sse/rs-sse-jetty/pom.xml index 2504f38d402..175307ceb5e 100644 --- a/systests/rs-sse/rs-sse-jetty/pom.xml +++ b/systests/rs-sse/rs-sse-jetty/pom.xml @@ -31,6 +31,7 @@ <url>http://cxf.apache.org</url> <properties> <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version> + <cxf.module.name>org.apache.cxf.systests.rs.sse.jetty</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/systests/rs-sse/rs-sse-tomcat/pom.xml b/systests/rs-sse/rs-sse-tomcat/pom.xml index 30e8c5e56a0..97af9e417d5 100644 --- a/systests/rs-sse/rs-sse-tomcat/pom.xml +++ b/systests/rs-sse/rs-sse-tomcat/pom.xml @@ -31,6 +31,7 @@ <url>http://cxf.apache.org</url> <properties> <cxf.tomcat.version>8.0.32</cxf.tomcat.version> + <cxf.module.name>org.apache.cxf.systests.rs.sse.tomcat</cxf.module.name> </properties> <dependencies> <dependency> diff --git a/systests/rs-sse/rs-sse-undertow/pom.xml b/systests/rs-sse/rs-sse-undertow/pom.xml index 28cfef29b19..14be31bfc65 100644 --- a/systests/rs-sse/rs-sse-undertow/pom.xml +++ b/systests/rs-sse/rs-sse-undertow/pom.xml @@ -29,6 +29,11 @@ <name>Apache CXF SSE Integration System Tests for Undertow</name> <description>Apache CXF SSE Integration System Tests Undertow</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.rs.sse.undertow</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>io.undertow</groupId> diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml index f4d64a49b6f..60ccc938ef5 100644 --- a/systests/tracing/pom.xml +++ b/systests/tracing/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF Distributed Tracing Integration System Tests</name> <description>Apache CXF Distributed Tracing Integration System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.tracing</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -157,6 +162,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index b7061306bfe..292372592d1 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF Transport System Tests JMS</name> <description>Apache CXF Transport System Tests JMS</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.transport.jms</cxf.module.name> + </properties> + <build> <plugins> <plugin> @@ -59,6 +64,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/transport-undertow/pom.xml b/systests/transport-undertow/pom.xml index e681aa6e053..88a5318f51e 100644 --- a/systests/transport-undertow/pom.xml +++ b/systests/transport-undertow/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF Undertow Transport System Tests</name> <description>Apache CXF Undertow Transport System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.transport.undertow</cxf.module.name> + </properties> + <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> @@ -74,6 +79,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml index dc9c5f920ac..c7ac53463d8 100644 --- a/systests/transports-ssl3/pom.xml +++ b/systests/transports-ssl3/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF Transport SSL3 System Tests</name> <description>Apache CXF Transport SSL3 System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.transport.ssl3</cxf.module.name> + </properties> + <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> @@ -55,6 +60,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index 8923620a32b..24e4561cbac 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -32,6 +32,7 @@ <url>http://cxf.apache.org</url> <properties> <cxf.surefire.fork.vmargs>-Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs> + <cxf.module.name>org.apache.cxf.systests.transport</cxf.module.name> </properties> <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> @@ -77,6 +78,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index a33be00b820..fc043069374 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF Uncategorized System Tests</name> <description>Apache CXF Uncategorized System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.uncategorized</cxf.module.name> + </properties> + <build> <plugins> <plugin> @@ -115,6 +120,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml index 863028eb563..725e7d110a7 100644 --- a/systests/ws-rm/pom.xml +++ b/systests/ws-rm/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF WS-RM Specifications System Tests</name> <description>Apache CXF WS-RM Specifications System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.ws.rm</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml index 4ba2c63796d..f1d9e9516cb 100644 --- a/systests/ws-security-examples/pom.xml +++ b/systests/ws-security-examples/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF WS-Security Interop System Tests</name> <description>Apache CXF WS-Security Interop System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.ws.security.examples</cxf.module.name> + </properties> + <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> @@ -77,6 +82,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml index 6cf3c67130b..370ba022d7f 100644 --- a/systests/ws-security/pom.xml +++ b/systests/ws-security/pom.xml @@ -30,6 +30,9 @@ <name>Apache CXF WS-Security System Tests</name> <description>Apache CXF WS-Security System Tests</description> <url>http://cxf.apache.org</url> + <properties> + <cxf.module.name>org.apache.cxf.systests.ws.security</cxf.module.name> + </properties> <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testResources> @@ -100,6 +103,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml index 44cc7d31d53..d00322aa498 100644 --- a/systests/ws-specs/pom.xml +++ b/systests/ws-specs/pom.xml @@ -30,6 +30,11 @@ <name>Apache CXF WS-* Specifications System Tests</name> <description>Apache CXF WS-* Specifications System Tests</description> <url>http://cxf.apache.org</url> + + <properties> + <cxf.module.name>org.apache.cxf.systests.ws.specs</cxf.module.name> + </properties> + <build> <plugins> <plugin> @@ -69,6 +74,13 @@ <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/systests/ws-transfer/pom.xml b/systests/ws-transfer/pom.xml index 025c9acddaa..dc8d075ec03 100644 --- a/systests/ws-transfer/pom.xml +++ b/systests/ws-transfer/pom.xml @@ -32,6 +32,10 @@ <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.systests.ws.transfer</cxf.module.name> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/systests/wsdl_maven/codegen/pom.xml b/systests/wsdl_maven/codegen/pom.xml index 698a2f30cd7..d41740323ac 100644 --- a/systests/wsdl_maven/codegen/pom.xml +++ b/systests/wsdl_maven/codegen/pom.xml @@ -29,6 +29,11 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + + <properties> + <cxf.module.name>org.apache.cxf.systests.plugin.codegen</cxf.module.name> + </properties> + <build> <plugins> <plugin> diff --git a/systests/wsdl_maven/java2ws/pom.xml b/systests/wsdl_maven/java2ws/pom.xml index 7a07845e9b4..3a3e7f52318 100644 --- a/systests/wsdl_maven/java2ws/pom.xml +++ b/systests/wsdl_maven/java2ws/pom.xml @@ -29,6 +29,11 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + + <properties> + <cxf.module.name>org.apache.cxf.systests.plugin.java2ws</cxf.module.name> + </properties> + <build> <plugins> <plugin> diff --git a/testutils/pom.xml b/testutils/pom.xml index 50bdfb33c91..640cddad8f1 100644 --- a/testutils/pom.xml +++ b/testutils/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.testutils</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> @@ -302,12 +305,24 @@ <includes> <include>**/*.*</include> </includes> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.key</Automatic-Module-Name> + </manifestEntries> + </archive> </configuration> </execution> <execution> <goals> <goal>test-jar</goal> </goals> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name>${cxf.module.name}.tests</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </execution> </executions> </plugin> diff --git a/tools/common/pom.xml b/tools/common/pom.xml index 1a323939730..2a1603ec96e 100644 --- a/tools/common/pom.xml +++ b/tools/common/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.common</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml index ae29777d6fa..6e58143bff9 100644 --- a/tools/corba/pom.xml +++ b/tools/corba/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.corba</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml index 3b8cc374d4b..23d51d84733 100644 --- a/tools/javato/ws/pom.xml +++ b/tools/javato/ws/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.java2ws</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml index 3900ad2c383..3ec327c74e8 100644 --- a/tools/validator/pom.xml +++ b/tools/validator/pom.xml @@ -31,6 +31,7 @@ <relativePath>../../parent/pom.xml</relativePath> </parent> <properties> + <cxf.module.name>org.apache.cxf.tools.validator</cxf.module.name> <cxf.osgi.export> =org.apache.cxf.tools.validator.internal, org.apache.cxf.tools.validator.*, diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml index fc92eb102d1..f69f215b86b 100644 --- a/tools/wadlto/jaxrs/pom.xml +++ b/tools/wadlto/jaxrs/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.wadl</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml index 073da5d9980..2e1228eb367 100644 --- a/tools/wsdlto/core/pom.xml +++ b/tools/wsdlto/core/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.wsdl.core</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/tools/wsdlto/databinding/jaxb/pom.xml b/tools/wsdlto/databinding/jaxb/pom.xml index 422e7203a2b..15c22ab8705 100644 --- a/tools/wsdlto/databinding/jaxb/pom.xml +++ b/tools/wsdlto/databinding/jaxb/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.wsdl.jaxb</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/tools/wsdlto/frontend/javascript/pom.xml b/tools/wsdlto/frontend/javascript/pom.xml index 75752080d88..143ac94e089 100644 --- a/tools/wsdlto/frontend/javascript/pom.xml +++ b/tools/wsdlto/frontend/javascript/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.wsdl.js</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml index 5afa1ccacdc..659bf80d830 100644 --- a/tools/wsdlto/frontend/jaxws/pom.xml +++ b/tools/wsdlto/frontend/jaxws/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.wsdl.jaxws</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml index c9f4f15b35f..1da7c4b4d24 100644 --- a/tools/wsdlto/misc/pom.xml +++ b/tools/wsdlto/misc/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.misc</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml index c1fa33583aa..8eac53f20cc 100644 --- a/tools/wsdlto/test/pom.xml +++ b/tools/wsdlto/test/pom.xml @@ -30,6 +30,9 @@ <version>3.2.5-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.module.name>org.apache.cxf.tools.wsdl.test</cxf.module.name> + </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility > ----------------------------------------------------------------- > > Key: CXF-7600 > URL: https://issues.apache.org/jira/browse/CXF-7600 > Project: CXF > Issue Type: Improvement > Components: Build system > Affects Versions: 3.2.1 > Reporter: Dennis Kieselhorst > Assignee: Andriy Redko > Priority: Major > > See mailinglist discussion: > https://lists.apache.org/thread.html/790a276b4a7b3d977f5cb1abdc764a0529324b286fba915d19352afb@%3Cdev.cxf.apache.org%3E > Similar issues: IO-551, LANG-1338, CODEC-242 -- This message was sent by Atlassian JIRA (v7.6.3#76005)