Nosto · renat-nosto · Jun 21, 2022 · Jun 21, 2022 · Jul 14, 2023 · Mar 11, 2024
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -7,6 +7,9 @@ on:
     branches:
       - master # Check branch after merge
 
+env:
+  DEFAULT_JAVA_VERSION: '21'
+
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
   group: ci-${{ github.ref }}
@@ -20,17 +23,27 @@ jobs:
       matrix:
         jdk: [ 17, 21 ]
         os: [ubuntu-latest, windows-latest]
+        include:
+          - target: 17
+            jdk: 17
+          - target: 21
+            jdk: 21
+        exclude: # only build specific os on java 17
+          - os: windows-latest
+            jdk: 17
+          - os: windows-latest
+            jdk: 24
 
-    name: Check / Tests -> JDK-${{ matrix.jdk }}/${{ matrix.os }}
+    name: Build / Tests -> JDK-${{ matrix.jdk }}/ Target java-${{ matrix.target }} / ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
       - name: Set up python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           architecture: 'x64'
@@ -39,14 +52,14 @@ jobs:
       - run: pip install -r python/requirements.txt
 
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'adopt'
 
       - name: Build with Ant
         working-directory: ./framework
-        run: ant test
+        run: ant test -Dbuild-release=${{ matrix.target }}
 
   build:
     needs:
@@ -55,31 +68,69 @@ jobs:
     name: BUILD ${{ github.sha }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
       - name: Set up python 3
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
           architecture: 'x64'
 
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - name: Set up JDK ${{ env.DEFAULT_JAVA_VERSION }}
+        uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: ${{ env.DEFAULT_JAVA_VERSION }}
           distribution: 'adopt'
 
       - name: Build with Ant
         working-directory: ./framework
-        run: ant artifact
+        run: ant artifact -Dbuild-release=${{ env.DEFAULT_JAVA_VERSION }}
 
-      - name: ziping artifact
-        uses: actions/upload-artifact@v4
+      - name: Zipping artifact
+        uses: actions/upload-artifact@v5
         with:
           name: play-${{ github.sha }}
           if-no-files-found: error
           path: |
             ./framework/dist/*
+
+  # Specific build on mac because of issue with firephoque browser (FIXME)
+  build-on-mac:
+    runs-on: ${{ matrix.os }}
+    name: Build -> JDK-${{ matrix.jdk }}/ Target java-${{ matrix.target }} / ${{ matrix.os }}
+    strategy:
+      matrix:
+        jdk: [ 21 ]
+        os: [ macos-latest ]
+        include:
+          - target: 21
+            jdk: 21
+
+    steps:
+       - name: Checkout
+         uses: actions/checkout@v6
+         with:
+           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+           fetch-depth: 0
+
+       - name: Set up python 3
+         uses: actions/setup-python@v6
+         with:
+           python-version: '3.x'
+           architecture: 'x64'
+           cache: 'pip'
+           cache-dependency-path: '**/requirements.txt'
+       - run: pip install -r python/requirements.txt
+
+       - name: Set up JDK ${{ matrix.jdk }}
+         uses: actions/setup-java@v5
+         with:
+           java-version: ${{ matrix.jdk }}
+           distribution: 'adopt'
+
+       - name: Build with Ant
+         working-directory: ./framework
+         run: ant build -Dbuild-release=${{ matrix.target }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -8,6 +8,9 @@ on:
   schedule:
     - cron: '15 1 * * 6'
 
+env:
+  DEFAULT_JAVA_VERSION: '21'
+
 jobs:
   analyze:
     name: Analyze
@@ -39,11 +42,17 @@ jobs:
         distribution: 'adopt'
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+
+    - name: Set up JDK ${{ env.DEFAULT_JAVA_VERSION }}
+      uses: actions/setup-java@v5
+      with:
+        java-version: ${{ env.DEFAULT_JAVA_VERSION }}
+        distribution: 'adopt'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,6 +68,6 @@ jobs:
       run: ant jar
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/delete-caches.yml b/.github/workflows/delete-caches.yml
@@ -16,7 +16,7 @@ jobs:
     name: Delete unneeded caches
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: |
           gh cache list --limit 500 --order asc --sort last_accessed_at | grep 'play-published-local' > caches.txt || true
           echo "Found $(wc -l < caches.txt | xargs) published local cache entries"

diff --git a/.gitignore b/.gitignore
@@ -99,6 +99,7 @@ samples-and-tests/test-scala/tmp
 samples-and-tests/test-scala/logs
 samples-and-tests/i-am-a-developer/i-am-working-here
 samples-and-tests/i-am-a-developer/i-am-creating-jobs-here
+samples-and-tests/i-am-a-developer/i-am-testing-auto-test-here
 samples-and-tests/i-am-a-developer/i-am-testing-log-levels-here
 samples-and-tests/i-am-a-developer/i-am-testing-ssl-config-here
 samples-and-tests/just-test-cases/attachments

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Welcome to Play framework
 
 [![GitHub Discussions](https://img.shields.io/github/discussions/playframework/play1?&logo=github&color=brightgreen)](https://github.com/playframework/play1/discussions)
-[![Gitter](https://img.shields.io/gitter/room/playframework/play1)](https://gitter.im/playframework/play1)
+[![Discord](https://img.shields.io/discord/931647755942776882?logo=discord&logoColor=white)](https://discord.gg/YVRgAp2Zj4)
 [![Contributors](https://img.shields.io/github/contributors/playframework/play1)](https://github.com/playframework/play1/graphs/contributors)
 [![StackOverflow](https://img.shields.io/static/v1?label=stackoverflow&logo=stackoverflow&logoColor=fe7a16&color=brightgreen&message=playframework)](https://stackoverflow.com/tags/playframework)
 

diff --git a/documentation/manual/crud.textile b/documentation/manual/crud.textile
@@ -36,7 +36,7 @@ bc. package models;
 import play.*;
 import play.db.jpa.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 @Entity
@@ -86,7 +86,7 @@ bc. package models;
 import play.*;
 import play.db.jpa.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 import play.data.validation.*;

diff --git a/documentation/manual/dependency.textile b/documentation/manual/dependency.textile
@@ -326,7 +326,7 @@ require:
         exclude:
             - javassist -> javassist *
             - org.hibernate -> hibernate-annotations *
-            - javax.persistence -> persistence-api *
+            - jakarta.persistence -> persistence-api *
 repositories:
     - jboss:
         type: iBiblio

diff --git a/documentation/manual/emails.textile b/documentation/manual/emails.textile
@@ -37,7 +37,7 @@ Each public static method will be an e-mail sender, in a similar manner as actio
 
 bc. package notifiers;
 
-import org.apache.commons.mail.*; 
+import org.apache.commons.mail2.*;
 import play.*;
 import play.mvc.*;
 import java.util.*;

diff --git a/documentation/manual/guide2.textile b/documentation/manual/guide2.textile
@@ -21,7 +21,7 @@ We will start to code the blog engine by creating the User class. Create a new f
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 
@@ -139,7 +139,7 @@ The @Post@ class will represent blog posts. Let’s write a first implementation
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 
@@ -221,7 +221,7 @@ Creating the @Comment@ class is pretty straightforward.
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 

diff --git a/documentation/manual/guide6.textile b/documentation/manual/guide6.textile
@@ -9,7 +9,7 @@ We will add one more object to the blog model definition. The @Tag@ class itself
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 

diff --git a/documentation/manual/guide7.textile b/documentation/manual/guide7.textile
@@ -89,7 +89,7 @@ Let’s add some annotations to the @User@ class:
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 import play.data.validation.*;
@@ -117,7 +117,7 @@ Let’s do the same for the @Post@ class:
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 import play.data.validation.*;
@@ -158,7 +158,7 @@ Finally we can add validation rules to the @Comment@ and @Tag@ classes as well:
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 import play.data.validation.*;
@@ -173,7 +173,7 @@ public class Tag extends Model implements Comparable<Tag> {
 bc. package models;
 
 import java.util.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import play.db.jpa.*;
 import play.data.validation.*;

diff --git a/documentation/manual/home.textile b/documentation/manual/home.textile
@@ -189,6 +189,9 @@ h2. <a name="versionnotes">Version notes</a>
 New versions of Play include certain changes. Check older release notes for:
 
 # "About Play releases":releases/releases
+# "Play 1.11.0":releases/release1.11.x/releasenotes-1.11.0
+# "Play 1.10.0":releases/release1.10.x/releasenotes-1.10.0
+# "Play 1.9.0":releases/release1.9.x/releasenotes-1.9.0
 # "Play 1.8.0":releases/release1.8.x/releasenotes-1.8.0
 # "Play 1.7.1":releases/release1.7.x/releasenotes-1.7.1
 # "Play 1.7.0":releases/release1.7.x/releasenotes-1.7.0

diff --git a/documentation/manual/install.textile b/documentation/manual/install.textile
@@ -3,11 +3,11 @@ h1. Installation guide
 
 h2. <a name="prerequisites">Prerequisites</a>
 
-To run the Play framework, you need "Java 11 or later":http://java.sun.com. If you wish to build Play from source, you will need the "Git source control client":http://git-scm.com/ to fetch the source code and "Ant":http://ant.apache.org/ to build it.
+To run the Play framework, you need "Java 17 or later":https://adoptium.net/temurin/releases. If you wish to build Play from source, you will need the "Git source control client":http://git-scm.com/ to fetch the source code and "Ant":http://ant.apache.org/ to build it.
 
 Be sure to have Java in the current path (enter @java -version@ to check). Play will use the default Java or the one available at the @$JAVA_HOME@ path if defined.
 
-The *play* command line utility uses Python. So it should work out of the box on any UNIX system (however it requires at least Python 2.5).
+The *play* command line utility uses Python. So it should work out of the box on any UNIX system (however it requires at least Python 3.x).
 
 
 h2. <a name="install">Installation from the binary package</a>

diff --git a/documentation/manual/jpa.textile b/documentation/manual/jpa.textile
@@ -6,7 +6,7 @@ p(note). **Note** that you can still go back to the plain JPA API whenever you w
 
 h2. <a name="starting">Starting the JPA entity manager</a>
 
-Play will automatically start the Hibernate entity manager when it finds one or more classes annotated with the <code>@javax.persistence.Entity</code> annotation. However, make sure that you have correctly configured a JDBC datasource or it will fail.
+Play will automatically start the Hibernate entity manager when it finds one or more classes annotated with the <code>@jakarta.persistence.Entity</code> annotation. However, make sure that you have correctly configured a JDBC datasource or it will fail.
 
 h2. <a name="obtaining">Obtaining the JPA entity manager</a>
 

diff --git a/documentation/manual/lambdaj.textile b/documentation/manual/lambdaj.textile
@@ -19,7 +19,7 @@ bc. package models;
 import play.*;
 import play.db.jpa.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 @Entity

diff --git a/documentation/manual/model.textile b/documentation/manual/model.textile
@@ -168,7 +168,7 @@ h2. <a name="hibernate">Persist your object model with Hibernate</a>
 
 You can use Hibernate (through JPA) to persist your Java objects in the Database automatically.
 
-When you define JPA entities by adding <code>@javax.persistence.Entity</code> annotations to any Java object, Play will automatically start a JPA entity manager.
+When you define JPA entities by adding <code>@jakarta.persistence.Entity</code> annotations to any Java object, Play will automatically start a JPA entity manager.
 
 bc. @Entity
 public class Product {