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

remove use of maven.multiModuleProjectDirectory #6625

Merged
merged 3 commits into from
Jan 17, 2025
+6 −11
Merged

remove use of maven.multiModuleProjectDirectory #6625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
438e63d
first attempt. expecting issues.
Jan 16, 2025
244bac0
move checkstyle config to resources folder
Jan 16, 2025
c448184
bump checkstyle version
Jan 16, 2025
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
9 changes: 2 additions & 7 deletions hapi-fhir-checkstyle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,11 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<excludes>**/osgi/**/*, **/.mvn/**/*, **/.mvn_/**/*</excludes>
<sourceDirectories>
<!--scan base project directory to include all modules-->
<!--suppress UnresolvedMavenProperty -->
<directory>${maven.multiModuleProjectDirectory}/</directory>
</sourceDirectories>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<!--suppress UnresolvedMavenProperty -->
<configLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml</configLocation>
<configLocation>checkstyle/hapi-base-checkstyle.xml</configLocation>
<!--suppress UnresolvedMavenProperty -->
<suppressionsLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle-suppression.xml</suppressionsLocation>
<suppressionsLocation>checkstyle/hapi-base-checkstyle-suppression.xml</suppressionsLocation>
<inputEncoding>UTF-8</inputEncoding>
<consoleOutput>true</consoleOutput>
</configuration>
Expand Down
0 ...tyle/hapi-base-checkstyle-suppression.xml → ...tyle/hapi-base-checkstyle-suppression.xml
View file
Open in desktop
File renamed without changes.
0 ...e/src/checkstyle/hapi-base-checkstyle.xml → ...urces/checkstyle/hapi-base-checkstyle.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion mvnw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,5 +306,5 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
"-Dmaven.home=${M2_HOME}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
2 changes: 1 addition & 1 deletion mvnw.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ if exist %WRAPPER_JAR% (
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*

%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@
<apache_karaf_version>4.2.5</apache_karaf_version>
<aries_spifly_version>1.2</aries_spifly_version>
<caffeine_version>3.1.8</caffeine_version>
<checkstyle_version>10.17.0</checkstyle_version>
<checkstyle_version>10.21.1</checkstyle_version>
<maven_changes_version>2.12.1</maven_changes_version>
<commons_codec_version>1.15</commons_codec_version>
<commons_compress_version>1.26.0</commons_compress_version>
Expand Down Expand Up @@ -1113,7 +1113,7 @@
<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
<maven-license-plugin-version>2.5.0</maven-license-plugin-version>
<maven-enforcer-plugin-version>3.5.0</maven-enforcer-plugin-version>
<maven-checkstyle-version>3.4.0</maven-checkstyle-version>
<maven-checkstyle-version>3.6.0</maven-checkstyle-version>

</properties>

Expand Down
Loading