Skip to content

revert broken IT updates from #344 #373

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

Merged
hboutemy merged 1 commit into from
Jun 14, 2026
Merged

revert broken IT updates from #344 #373

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
16 changes: 4 additions & 12 deletions src/it/projects/active-profiles_multimodule/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,7 @@
def buildLog = new File( basedir, 'build.log' );
assert buildLog.exists()

if (mavenVersion.startsWith( '4.' )) {
assert 1 == buildLog.text.count(' - mph79 (source: org.apache.maven.its.help:active-profiles_multimodule:pom:1.0-SNAPSHOT)')
assert 1 == buildLog.text.count(' - mph79 (source: org.apache.maven.its.help:active-profiles_multimodule-module:jar:1.0-SNAPSHOT)')
assert 1 == buildLog.text.count('- mph79-child (source: org.apache.maven.its.help:active-profiles_multimodule-module:jar:1.0-SNAPSHOT)')

} else {
assert 2 == buildLog.text.count(' - mph79 (source: org.apache.maven.its.help:active-profiles_multimodule:1.0-SNAPSHOT)')
assert 1 == buildLog.text.count(' - mph79-child (source: org.apache.maven.its.help:active-profiles_multimodule-module:1.0-SNAPSHOT)')
}

assert 0 == buildLog.text.count(' - mph79-child-inactive')
assert 2 == buildLog.text.count(' - it-repo (source: external)')
assert 2 == buildLog.text.count( ' - mph79 (source: org.apache.maven.its.help:active-profiles_multimodule:1.0-SNAPSHOT)' )
assert 1 == buildLog.text.count( ' - mph79-child (source: org.apache.maven.its.help:active-profiles_multimodule-module:1.0-SNAPSHOT)' )
assert 0 == buildLog.text.count( ' - mph79-child-inactive' )
assert 2 == buildLog.text.count( ' - it-repo (source: external)' )
11 changes: 4 additions & 7 deletions src/it/projects/effective-pom_properties/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
def buildLog = new File(basedir, 'build.log');
def buildLog = new File(basedir, 'build.log');
assert buildLog.exists()

def LS = System.getProperty("line.separator")
if (mavenVersion.startsWith('4.')) {
// we have defined properties maven.compiler.source/target to 8 as user properties for execution
// Maven 4 take precedence over the pom properties
// also order of properties is changed in Maven 4
// with Maven 4, order of properties is reversed from original pom.xml
assert buildLog.text.find(
'(?s)' +
' <properties>' + LS +
' <maven\\.compiler\\.target>8</maven\\.compiler\\.target>' + LS +
' <maven\\.compiler\\.source>8</maven\\.compiler\\.source>' + LS +
' <maven\\.compiler\\.target>1\\.6</maven\\.compiler\\.target>' + LS +
' <maven\\.compiler\\.source>1\\.6</maven\\.compiler\\.source>' + LS +
'.*' +
' </properties>') != null

} else {
assert buildLog.text.find(
'(?s)' +
Expand Down
Loading