Skip to content

Commit

Permalink
#22874 Updated version in pom files to 6.0.0-SNAPSHOT
Browse files Browse the repository at this point in the history
* Updated properties for glassfish-version.properties to 6 and 0.
* Updated copyright to 2020 in files touched.
* Updated Jenkinsfile and readme

Signed-off-by: arjantijms arjan.tijms@gmail.com
  • Loading branch information
arjantijms committed Feb 18, 2020
1 parent 66e33e4 commit 3cfb3a3
Show file tree
Hide file tree
Showing 490 changed files with 1,046 additions and 1,046 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Expand Up @@ -200,7 +200,7 @@ spec:
}
}
environment {
S1AS_HOME = "${WORKSPACE}/glassfish5/glassfish"
S1AS_HOME = "${WORKSPACE}/glassfish6/glassfish"
APS_HOME = "${WORKSPACE}/appserver/tests/appserv-tests"
TEST_RUN_LOG = "${WORKSPACE}/tests-run.log"
GF_INTERNAL_ENV = credentials('gf-internal-env')
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -29,16 +29,16 @@ Testing
--------
Running GlassFish QuickLook tests:

`mvn -f appserver/tests/quicklook/pom.xml test -Dglassfish.home=appserver/distributions/glassfish/target/stage/glassfish5/glassfish`
`mvn -f appserver/tests/quicklook/pom.xml test -Dglassfish.home=appserver/distributions/glassfish/target/stage/glassfish6/glassfish`

For more details, see [QuickLook_Test_Instructions](https://github.com/eclipse-ee4j/glassfish/blob/master/appserver/tests/quicklook/QuickLook_Test_Instructions.html)

Starting GlassFish
------------------

`glassfish5/bin/asadmin start-domain`
`glassfish6/bin/asadmin start-domain`

Stopping GlassFish
------------------

`glassfish5/bin/asadmin stop-domain`
`glassfish6/bin/asadmin stop-domain`
4 changes: 2 additions & 2 deletions appserver/admin/admin-core/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>admin</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/backup/pom.xml
@@ -1,6 +1,6 @@
<!--
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -20,7 +20,7 @@
<parent>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>admin</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>backup</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/cli-optional/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>admin</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>cli-optional</artifactId>
<packaging>glassfish-jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/cli/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>admin</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>appserver-cli</artifactId>
<packaging>glassfish-jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.glassfish.main.admin</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/template/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>admin</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>appserver-domain</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/cluster/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-cluster-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/common/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/community-theme/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-community-branding-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/concurrent/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-concurrent-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/corba/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-corba-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/core/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/dataprovider/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions appserver/admingui/devtests/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -24,12 +24,12 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>console-devtests</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Admin Console Dev Tests</name>
<description>This module contains the dev tests for the admin console</description>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/dist-fragment/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>dist-fragment</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/ejb-lite/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-ejb-lite-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/ejb/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-ejb-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/full/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-common-full-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/gf-admingui-connector/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main</groupId>
<artifactId>glassfish-parent</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.glassfish.main.admingui.connector</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/admingui/jca/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.main.admingui</groupId>
<artifactId>admingui</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>console-jca-plugin</artifactId>
Expand Down

0 comments on commit 3cfb3a3

Please sign in to comment.