lovejavaee · pull · Jan 5, 2021 · Jan 6, 2021 · Jan 6, 2021 · Jan 10, 2021
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,5 @@
+Hi! This project does not accept pull requests.
+
+Please see the guidelines for contribution on how to file issues or provide patches:
+
+https://github.com/clojure/clojure/blob/master/CONTRIBUTING.md
diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
@@ -0,0 +1,75 @@
+name: Build API Docs
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      commit:
+        description: 'Commit changes to gh-pages branch'
+        type: boolean
+        required: true
+        default: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Java
+      uses: actions/setup-java@v4
+      with:
+        java-version: 8
+        distribution: 'temurin'
+
+    - name: Set up Clojure
+      uses: DeLaGuardo/setup-clojure@13.1
+      with:
+          cli: 'latest'
+
+    - name: Cache clojure dependencies
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.m2/repository
+          ~/.gitlibs
+        key: cljdeps-${{ hashFiles('deps.edn') }}
+        restore-keys: cljdeps-
+
+    - name: Clone clojure api doc repo
+      uses: actions/checkout@v4
+      with:
+        repository: clojure/clojure-api-doc
+        path: clojure-api-doc
+        fetch-depth: 0
+
+    - name: Clone clojure source code repo into clojure-api-doc
+      uses: actions/checkout@v4
+      with:
+        path: clojure-api-doc/repo
+        fetch-depth: 0
+
+    - name: Clone clojure gh-pages branch into clojure-api-doc
+      uses: actions/checkout@v4
+      with:
+        repository: clojure/clojure
+        path: clojure-api-doc/repo-docs
+        ref: 'gh-pages'
+        fetch-depth: 0
+
+    - name: Install markdown
+      run: sudo apt install markdown
+
+    - name: Call clojure-api-doc build.sh
+      run:  bash ${GITHUB_WORKSPACE}/clojure-api-doc/build.sh
+
+    - name: Commit
+      if: ${{inputs.commit}}
+      run: |
+        git config --global user.name clojure-build
+        git config --global user.email "clojure-build@users.noreply.github.com"
+        cd clojure-api-doc/repo-docs
+        git add -u -v
+        git commit -m "Autodoc commit"
+        git push origin gh-pages
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,22 @@
+name: Release on demand
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: "Version to release"
+        required: true
+      snapshotVersion:
+        description: "Snapshot version after release"
+        required: true
+
+jobs:
+  call-release:
+    uses: clojure/build.ci/.github/workflows/release.yml@master
+    with:
+      releaseVersion: ${{ github.event.inputs.releaseVersion }}
+      snapshotVersion: ${{ github.event.inputs.snapshotVersion }}
+    secrets: inherit
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -0,0 +1,11 @@
+name: Snapshot on demand
+
+permissions:
+  contents: read
+
+on: [workflow_dispatch]
+
+jobs:
+  call-snapshot:
+    uses: clojure/build.ci/.github/workflows/snapshot.yml@master
+    secrets: inherit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,29 @@
+name: Test
+
+permissions:
+  contents: read
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest] # macOS-latest, windows-latest]
+        java-version: ["8", "11", "17", "21", "25"]
+        distribution: ["temurin", "corretto"]
+        profile: ["test-direct", "test-no-direct"]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Java
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ matrix.java-version }}
+        distribution: ${{ matrix.distribution }}
+        cache: 'maven'
+    - name: Build with Maven
+      run: mvn -ntp -B -P${{ matrix.profile }} clean test
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ nbproject/private/
 maven-classpath
 maven-classpath.properties
 .idea/
+*.iml
diff --git a/.idea/libraries/Maven__org_clojure_data_generators_0_1_2.xml b/.idea/libraries/Maven__org_clojure_data_generators_0_1_2.xml
diff --git a/.idea/libraries/Maven__org_clojure_test_generative_0_4_0.xml b/.idea/libraries/Maven__org_clojure_test_generative_0_4_0.xml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1 +1,42 @@
-If you'd like to submit a patch, please follow the [contributing guidelines](http://clojure.org/contributing).
+Hi! Thanks for your interest in Clojure!
+
+## I want to ask a question
+
+If you have a question about Clojure, please use the official Ask Clojure forum at https://ask.clojure.org. This forum is monitored by the Clojure maintainers.
+
+## I want to discuss an idea
+
+There are many interactive Clojure forums for discussion and you can find a list at [Clojure Discussion](https://clojure.org/community/resources#_clojure_discussion).
+
+## I want to file a bug / suggest an enhancement
+
+Please file it as a question on https://ask.clojure.org with the tag "problem" (possible bugs) or "request" (enhancements).
+
+## I want to provide a patch / PR
+
+If you would like to contribute patches, the Clojure dev process is described in detail at https://clojure.org/dev.
+
+In short, this process requires:
+
+- [Signing the Contributor Agreement](https://clojure.org/dev/contributor_agreement)
+- [Requesting jira access](https://clojure.atlassian.net/servicedesk/customer/portal/1)
+
+This project does not accept pull requests.
+
+## I am looking for official documentation
+
+You can find official documentation on the Clojure web site:
+
+* Reference docs https://clojure.org/reference
+* Tutorials and guides: https://clojure.org/guides
+* API: https://clojure.org/api/api
+
+## What release should I use?
+
+Find the current release info here:
+
+https://clojure.org/releases/downloads
+
+A list of all releases can be found here:
+
+https://clojure.org/releases/downloads_older
diff --git a/build.xml b/build.xml
@@ -28,6 +28,8 @@
   <property name="clojure_jar" location="clojure-${clojure.version.label}.jar"/>
   <property name="clojure_noversion_jar" location="clojure.jar"/>
 
+  <property name="directlinking" value="true"/>
+
   <target name="init" depends="clean">
     <tstamp/>
     <mkdir dir="${build}"/>
@@ -39,7 +41,7 @@
           description="Compile Java sources.">
     <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
            includeAntRuntime="false"
-           debug="true" source="1.6" target="1.6"/>
+           debug="true" source="1.8" target="1.8"/>
   </target>
 
   <target name="compile-clojure"
@@ -51,10 +53,12 @@
       <sysproperty key="clojure.compile.path" value="${build}"/>
          <!--<sysproperty key="clojure.compiler.elide-meta" value="[:doc :file :line :added]"/>-->
          <!--<sysproperty key="clojure.compiler.disable-locals-clearing" value="true"/>-->
-      <!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
+       <!--<sysproperty key="clojure.compile.warn-on-reflection" value="true"/>-->
+        <sysproperty key="clojure.compiler.direct-linking" value="true"/>
       <sysproperty key="java.awt.headless" value="true"/>
       <arg value="clojure.core"/>
       <arg value="clojure.core.protocols"/>
+      <arg value="clojure.core.server"/>
       <arg value="clojure.main"/>
       <arg value="clojure.set"/>
       <arg value="clojure.edn"/>
@@ -73,10 +77,20 @@
       <arg value="clojure.java.browse"/>
       <arg value="clojure.java.javadoc"/>
       <arg value="clojure.java.shell"/>
+      <arg value="clojure.java.process"/>
       <arg value="clojure.java.browse-ui"/>
+      <arg value="clojure.java.basis.impl"/>
+      <arg value="clojure.java.basis"/>
       <arg value="clojure.string"/>
       <arg value="clojure.data"/>
       <arg value="clojure.reflect"/>
+      <arg value="clojure.datafy"/>
+      <arg value="clojure.instant"/>
+      <arg value="clojure.uuid"/>
+      <arg value="clojure.core.reducers"/>
+      <arg value="clojure.math"/>
+      <arg value="clojure.tools.deps.interop"/>
+      <arg value="clojure.repl.deps"/>
     </java>
   </target>
 
@@ -85,16 +99,20 @@
           unless="maven.test.skip">
     <mkdir dir="${test-classes}"/>
     <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes"
-           debug="true" source="1.6" target="1.6" includeantruntime="no"/>
+           debug="true" source="1.8" target="1.8" includeantruntime="no"/>
+    <echo>Direct linking = ${directlinking}</echo>
     <java classname="clojure.lang.Compile"
-          classpath="${test-classes}:${test}:${build}:${cljsrc}"
+          classpath="${test-classes}:${test}:${build}:${cljsrc}:${maven.test.classpath}"
           failonerror="true"
 	  fork="true">
       <sysproperty key="clojure.compile.path" value="${test-classes}"/>
         <!--<sysproperty key="clojure.compiler.elide-meta" value="[:doc]"/>-->
         <!--<sysproperty key="clojure.compiler.disable-locals-clearing" value="true"/>-->
+      <sysproperty key="clojure.compiler.direct-linking" value="${directlinking}"/>
       <arg value="clojure.test-clojure.protocols.examples"/>
+      <arg value="clojure.test-clojure.proxy.examples"/>
       <arg value="clojure.test-clojure.genclass.examples"/>
+      <arg value="clojure.test-clojure.compilation.load-ns"/>
       <arg value="clojure.test-clojure.annotations"/>
     </java>
   </target>
@@ -104,6 +122,9 @@
           depends="compile-tests"
           unless="maven.test.skip">
     <java classname="clojure.main" failonerror="true" fork="true">
+      <sysproperty key="clojure.test-clojure.exclude-namespaces"
+                   value="#{clojure.test-clojure.compilation.load-ns clojure.test-clojure.ns-libs-load-later}"/>
+      <sysproperty key="clojure.compiler.direct-linking" value="${directlinking}"/>
       <classpath>
         <pathelement path="${maven.test.classpath}"/>
         <path location="${test-classes}"/>
@@ -120,6 +141,7 @@
           depends="compile-tests"
           unless="maven.test.skip">
     <java classname="clojure.main" failonerror="true" fork="true">
+      <sysproperty key="clojure.compiler.direct-linking" value="${directlinking}"/>
       <classpath>
         <pathelement path="${maven.test.classpath}"/>
         <path location="${test-classes}"/>
@@ -183,4 +205,11 @@
     </delete>
   </target>
 
+  <target name="local">
+    <exec executable="mvn">
+      <arg value="-Plocal"/>
+      <arg value="-Dmaven.test.skip=true"/>
+      <arg value="package"/>
+    </exec>
+  </target>
 </project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ nbproject/private/ @@
     maven-classpath
     maven-classpath.properties
     .idea/
+    *.iml