diff --git a/demo/osgi-repository/my-bundle/pom.xml b/demo/osgi-repository/my-bundle/pom.xml index 7a3415e5fe..e64cf5ed3b 100644 --- a/demo/osgi-repository/my-bundle/pom.xml +++ b/demo/osgi-repository/my-bundle/pom.xml @@ -7,8 +7,8 @@ my-bundle - 1.8 - 1.8 + 8 + 8 diff --git a/pom.xml b/pom.xml index 58b9868b02..ae9c16222d 100644 --- a/pom.xml +++ b/pom.xml @@ -395,8 +395,6 @@ ${min.jdk.version} ${min.jdk.version} - - false @@ -635,6 +633,28 @@ + + + avoid-maven-compiler-warnings + + [21,) + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + full + + + + + + diff --git a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java index 64ad0ab32a..3c13ff8498 100644 --- a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java +++ b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java @@ -49,7 +49,7 @@ * TODO: At least one step could be optimized, currently the plugin will do two scans of all the * source code if the compiler has to have the entire set of sources. This is currently the case for * at least the C# compiler and most likely all the other .NET compilers too. - * + * * @author others * @author Trygve Laugstøl * @author Jan Sievers (SAP) added support for annotation processor options @@ -124,9 +124,10 @@ public abstract class AbstractCompilerMojo extends AbstractMojo { /** * The -encoding argument for the Java compiler (kept for backwards compatibility) - * + * * @deprecated use {@link #encoding} */ + @Deprecated @Parameter(property = "maven.compiler.encoding", readonly = true) private String mavenCompilerEncoding; @@ -183,13 +184,13 @@ public abstract class AbstractCompilerMojo extends AbstractMojo { private String executable; /** - * If only is specified, the annotation processors will run but no compilation will be - * performed. If none is specified, annotation processors will not be discovered or - * run; compilation will proceed as if no annotation processors were found. By default the - * compiler must search the classpath for annotation processors, so specifying none may - * speed compilation if annotation processing is not required. This parameter requires a 1.6 VM - * or above and is used only if the compliance is 1.6 - * + * If only is specified, the annotation processors will run but no compilation will + * be performed. If none is specified, annotation processors will not be discovered + * or run; compilation will proceed as if no annotation processors were found. By default the + * compiler must search the classpath for annotation processors, so specifying none + * may speed compilation if annotation processing is not required. This parameter requires a 1.6 + * VM or above and is used only if the compliance is 1.6 + * * @since 0.16.0 */ @Parameter @@ -200,7 +201,7 @@ public abstract class AbstractCompilerMojo extends AbstractMojo { * * normal processor discovery process will be skipped. This parameter requires a 1.6 VM or * above and is used only if the compliance is 1.6 - * + * * @since 0.16.0 */ @Parameter @@ -209,7 +210,7 @@ public abstract class AbstractCompilerMojo extends AbstractMojo { /** * The directory where source files generated by annotation processors will be created. This * parameter requires a 1.6 VM or above and is used only if the compliance is 1.6. - * + * * @since 0.16.0 */ @Parameter(defaultValue = "${project.build.directory}/generated-sources/annotations") @@ -223,15 +224,16 @@ public abstract class AbstractCompilerMojo extends AbstractMojo { * This is because the list of valid arguments passed to a Java compiler varies based on the * compiler version. *

- * + * * @deprecated use {@link #compilerArgs} instead. */ + @Deprecated @Parameter private Map compilerArguments; /** * Arguments to be passed to the compiler. - * + * * @since 0.17.0 */ @Parameter diff --git a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java index b1e9f9864a..0027bc4b9b 100644 --- a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java +++ b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java @@ -66,8 +66,8 @@ public class MirrorMojo extends AbstractMojo { /** * Source repositori(es) to mirror from. - * - * @see {@link #targetPlatformAsSource} and {@link #currentModuleAsSource} + * + * See also {@link #targetPlatformAsSource} and {@link #currentModuleAsSource} */ @Parameter(required = false) private List source; @@ -166,7 +166,7 @@ public class MirrorMojo extends AbstractMojo { * Add XZ-compressed repository index files. XZ offers better compression ratios esp. for highly * redundant file content. *

- * + * * @since 0.25.0 */ @Parameter(defaultValue = "true") @@ -178,7 +178,7 @@ public class MirrorMojo extends AbstractMojo { * addition to XZ-compressed index files. This fallback provides backwards compatibility for * pre-Mars p2 clients which cannot read XZ-compressed index files. *

- * + * * @since 0.25.0 */ @Parameter(defaultValue = "true") @@ -189,7 +189,7 @@ public class MirrorMojo extends AbstractMojo { * Whether to add the target-platform content as a source. Ignored for non-Tycho packaging * types. *

- * + * * @since 1.1.0 */ @Parameter(defaultValue = "false") @@ -200,7 +200,7 @@ public class MirrorMojo extends AbstractMojo { * Whether the current build p2 output should be added as source. Ignored for non-Tycho * packaging types. Ignored if {@link #targetPlatformAsSource} == false; *

- * + * * @since 1.1.0 */ @Parameter(defaultValue = "true") @@ -211,7 +211,7 @@ public class MirrorMojo extends AbstractMojo { * If set to true, mirroring continues to run in the event of an error during the mirroring * process and will just log an info message. *

- * + * * @since 1.1.0 */ @Parameter(defaultValue = "false") diff --git a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java index dc2d298ef3..bc95245a7c 100644 --- a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java +++ b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java @@ -31,8 +31,8 @@ /** * This goal invokes the feature and bundle publisher on a folder. - * - * @see https://wiki.eclipse.org/Equinox/p2/Publisher#Features_And_Bundles_Publisher_Application + * + * @see Eclipse Wiki */ @Mojo(name = "publish-features-and-bundles", threadSafe = true) public class PublishFeaturesAndBundlesMojo extends AbstractMojo { @@ -49,7 +49,7 @@ public class PublishFeaturesAndBundlesMojo extends AbstractMojo { * Location of the artifact repository to write. Note: The AssembleRepositoryMojo of * tycho-p2-repository-plugin will only work with the predefined default * ${project.build.directory}/repository. - * + * */ @Parameter(defaultValue = "${project.build.directory}/repository") private String artifactRepositoryLocation; diff --git a/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml b/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml index 6049aec861..f7fcb0e015 100644 --- a/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml +++ b/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml @@ -3,13 +3,13 @@ 4.0.0 org.eclipse.tycho.tychoits.TYCHO590 annotated-project - + org.eclipse.tycho.tychoits.TYCHO590 parent 1.0.0-SNAPSHOT - + @@ -17,8 +17,8 @@ maven-compiler-plugin 3.10.1 - 1.8 - 1.8 + 8 + 8 false jdt diff --git a/tycho-its/projects/TYCHO590annotationProcessing/pom.xml b/tycho-its/projects/TYCHO590annotationProcessing/pom.xml index 660358242e..d596409533 100644 --- a/tycho-its/projects/TYCHO590annotationProcessing/pom.xml +++ b/tycho-its/projects/TYCHO590annotationProcessing/pom.xml @@ -5,7 +5,7 @@ parent 1.0.0-SNAPSHOT pom - + annotation-processor annotated-project @@ -18,8 +18,8 @@ maven-compiler-plugin 3.10.1 - 1.8 - 1.8 + 8 + 8 false jdt diff --git a/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml b/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml index cd72daa1ad..437f584898 100644 --- a/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml +++ b/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml @@ -12,12 +12,12 @@ jar - 1.8 - 1.8 + 8 + 8 - + - org.eclipse.tycho diff --git a/tycho-lib-detector/pom.xml b/tycho-lib-detector/pom.xml index cc2cd70b6e..c708f144b4 100644 --- a/tycho-lib-detector/pom.xml +++ b/tycho-lib-detector/pom.xml @@ -26,7 +26,7 @@ org.apache.maven.plugins maven-compiler-plugin - + 1.3 1.1 diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java index aadbc04644..8af373d006 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java @@ -42,7 +42,7 @@ * Publishes the category definitions from the category.xml in the root of the project. *

* - * @see https://wiki.eclipse.org/Equinox/p2/Publisher + * @see Eclipse Wiki */ @Mojo(name = "publish-categories", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) public final class PublishCategoriesMojo extends AbstractPublishMojo { @@ -80,7 +80,7 @@ protected Collection publishContent(PublisherServiceFactory publ /** * Writes the Tycho-internal representation of categories back to a category.xml. - * + * * @param category * a category, with "qualifier" literals already replaced by the build qualifier. */ diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java index 27067df7ad..fe7cfbef77 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java @@ -70,8 +70,8 @@ * Publishes all product definitions files (*.product) that are present in the root of * the project. *

- * - * @see https://wiki.eclipse.org/Equinox/p2/Publisher + * + * @see Eclipse Wiki */ @Mojo(name = "publish-products", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) public final class PublishProductMojo extends AbstractPublishMojo { diff --git a/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml b/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml index 1f4e0189be..f6d28fa4e4 100644 --- a/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml @@ -7,7 +7,7 @@ org.eclipse.tycho.bnd.executionlistener - 1.8 + 8 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml index 3987b3d01f..fa4d7b7de0 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml @@ -21,7 +21,7 @@ jar Tycho Surefire OSGi Booter Eclipse Application - 1.8 + 8 ${java.version} ${java.version}