Skip to content

Commit

Permalink
Upgrade to batch-tck parent v2.1.1; add windows script extension (#1081)
Browse files Browse the repository at this point in the history 
Signed-off-by: Scott Kurz <skurz@us.ibm.com>
  • Loading branch information
@scottkurz
scottkurz committed Jun 27, 2022
1 parent a799622 commit f4b70a1
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 46 deletions.
Binary file removed glassfish-runner/batch-tck/apitests/hack-around-batch-tck-parent.jar
View file
Binary file not shown.
57 changes: 27 additions & 30 deletions glassfish-runner/batch-tck/apitests/pom.xml
View file
Expand Up @@ -24,34 +24,34 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<parent>
<groupId>org.glassfish</groupId>
<artifactId>glassfish.batch-tck</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
</parent>


<artifactId>glassfish.batch-tck.apitests</artifactId>
<packaging>pom</packaging>
<name>Jakarta Batch API TCK Runner for Glassfish</name>

<profiles>
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<script.ext>.bat</script.ext>
</properties>
</profile>
</profiles>

<properties>
<derby.basedir>${project.build.directory}/derby</derby.basedir>
<script.ext/>
</properties>

<dependencies>

<!-- The parent project brings a dependency on `jakarta.batch.reporting` with group `${project.groupId}`, which isn't derived from the group of the parent, but actually from the group of the current project, which is `org.glassfish`. Such an artifact doesn't exist and it has to be ignored. There's no simple way to exclude a dependency defined in a parent POM except copying everything from the parent POM to this project. So, until this is fixed in the parent POM, we'll provide this dependency locally as an empty JAR file.
-->

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.batch.reporting</artifactId>
<version>10000</version>
<scope>system</scope>
<systemPath>${project.basedir}/hack-around-batch-tck-parent.jar</systemPath>
</dependency>


<!-- Common Batch TCK dependencies -->

<dependency>
<groupId>jakarta.batch</groupId>
<artifactId>com.ibm.jbatch.tck</artifactId>
Expand All @@ -69,30 +69,25 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>1.7.0.Alpha9</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<scope>test</scope>
<version>1.7.0.Alpha9</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<scope>test</scope>
<version>1.7.0.Alpha9</version>
</dependency>
<dependency>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch.reporting</artifactId>
<scope>test</scope>
<version>${jakarta.batch.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.30</version>
</dependency>

<!-- GlassFish Batch TCK dependencies -->
Expand Down Expand Up @@ -216,7 +211,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
Expand All @@ -229,7 +224,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<workingDirectory>${derby.basedir}</workingDirectory>
<arguments>
<argument>stop-database</argument>
Expand All @@ -247,7 +242,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<arguments>
<argument>start-domain</argument>
</arguments>
Expand All @@ -260,7 +255,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<workingDirectory>${derby.basedir}</workingDirectory>
<arguments>
<argument>start-database</argument>
Expand All @@ -274,7 +269,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/javadb/bin/ij</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/javadb/bin/ij${script.ext}</executable>
<workingDirectory>${derby.basedir}</workingDirectory>
<arguments>
<argument>${basedir}/src/test/resources/derby.ddl.jbatch-tck.sql</argument>
Expand All @@ -288,7 +283,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<arguments>
<argument>create-jdbc-connection-pool</argument>
<argument>--datasourceClassname=org.apache.derby.jdbc.ClientDataSource40</argument>
Expand All @@ -306,7 +301,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<arguments>
<argument>create-jdbc-resource</argument>
<argument>--poolName=batchtck</argument>
Expand All @@ -321,7 +316,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
Expand All @@ -334,7 +329,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin${script.ext}</executable>
<workingDirectory>${derby.basedir}</workingDirectory>
<arguments>
<argument>stop-database</argument>
Expand All @@ -355,5 +350,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
</configuration>
</plugin>
</plugins>


</build>
</project>
Binary file removed glassfish-runner/batch-tck/hack-around-batch-tck-parent.jar
View file
Binary file not shown.
17 changes: 1 addition & 16 deletions glassfish-runner/batch-tck/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<parent>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch.arquillian.exec-parent</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
</parent>

<groupId>org.glassfish</groupId>
Expand All @@ -44,20 +44,5 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
<module>apitests</module>
</modules>

<dependencies>

<!-- The parent project brings a dependency on `jakarta.batch.reporting` with group `${project.groupId}`, which isn't derived from the group of the parent, but actually from the group of the current project, which is `org.glassfish`. Such an artifact doesn't exist and it has to be ignored. There's no simple way to exclude a dependency defined in a parent POM except copying everything from the parent POM to this project. So, until this is fixed in the parent POM, we'll provide this dependency locally as an empty JAR file.
-->

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.batch.reporting</artifactId>
<version>10000</version>
<scope>system</scope>
<systemPath>${project.basedir}/hack-around-batch-tck-parent.jar</systemPath>
</dependency>


</dependencies>

</project>

0 comments on commit f4b70a1

Please sign in to comment.