Skip to content

build: Added useProjectSettings=false to tycho-compiler #5754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

build: Added useProjectSettings=false to tycho-compiler #5754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 32 additions & 63 deletions kura/examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- make us aware of warnings -->
<showWarnings>true</showWarnings>
<!-- Kura does not set bootdelegation, we let the compiler check for this -->
<requireJREPackageImports>true</requireJREPackageImports>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand Down Expand Up @@ -442,6 +436,18 @@
<skipPomGeneration>true</skipPomGeneration>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- make us aware of warnings -->
<showWarnings>true</showWarnings>
<!-- Kura does not set bootdelegation, we let the compiler check for this -->
<requireJREPackageImports>true</requireJREPackageImports>
<useProjectSettings>false</useProjectSettings>
</configuration>
</plugin>

<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
Expand All @@ -466,19 +472,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<versionRange>
[0.6.4.201312101107,)
</versionRange>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<versionRange>[0.6.4.201312101107,)</versionRange>
<goals>
<goal>
prepare-agent
</goal>
<goal>prepare-agent</goal>
</goals>
</pluginExecutionFilter>
<action>
Expand All @@ -487,19 +485,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-dependency-plugin
</artifactId>
<versionRange>
[2.1,)
</versionRange>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.1,)</versionRange>
<goals>
<goal>
copy-dependencies
</goal>
<goal>copy-dependencies</goal>
</goals>
</pluginExecutionFilter>
<action>
Expand All @@ -508,15 +498,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>
[1.7,)
</versionRange>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>[1.7,)</versionRange>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -527,15 +511,10 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
<groupId>org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9,)
</versionRange>
<artifactId>build-helper-maven-plugin</artifactId>
<versionRange>[1.9,)</versionRange>
<goals>
<goal>regex-property</goal>
</goals>
Expand All @@ -546,15 +525,10 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-checkstyle-plugin
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin
</artifactId>
<versionRange>
[2.14,)
</versionRange>
<versionRange>[2.14,)</versionRange>
<goals>
<goal>check</goal>
</goals>
Expand All @@ -565,15 +539,10 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
<groupId>org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.2,)
</versionRange>
<artifactId>exec-maven-plugin</artifactId>
<versionRange>[1.2,)</versionRange>
<goals>
<goal>exec</goal>
</goals>
Expand Down
99 changes: 32 additions & 67 deletions kura/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,13 +467,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- make us aware of warnings -->
<showWarnings>true</showWarnings>
<!-- Kura does not set bootdelegation, we let the compiler check for this -->
<requireJavaPackageImports>true</requireJavaPackageImports>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand Down Expand Up @@ -569,6 +562,18 @@
<deriveHeaderFromSource>false</deriveHeaderFromSource>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- make us aware of warnings -->
<showWarnings>true</showWarnings>
<!-- Kura does not set bootdelegation, we let the compiler check for this -->
<requireJavaPackageImports>true</requireJavaPackageImports>
<useProjectSettings>false</useProjectSettings>
</configuration>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
Expand Down Expand Up @@ -645,19 +650,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<versionRange>
[0.6.4.201312101107,)
</versionRange>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<versionRange>[0.6.4.201312101107,)</versionRange>
<goals>
<goal>
prepare-agent
</goal>
<goal>prepare-agent</goal>
</goals>
</pluginExecutionFilter>
<action>
Expand All @@ -666,19 +663,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-dependency-plugin
</artifactId>
<versionRange>
[2.1,)
</versionRange>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.1,)</versionRange>
<goals>
<goal>
copy-dependencies
</goal>
<goal>copy-dependencies</goal>
</goals>
</pluginExecutionFilter>
<action>
Expand All @@ -687,15 +676,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>
[1.7,)
</versionRange>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>[1.7,)</versionRange>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -706,15 +689,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<versionRange>
[1.9,)
</versionRange>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<versionRange>[1.9,)</versionRange>
<goals>
<goal>regex-property</goal>
</goals>
Expand All @@ -725,15 +702,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-checkstyle-plugin
</artifactId>
<versionRange>
[2.14,)
</versionRange>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<versionRange>[2.14,)</versionRange>
<goals>
<goal>check</goal>
</goals>
Expand All @@ -744,15 +715,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.2,)
</versionRange>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<versionRange>[1.2,)</versionRange>
<goals>
<goal>exec</goal>
</goals>
Expand Down
1 change: 1 addition & 0 deletions kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<requireJREPackageImports>true</requireJREPackageImports>
<useProjectSettings>false</useProjectSettings>
</configuration>
</plugin>

Expand Down