Skip to content

Commit 1d500ef

Browse files
committed
Remove use of maven.multiModuleProjectDirectory property.
Looks like it's unsupported for external use. See apache/iotdb#12981.
1 parent 65e9261 commit 1d500ef

File tree

9 files changed

+10
-8
lines changed

9 files changed

+10
-8
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
mvn install -B -q -DskipTests
5050
popd
5151
- name: Build with Maven
52-
run: mvn -Dlogging.config.file=\${maven.multiModuleProjectDirectory}/logging.ci.properties verify -B -Pjacoco coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN
52+
run: mvn -Dlogging.config.file=./logging.ci.properties verify -B -Pjacoco coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN
5353
env:
5454
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
5555
- name: Deploy with Maven

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ install:
1919
- mvn install -B -q -DskipTests
2020
- popd
2121
script:
22-
- mvn -Dlogging.config.file=\${maven.multiModuleProjectDirectory}/logging.ci.properties verify -Pjacoco coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -B
22+
- mvn -Dlogging.config.file=./logging.ci.properties verify -Pjacoco coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -B
2323
deploy:
2424
provider: script
2525
script: mvn -s .travis.settings.xml -Dgithub.username=$GITHUB_USERNAME -Dgithub.password=$GITHUB_TOKEN deploy -DskipTests
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../logging.properties
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../logging.properties

com.ibm.wala.cast.python.ml.test/TestTensorflow2Model.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.python.ml.test.TestTensorflow2Model"/>
2626
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.python.ml.test"/>
2727
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
28-
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=${maven.multiModuleProjectDirectory}/logging.properties"/>
28+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=./logging.properties"/>
2929
</launchConfiguration>

com.ibm.wala.cast.python.ml.test/TestTensorflow2Model.testModule.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.python.ml.test.TestTensorflow2Model"/>
2222
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.python.ml.test"/>
2323
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
24-
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=${maven.multiModuleProjectDirectory}/logging.properties"/>
24+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=./logging.properties"/>
2525
</launchConfiguration>

com.ibm.wala.cast.python.ml.test/TestTensorflow2Model.testModule2.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.python.ml.test.TestTensorflow2Model"/>
2121
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.python.ml.test"/>
2222
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
23-
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=${maven.multiModuleProjectDirectory}/logging.properties"/>
23+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=./logging.properties"/>
2424
</launchConfiguration>

com.ibm.wala.cast.python.ml.test/TestTensorflow2Model.testModule3.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.python.ml.test.TestTensorflow2Model"/>
2121
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.python.ml.test"/>
2222
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
23-
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=${maven.multiModuleProjectDirectory}/logging.properties"/>
23+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10; -Dpython.import.site=false&#10;-Djava.util.logging.config.file=./logging.properties"/>
2424
</launchConfiguration>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<spotless.version>2.44.5</spotless.version>
3333
<maven.surefire.version>3.5.3</maven.surefire.version>
3434
<parallel>both</parallel>
35-
<logging.config.file>${maven.multiModuleProjectDirectory}/logging.properties</logging.config.file>
35+
<logging.config.file>./logging.properties</logging.config.file>
3636
<jacoco-version>0.8.13</jacoco-version>
3737
<argLine/>
3838
</properties>
@@ -224,7 +224,7 @@
224224
<eclipseWtp>
225225
<type>XML</type>
226226
<files>
227-
<file>${maven.multiModuleProjectDirectory}/spotless.xml.prefs</file>
227+
<file>./spotless.xml.prefs</file>
228228
</files>
229229
</eclipseWtp>
230230
<trimTrailingWhitespace/>

0 commit comments

Comments
 (0)