소스 검색

Fix profiles in vaadin-root pom.xml (#8484)

tags/8.0.0.rc1
Teemu Suo-Anttila 7 년 전
부모
커밋
5d309dac6f
3개의 변경된 파일75개의 추가작업 그리고 73개의 파일을 삭제
  1. 57
    41
      pom.xml
  2. 18
    27
      uitest/pom.xml
  3. 0
    5
      uitest/src/test/java/com/vaadin/tests/performance/MemoryIT.java

+ 57
- 41
pom.xml 파일 보기



<!-- Dependency unpack directory --> <!-- Dependency unpack directory -->
<dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory> <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
<jetty.version>9.3.7.v20160115</jetty.version> <jetty.version>9.3.7.v20160115</jetty.version>
<phantomjs.version>2.1.1</phantomjs.version> <phantomjs.version>2.1.1</phantomjs.version>


<artifactId>vaadin-sass-compiler</artifactId> <artifactId>vaadin-sass-compiler</artifactId>
<version>${vaadin.sass.version}</version> <version>${vaadin.sass.version}</version>
<exclusions> <exclusions>
<!-- No need to have the minifier included for development
mode on-the-fly compilation -->
<exclusion>
<groupId>com.yahoo.platform.yui</groupId>
<artifactId>yuicompressor</artifactId>
</exclusion>
</exclusions>
<!-- No need to have the minifier included for development
mode on-the-fly compilation -->
<exclusion>
<groupId>com.yahoo.platform.yui</groupId>
<artifactId>yuicompressor</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.carrotsearch</groupId> <groupId>com.carrotsearch</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.12</version>
<exclusions> <exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>1.9.5</version> <version>1.9.5</version>
<exclusions> <exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>


<profiles> <profiles>
<profile> <profile>
<!-- Profile is triggered unless apiDiff property is defined:
always except "apicmp" profile which is disjoint with this profile
!-->
<!-- Default build profile that runs all modules. -->
<id>default</id> <id>default</id>
<activation> <activation>
<property>
<name>!apiDiff</name>
</property>
<activeByDefault>true</activeByDefault>
</activation> </activation>
<modules> <modules>
<module>buildhelpers</module> <module>buildhelpers</module>
<module>compatibility-shared</module> <module>compatibility-shared</module>
<module>compatibility-themes</module> <module>compatibility-themes</module>
<module>testbench-api</module> <module>testbench-api</module>
<!-- Nexus staging bug needs the last module to be deployed. -->
<module>bom</module> <module>bom</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<!-- Profile for running integration tests. Vaadin version to
be tested can be defined with property vaadin.version -->
<id>slowtest</id> <id>slowtest</id>
<modules> <modules>
<module>test</module> <module>test</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<!-- This profile builds the assembled parts of the Framework
for website release. Should be run after running the release profile -->
<id>release-assemblies</id>
<modules>
<module>liferay</module>
<module>all</module>
</modules>
</profile>
<profile>
<!-- Release build only builds artifacts that are deployed or
needed by them -->
<id>release</id> <id>release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties> <properties>
<vaadin.plugin.version>${project.version}</vaadin.plugin.version> <vaadin.plugin.version>${project.version}</vaadin.plugin.version>
</properties> </properties>
<modules>
<module>buildhelpers</module>
<module>shared</module>
<module>push</module>
<module>server</module>
<module>client</module>
<module>client-compiler</module>
<module>client-compiled</module>
<module>themes</module>
<module>compatibility-server</module>
<module>compatibility-client</module>
<module>compatibility-client-compiled</module>
<module>compatibility-shared</module>
<module>compatibility-themes</module>
<module>testbench-api</module>
<!-- Nexus staging bug needs the last module to be deployed. -->
<module>bom</module>
</modules>

<build> <build>
<plugins> <plugins>
<plugin> <plugin>
</build> </build>
</profile> </profile>
<profile> <profile>
<!-- Profile is triggered if apiDiff property is defined:
this profile is disjoint with default profile.
It allows to prevent running build for all available modules
but restricts a number of modules to specified here only
(which allows to avoid long time compilation for projects
that are not needed since japicmp works with compiled classes).
!-->
<!-- This profile is disjoint with default profile. It allows
to prevent running build for all available modules but restricts a number
of modules to specified here only (which allows to avoid long time compilation
for projects that are not needed since japicmp works with compiled classes).
! -->
<id>apicmp</id> <id>apicmp</id>
<activation>
<property>
<name>apiDiff</name>
</property>
</activation>
<modules> <modules>
<module>server</module> <module>server</module>
<module>push</module> <module>push</module>
</build> </build>
</profile> </profile>
<profile> <profile>
<!-- Testing profile for measurement tests. Use along with default
profile -->
<id>measurements</id> <id>measurements</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties> <properties>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>

+ 18
- 27
uitest/pom.xml 파일 보기

<skip>${skip.uitest.deployment}</skip> <skip>${skip.uitest.deployment}</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<configuration> <configuration>
<skip>${skip.uitest.failsafe}</skip> <skip>${skip.uitest.failsafe}</skip>
<includes>
<include>**/AllTB3Tests.java</include>
</includes>
<systemPropertyVariables> <systemPropertyVariables>
<!-- Static path for screenshots pointing to submodule --> <!-- Static path for screenshots pointing to submodule -->
<com.vaadin.testbench.screenshot.directory>${project.parent.basedir}/tests/screenshots</com.vaadin.testbench.screenshot.directory> <com.vaadin.testbench.screenshot.directory>${project.parent.basedir}/tests/screenshots</com.vaadin.testbench.screenshot.directory>
<categories.include>${categories.include}</categories.include> <categories.include>${categories.include}</categories.include>
<categories.exclude>${categories.exclude}</categories.exclude> <categories.exclude>${categories.exclude}</categories.exclude>
<useLocalWebDriver>${useLocalWebDriver}</useLocalWebDriver> <useLocalWebDriver>${useLocalWebDriver}</useLocalWebDriver>
<!-- PhantomJS binary downloaded by phantomjs-maven-plugin -->
<!-- <phantomjs.binary.path>${phantomjs.binary}</phantomjs.binary.path> -->
</systemPropertyVariables> </systemPropertyVariables>
<includes>
<include>**/AllTB3Tests.java</include>
</includes>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<groups>com.vaadin.testcategory.MeasurementTest</groups> <groups>com.vaadin.testcategory.MeasurementTest</groups>
<systemPropertyVariables>
<phantomjs.binary.path>${phantomjs.binary}</phantomjs.binary.path>
</systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

+ 0
- 5
uitest/src/test/java/com/vaadin/tests/performance/MemoryIT.java 파일 보기

protected void closeApplication() { protected void closeApplication() {
} }


@Override
protected String getScreenshotDirectory() {
return ".";
}

private long getGridSize(String path, int itemsCount) { private long getGridSize(String path, int itemsCount) {
// Repeat until we get consecutive results within 0.1% of each other // Repeat until we get consecutive results within 0.1% of each other
double lastResult = 0; double lastResult = 0;

Loading…
취소
저장