Skip to content
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

4.x: Upgrade build-tools to 3.0.3, fix hbs template file copyright #5735

Merged
merged 1 commit into from
Dec 20, 2022
Merged

4.x: Upgrade build-tools to 3.0.3, fix hbs template file copyright #5735

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
4 changes: 2 additions & 2 deletions applications/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<version.plugin.dependency>3.1.2</version.plugin.dependency>
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
<version.plugin.helidon>3.0.0</version.plugin.helidon>
<version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
<version.plugin.helidon>3.0.3</version.plugin.helidon>
<version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
<version.plugin.jar>3.0.2</version.plugin.jar>
<version.plugin.nativeimage>0.9.16</version.plugin.nativeimage>
<version.plugin.os>1.5.0.Final</version.plugin.os>
Expand Down
1 change: 0 additions & 1 deletion etc/copyright-exclude.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,3 @@ persistence_3_0.xsd
# excluded as this is a test file and we need to validate its content
src/test/resources/static/classpath/index.html
._java_
.hbs
4 changes: 2 additions & 2 deletions examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
<version.plugin.helidon>3.0.0</version.plugin.helidon>
<version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
<version.plugin.helidon>3.0.3</version.plugin.helidon>
<version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
<version.plugin.jandex>1.0.6</version.plugin.jandex>
<version.plugin.jar>3.0.2</version.plugin.jar>
<version.plugin.os>1.5.0.Final</version.plugin.os>
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstarts/helidon-standalone-quickstart-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<version.plugin.dependency>3.0.0</version.plugin.dependency>
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
<version.plugin.helidon>3.0.0</version.plugin.helidon>
<version.plugin.helidon-cli>3.0.0</version.plugin.helidon-cli>
<version.plugin.helidon>3.0.3</version.plugin.helidon>
<version.plugin.helidon-cli>3.0.3</version.plugin.helidon-cli>
<version.plugin.jar>3.0.2</version.plugin.jar>
<version.plugin.os>1.5.0.Final</version.plugin.os>
<version.plugin.protobuf>0.5.1</version.plugin.protobuf>
Expand Down
22 changes: 10 additions & 12 deletions pico/tools/src/main/resources/templates/pico/default/module-info.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
{{!
Copyright (c) 2022 Oracle and/or its affiliates.

Copyright (c) 2022 Oracle and/or its affiliates.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
}}{{#header}}{{{.}}}{{/header}}
{{#hasdescription}}/**{{#description}}
* {{{.}}}{{/description}}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>3.0.0-M5</version.plugin.failsafe>
<version.plugin.glassfish-copyright>2.3</version.plugin.glassfish-copyright>
<version.plugin.helidon-build-tools>3.0.0</version.plugin.helidon-build-tools>
<version.plugin.helidon-build-tools>3.0.3</version.plugin.helidon-build-tools>
<version.plugin.hibernate-enhance>${version.lib.hibernate}</version.plugin.hibernate-enhance>
<version.plugin.jacoco>0.8.5</version.plugin.jacoco>
<version.plugin.jandex>1.1.0</version.plugin.jandex>
Expand Down