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.

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

SCANMAVEN-230 Update scanner library to support new bootstrapper #244

Merged
merged 15 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
folder: ${CIRRUS_WORKING_DIR}/.m2/repository
script:
- source cirrus-env BUILD
- mvn -f property-dump-plugin/pom.xml -B install
- regular_mvn_build_deploy_analyze
cleanup_before_cache_script:
- cleanup_maven_repository
Expand All @@ -72,7 +73,7 @@
mend_script:
- source cirrus-env QA
- source set_maven_build_version $BUILD_NUMBER
- mvn clean install -DskipTests
- mvn clean install -DskipTests -B
- source ws_scan.sh
cleanup_before_cache_script: cleanup_maven_repository
allow_failures: "true"
Expand All @@ -86,7 +87,7 @@
<<: *ONLY_SONARSOURCE_QA
eks_container:
<<: *CONTAINER_DEFINITION
cpu: 2
cpu: 6
memory: 4G
env:
matrix:
Expand Down Expand Up @@ -123,7 +124,7 @@
cleanup_before_cache_script:
- cleanup_maven_repository

promote_task:

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different

Check warning on line 127 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L127

task "promote" depends on task "qa", but their only_if conditions are different
depends_on:
- qa
<<: *ONLY_SONARSOURCE_QA
Expand Down
3 changes: 3 additions & 0 deletions cirrus/cirrus-qa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ mkdir -p $MAVEN_HOME_IT
curl -sSL https://repo1.maven.org/maven2/org/apache/maven/apache-maven/$MAVEN_VERSION/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar zx --strip-components 1 -C $MAVEN_HOME_IT
cp -f ~/.m2/settings.xml $MAVEN_HOME_IT/conf/

# We need to build this small plugin first, that will dump the analysis properties in a local file
mvn -f property-dump-plugin/pom.xml --batch-mode -Dmaven.home=$MAVEN_HOME_IT install

# Run ITs.
cd its
mvn -B -e -Dsonar.runtimeVersion=$SQ_VERSION -Dmaven.test.redirectTestOutputToFile=false -Dmaven.home=$MAVEN_HOME_IT verify
20 changes: 13 additions & 7 deletions its/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
<version>2.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down Expand Up @@ -87,13 +81,25 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<properties>
<configurationParameters>
junit.jupiter.execution.parallel.enabled = true
junit.jupiter.execution.parallel.mode.default = same_thread
junit.jupiter.execution.parallel.mode.classes.default = concurrent
junit.jupiter.testclass.order.default=org.junit.jupiter.api.ClassOrderer$ClassName
junit.jupiter.testmethod.order.default=org.junit.jupiter.api.MethodOrderer$MethodName
</configurationParameters>
</properties>
</configuration>
</plugin>
</plugins>
</pluginManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>1.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
<artifactId>aggregator</artifactId>
<artifactId>aggregator-inherit-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>

Expand Down
13 changes: 13 additions & 0 deletions its/projects/maven/bootstrap-small-project/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.sonarsource.maven.its</groupId>
<artifactId>bootstrap-small-project</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

</project>
4 changes: 2 additions & 2 deletions its/projects/project-default-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion its/projects/version/compilerPluginConfig/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.7</source>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion its/projects/version/properties/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<name>Sonar :: Integration Tests :: Java Version</name>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

Expand Down
Loading