Skip to content

Commit

Permalink
Remove coverage profile from service pom (Azure#29572)
Browse files Browse the repository at this point in the history 
* Remove coverage profile from service pom

* update spring service pom

* fix build failures

* fix script that updates service pom

* resourcemanagerhybrid ci
  • Loading branch information
@srnagar @kwonus-msft
srnagar authored and kwonus-msft committed Jun 24, 2022
1 parent a6f1436 commit 0067f1a
Show file tree
Hide file tree
Showing 150 changed files with 590 additions and 5,791 deletions.
12 changes: 12 additions & 0 deletions eng/scripts/Generate-ServiceDirectories-From-Project-List.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ $StartTime = $(get-date)
$Path = Resolve-Path ($PSScriptRoot + "/../../")
$script:FoundError = $false

Write-Host "SourcesDirectory=$SourcesDirectory"
Write-Host "ProjectList=$ProjectList"

function Build-Unreleased-List-From-File {
param([string]$versionFile)
$unreleasedList = @()
Expand Down Expand Up @@ -84,6 +87,15 @@ foreach ($project in $ProjectList) {
$script:FoundError = $true
}
}

# This is lame. Because resourcemanager and resourcemanagerhybrid contain the some of the same
# artifacts and we don't know which one is actually needed, if resourcemanager is in the list
# then add resourcemanagerhybrid.
Write-Host "sparseCheckoutDirectories=$sparseCheckoutDirectories"
if ($sparseCheckoutDirectories.Contains("/sdk/resourcemanager")) {
$sparseCheckoutDirectories += "/sdk/resourcemanagerhybrid"
}

# Unreleased_ libraries are special. They're the only case, outside of FromSource runs where
# libraries from other service directories, outside of the one we're building, need to get built.
# It's easier to just add any unreleased_ dependency service directories to the sparse checkout
Expand Down
35 changes: 3 additions & 32 deletions sdk/advisor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,7 @@
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->

<profiles>
<profile>
<id>coverage</id>
<modules>
</modules>

<dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-resourcemanager-advisor</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-resourcemanager-advisor</module>
</modules>
</project>
41 changes: 3 additions & 38 deletions sdk/agrifood/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,7 @@
<artifactId>azure-agrifood-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<profiles>
<profile>
<id>coverage</id>
<modules>
<module>azure-verticals-agrifood-farming</module>
</modules>

<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-verticals-agrifood-farming</artifactId>
<version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-verticals-agrifood-farming;current} -->
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-verticals-agrifood-farming</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-verticals-agrifood-farming</module>
</modules>
</project>
41 changes: 3 additions & 38 deletions sdk/anomalydetector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,7 @@
<artifactId>azure-anomalydetector-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<profiles>
<profile>
<id>coverage</id>
<modules>
<module>azure-ai-anomalydetector</module>
</modules>

<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-ai-anomalydetector</artifactId>
<version>3.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-ai-anomalydetector;current} -->
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-ai-anomalydetector</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-ai-anomalydetector</module>
</modules>
</project>
52 changes: 6 additions & 46 deletions sdk/aot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,10 @@
<artifactId>azure-aot-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<profiles>
<!-- DO NOT CHANGE THE ORDER IN WHICH THESE PROFILES ARE DEFINED -->
<profile>
<id>coverage</id>
<modules>
<module>azure-aot-graalvm-support</module>
<module>azure-aot-graalvm-support-netty</module>
</modules>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-aot-graalvm-support</artifactId>
<version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-aot-graalvm-support;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-aot-graalvm-support-netty</artifactId>
<version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-aot-graalvm-support-netty;current} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-aot-graalvm-support</module>
<module>azure-aot-graalvm-support-netty</module>
<module>azure-aot-graalvm-samples</module>
<module>azure-aot-graalvm-perf</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-aot-graalvm-support</module>
<module>azure-aot-graalvm-support-netty</module>
<module>azure-aot-graalvm-samples</module>
<module>azure-aot-graalvm-perf</module>
</modules>
</project>
35 changes: 3 additions & 32 deletions sdk/apimanagement/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,7 @@
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->

<profiles>
<profile>
<id>coverage</id>
<modules>
</modules>

<dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-resourcemanager-apimanagement</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-resourcemanager-apimanagement</module>
</modules>
</project>
57 changes: 11 additions & 46 deletions sdk/appconfiguration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,15 @@
<artifactId>azure-appconfiguration-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<profiles>
<profile>
<id>coverage</id>
<modules>
<module>azure-data-appconfiguration</module>
</modules>

<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-appconfiguration</artifactId>
<version>1.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-data-appconfiguration</module>
<module>azure-data-appconfiguration-perf</module>
<module>azure-resourcemanager-appconfiguration</module>
<module>azure-spring-cloud-test-appconfiguration-config</module>
<module>azure-spring-cloud-appconfiguration-config</module>
<module>azure-spring-cloud-appconfiguration-config-web</module>
<module>azure-spring-cloud-feature-management</module>
<module>azure-spring-cloud-feature-management-web</module>
<module>azure-spring-cloud-starter-appconfiguration-config</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-data-appconfiguration</module>
<module>azure-data-appconfiguration-perf</module>
<module>azure-resourcemanager-appconfiguration</module>
<module>azure-spring-cloud-test-appconfiguration-config</module>
<module>azure-spring-cloud-appconfiguration-config</module>
<module>azure-spring-cloud-appconfiguration-config-web</module>
<module>azure-spring-cloud-feature-management</module>
<module>azure-spring-cloud-feature-management-web</module>
<module>azure-spring-cloud-starter-appconfiguration-config</module>
</modules>
</project>
44 changes: 3 additions & 41 deletions sdk/appcontainers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,7 @@
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->

<profiles>
<profile>
<id>coverage</id>
<modules>
</modules>

<dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<executions>
<execution>
<id>report-aggregate</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<configuration>
<outputDirectory>${project.reporting.outputDirectory}/test-coverage</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-resourcemanager-appcontainers</module>
</modules>
</profile>
</profiles>
<modules>
<module>azure-resourcemanager-appcontainers</module>
</modules>
</project>
Loading

0 comments on commit 0067f1a

Please sign in to comment.