Skip to content

Commit

Permalink
Revert "[#77] Update to java 17"
Browse files Browse the repository at this point in the history
This reverts commit cb3bb7e.

# Conflicts:
#	.github/workflows/build_girders.yml
  • Loading branch information
meierval committed Oct 17, 2023
1 parent 74938f1 commit 6faaeb3
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions girders-demos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
</modules>

<properties>
<jdk.version>21</jdk.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<jdk.version>17</jdk.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- version properties -->
<bootstrap.version>4.6.2</bootstrap.version>
<girders.version>6.2.3-SNAPSHOT</girders.version>
Expand Down
4 changes: 2 additions & 2 deletions girders-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<description>Girders Parent</description>

<properties>
<java.source.version>21</java.source.version>
<java.target.version>21</java.target.version>
<java.source.version>17</java.source.version>
<java.target.version>17</java.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- plugin versions -->
<checkstyle.version>10.12.1</checkstyle.version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</modules>

<properties>
<jdk.version>21</jdk.version>
<jdk.version>17</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<coverage.minimum>0.8</coverage.minimum>
Expand Down
2 changes: 1 addition & 1 deletion src/site/markdown/quickstart/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pom.xml:
<properties>
<!-- Set the major version number of Java that you want to use -->
<jdk.version>21</jdk.version>
<jdk.version>17</jdk.version>
<!-- This is the version of Girders you want to use. Ideally, this is the only version number that you have
to configure for the dependency management. -->
Expand Down

0 comments on commit 6faaeb3

Please sign in to comment.