Skip to content

Commit

Permalink
chore: remove native-maven-plugin 0.9.14 workaround (googleapis#1025)
Browse files Browse the repository at this point in the history
* chore: remove native-maven-plugin workaround
  • Loading branch information
mpeddada1 committed Nov 4, 2022
1 parent 6d06f5b commit 5ed402e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 63 deletions.
4 changes: 2 additions & 2 deletions .kokoro/build.sh
Expand Up @@ -71,12 +71,12 @@ integration)
;;
graalvm)
# Run Unit and Integration Tests with Native Image.
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative-0.9.14 -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
RETURN_CODE=$?
;;
graalvm17)
# Run Unit and Integration Tests with Native Image.
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative-0.9.14 -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
RETURN_CODE=$?
;;
samples)
Expand Down
61 changes: 0 additions & 61 deletions pom.xml
Expand Up @@ -350,67 +350,6 @@
</build>

<profiles>
<profile>
<id>native-0.9.14</id>

<dependencies>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.9.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>junit-platform-native</artifactId>
<version>0.9.16</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Must use older version of surefire plugin for native-image testing. -->
<version>2.22.2</version>
<configuration>
<!-- Include all tests during native image testing. -->
<excludes combine.self="override" />
<includes>
<include>**/IT*.java</include>
<!-- Enable unit tests in generated libraries for native image testing. -->
<include>**/*ClientTest.java</include>
</includes>
</configuration>
</plugin>

<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.9.16</version>
<extensions>true</extensions>
<executions>
<execution>
<id>test-native</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
<configuration>
<buildArgs>
<buildArg>--no-fallback</buildArg>
</buildArgs>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>shade</id>
Expand Down

0 comments on commit 5ed402e

Please sign in to comment.