clean up poms
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-ri/bundles/core/pom.xml b/jaxb-ri/bundles/core/pom.xml
index 224ef0a..9a279e6 100644
--- a/jaxb-ri/bundles/core/pom.xml
+++ b/jaxb-ri/bundles/core/pom.xml
@@ -65,7 +65,6 @@
<properties>
<dep.sources>${project.build.directory}/generated-sources/dependencies</dep.sources>
- <dep.sources.mr>${project.build.directory}/generated-sources/dependencies-mr</dep.sources.mr>
</properties>
<profiles>
@@ -155,21 +154,6 @@
<outputDirectory>${dep.sources}</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>unpack-sources-mr</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>com.sun.istack</includeGroupIds>
- <includeScope>provided</includeScope>
- <classifier>sources</classifier>
- <excludeTransitive>true</excludeTransitive>
- <includes>META-INF/versions/9/**</includes>
- <outputDirectory>${dep.sources.mr}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -205,38 +189,6 @@
</sources>
</configuration>
</execution>
- <execution>
- <id>add-mr-resource</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${dep.sources.mr}</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile-mr</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <compileSourceRoots>
- <compileSourceRoot>${dep.sources.mr}/META-INF/versions/9</compileSourceRoot>
- </compileSourceRoots>
- <outputDirectory>${project.build.outputDirectory}/META-INF/versions/${upper.java.level}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
diff --git a/jaxb-ri/bundles/osgi/osgi/pom.xml b/jaxb-ri/bundles/osgi/osgi/pom.xml
index 5fe7c3a..c2855cb 100644
--- a/jaxb-ri/bundles/osgi/osgi/pom.xml
+++ b/jaxb-ri/bundles/osgi/osgi/pom.xml
@@ -133,7 +133,6 @@
<properties>
<dep.sources>${project.build.directory}/generated-sources/dependencies</dep.sources>
- <dep.sources.mr>${project.build.directory}/generated-sources/dependencies-mr</dep.sources.mr>
</properties>
<build>
@@ -156,21 +155,6 @@
<outputDirectory>${dep.sources}</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>unpack-sources-mr</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>com.sun.istack,com.sun.xml.bind.external,com.sun.xml.dtd-parser,com.sun.xml.fastinfoset,org.jvnet.staxex</includeGroupIds>
- <includeScope>provided</includeScope>
- <classifier>sources</classifier>
- <excludeTransitive>true</excludeTransitive>
- <includes>META-INF/versions/9/**</includes>
- <outputDirectory>${dep.sources.mr}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -226,20 +210,6 @@
</sources>
</configuration>
</execution>
- <execution>
- <id>add-mr-resource</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${dep.sources.mr}</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -256,18 +226,6 @@
</compilerArgs>
</configuration>
</execution>
- <execution>
- <id>default-compile-mr</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <compileSourceRoots>
- <compileSourceRoot>${dep.sources.mr}/META-INF/versions/9</compileSourceRoot>
- </compileSourceRoots>
- <outputDirectory>${project.build.outputDirectory}/META-INF/versions/${upper.java.level}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
diff --git a/jaxb-ri/bundles/runtime/pom.xml b/jaxb-ri/bundles/runtime/pom.xml
index 21f9c2f..c11e3d0 100644
--- a/jaxb-ri/bundles/runtime/pom.xml
+++ b/jaxb-ri/bundles/runtime/pom.xml
@@ -63,7 +63,6 @@
<properties>
<dep.sources>${project.build.directory}/generated-sources/dependencies</dep.sources>
- <dep.sources.mr>${project.build.directory}/generated-sources/dependencies-mr</dep.sources.mr>
</properties>
<profiles>
@@ -117,21 +116,6 @@
<outputDirectory>${dep.sources}</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>unpack-sources-mr</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>com.sun.istack</includeGroupIds>
- <includeScope>provided</includeScope>
- <classifier>sources</classifier>
- <excludeTransitive>true</excludeTransitive>
- <includes>META-INF/versions/9/**</includes>
- <outputDirectory>${dep.sources.mr}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -167,38 +151,6 @@
</sources>
</configuration>
</execution>
- <execution>
- <id>add-mr-resource</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${dep.sources.mr}</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile-mr</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <compileSourceRoots>
- <compileSourceRoot>${dep.sources.mr}/META-INF/versions/9</compileSourceRoot>
- </compileSourceRoots>
- <outputDirectory>${project.build.outputDirectory}/META-INF/versions/${upper.java.level}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
diff --git a/jaxb-ri/bundles/xjc/pom.xml b/jaxb-ri/bundles/xjc/pom.xml
index 5544a40..708ab8d 100644
--- a/jaxb-ri/bundles/xjc/pom.xml
+++ b/jaxb-ri/bundles/xjc/pom.xml
@@ -92,7 +92,6 @@
<properties>
<dep.sources>${project.build.directory}/generated-sources/dependencies</dep.sources>
- <dep.sources.mr>${project.build.directory}/generated-sources/dependencies-mr</dep.sources.mr>
</properties>
<profiles>
@@ -145,21 +144,6 @@
<outputDirectory>${dep.sources}</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>unpack-sources-mr</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>com.sun.istack,com.sun.xml.bind.external,com.sun.xml.dtd-parser</includeGroupIds>
- <includeScope>provided</includeScope>
- <classifier>sources</classifier>
- <excludeTransitive>true</excludeTransitive>
- <includes>META-INF/versions/9/**</includes>
- <outputDirectory>${dep.sources.mr}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -213,20 +197,6 @@
</sources>
</configuration>
</execution>
- <execution>
- <id>add-mr-resource</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${dep.sources.mr}</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -243,18 +213,6 @@
</compilerArgs>
</configuration>
</execution>
- <execution>
- <id>default-compile-mr</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <compileSourceRoots>
- <compileSourceRoot>${dep.sources.mr}/META-INF/versions/9</compileSourceRoot>
- </compileSourceRoots>
- <outputDirectory>${project.build.outputDirectory}/META-INF/versions/${upper.java.level}</outputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
diff --git a/jaxb-ri/pom.xml b/jaxb-ri/pom.xml
index e095a6f..82d611d 100644
--- a/jaxb-ri/pom.xml
+++ b/jaxb-ri/pom.xml
@@ -83,6 +83,9 @@
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.version>4.5.3.0</spotbugs.version>
+ <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.testRelease>11</maven.compiler.testRelease>
+
<junit.version>4.13.2</junit.version>
<module.path>${project.build.directory}/mods</module.path>
@@ -92,7 +95,6 @@
<felix.osgi.core>6.0.0</felix.osgi.core>
<jmockit.version>1.34</jmockit.version>
<compiler.version>2.4.0</compiler.version>
- <upper.java.level>11</upper.java.level>
<oss.disallow.snapshots>true</oss.disallow.snapshots>
<vendor.name>Eclipse Foundation</vendor.name>
<vendor.id>org.eclipse</vendor.id>
@@ -103,6 +105,10 @@
<warn.limit>150000</warn.limit>
<!-- too many to fix -->
<jdoc.doclint>all,-missing</jdoc.doclint>
+ <!-- not interested in warnings from tests (yet) -->
+ <comp.test.xlint>-Xlint:none</comp.test.xlint>
+ <comp.test.xdoclint>-Xdoclint:none</comp.test.xdoclint>
+ <warn.test.limit>10</warn.test.limit>
</properties>
<dependencyManagement>
@@ -250,7 +256,6 @@
<addDefaultEntries>false</addDefaultEntries>
</manifest>
</archive>
- <release>11</release>
<notimestamp>true</notimestamp>
<dependencySourceExcludes>
<dependencySourceExclude>com.sun.xml.bind:*</dependencySourceExclude>
@@ -462,19 +467,37 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <release>11</release>
- <testRelease>11</testRelease>
- <compilerArgs combine.children="append">
- <arg>${comp.xlint}</arg>
- <arg>${comp.xdoclint}</arg>
- <arg>-Xmaxwarns</arg>
- <arg>${warn.limit}</arg>
- <arg>-Xmaxerrs</arg>
- <arg>${warn.limit}</arg>
- </compilerArgs>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <configuration>
+ <compilerArgs combine.children="append">
+ <arg>${comp.xlint}</arg>
+ <arg>${comp.xdoclint}</arg>
+ <arg>-Xmaxwarns</arg>
+ <arg>${warn.limit}</arg>
+ <arg>-Xmaxerrs</arg>
+ <arg>${warn.limit}</arg>
+ </compilerArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-testCompile</id>
+ <configuration>
+ <compilerArgs combine.children="append">
+ <arg>${comp.test.xlint}</arg>
+ <arg>${comp.test.xdoclint}</arg>
+ <arg>-Xmaxwarns</arg>
+ <arg>${warn.test.limit}</arg>
+ <arg>-Xmaxerrs</arg>
+ <arg>${warn.test.limit}</arg>
+ </compilerArgs>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
