Skip to content

Commit

Permalink
Merge pull request #1671 from arjantijms/remove_GLASSFISH_HOME
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjantijms
arjantijms authored Nov 22, 2024
2 parents 33bd801 + 8470c50 commit 771c262
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 108 deletions.
4 changes: 0 additions & 4 deletions glassfish-runner/assembly-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@
</includes>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
Expand All @@ -444,9 +443,6 @@
<java.io.tmpdir>/tmp</java.io.tmpdir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
6 changes: 0 additions & 6 deletions glassfish-runner/connector-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,9 +899,6 @@
<include>**/*Servlet*Test*.*</include>
<include>**/*Jsp*Test*.*</include>
</includes>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -934,9 +931,6 @@
<includes>
<include>**/*EJB*Test.*</include>
</includes>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 0 additions & 4 deletions glassfish-runner/expression-language-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@
<groups>${groups}</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
Expand All @@ -280,9 +279,6 @@
<arquillian.xml>arquillian.xml</arquillian.xml>
<variable.mapper>org.glassfish.expressly.lang.VariableMapperImpl</variable.mapper>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 0 additions & 4 deletions glassfish-runner/integration-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@
<groups>tck-javatest</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
set server-config.network-config.network-listeners.network-listener.http-listener-2.enabled=true
Expand All @@ -564,9 +563,6 @@
<java.io.tmpdir>/tmp</java.io.tmpdir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 0 additions & 4 deletions glassfish-runner/javaee-module-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,13 @@
<configuration>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
<glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true</glassfish.postBootCommands>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
<cts.harness.debug>true</cts.harness.debug>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
6 changes: 0 additions & 6 deletions glassfish-runner/jdbc-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,6 @@ CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'CTS1.CS
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -346,9 +343,6 @@ CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.database.classpath', 'CTS1.CS
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
16 changes: 0 additions & 16 deletions glassfish-runner/jsonb-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@
<groups>tck-appclient</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
Expand All @@ -406,9 +405,6 @@
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
<execution>
Expand All @@ -430,17 +426,13 @@
<groups>${javatest-testGroups}</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
<cts.harness.debug>true</cts.harness.debug>
<java.io.tmpdir>/tmp</java.io.tmpdir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
<execution>
Expand All @@ -462,7 +454,6 @@
<groups>tck-appclient</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
Expand All @@ -471,9 +462,6 @@
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
<execution>
Expand All @@ -494,17 +482,13 @@
<groups>tck-javatest</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
<cts.harness.debug>true</cts.harness.debug>
<java.io.tmpdir>/tmp</java.io.tmpdir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
16 changes: 0 additions & 16 deletions glassfish-runner/jsonp-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@
<groups>tck-appclient</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
Expand All @@ -394,9 +393,6 @@
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
<execution>
Expand All @@ -416,17 +412,13 @@
<groups>tck-javatest</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
<cts.harness.debug>true</cts.harness.debug>
<java.io.tmpdir>/tmp</java.io.tmpdir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>

Expand All @@ -447,7 +439,6 @@
<groups>tck-appclient</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
Expand All @@ -463,9 +454,6 @@
junit.platform.reporting.open.xml.enabled = true
junit.platform.reporting.output.dir = target/junit5-reports</configurationParameters>
</properties>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
<execution>
Expand All @@ -485,17 +473,13 @@
<groups>${javatest-testGroups}</groups>
<dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<junit.log.traceflag>true</junit.log.traceflag>
<harness.log.traceflag>true</harness.log.traceflag>
<cts.harness.debug>true</cts.harness.debug>
<java.io.tmpdir>/tmp</java.io.tmpdir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
6 changes: 0 additions & 6 deletions glassfish-runner/mail-platform-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,6 @@
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>appclient-arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
<execution>
Expand Down Expand Up @@ -443,9 +440,6 @@
<project.basedir>${project.basedir}</project.basedir>
<arquillian.xml>arquillian.xml</arquillian.xml>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
</environmentVariables>
</configuration>
</execution>
</executions>
Expand Down
Loading

0 comments on commit 771c262

Please sign in to comment.