Skip to content

Commit

Permalink
restoring full java 8 buildability until 1 jan 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
larrydiamond committed Aug 13, 2023
1 parent af9940e commit bec6cbe
Show file tree
Hide file tree
Showing 16 changed files with 157 additions and 14 deletions.
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.9-SNAPSHOT'
id 'org.springframework.boot' version '2.7.9-SNAPSHOT' // cant go beyond this until Java 17
id 'io.spring.dependency-management' version '1.1.0'
id("org.sonarqube") version "4.3.0.3225"
id("org.sonarqube") version "3.5.0.2730" // cant go beyond this until Java 11
id 'jacoco'
id "org.owasp.dependencycheck" version "8.3.1"
}
Expand Down Expand Up @@ -39,7 +39,7 @@ dependencies {
implementation("com.google.guava:guava:32.1.2-jre")

testImplementation 'com.tngtech.archunit:archunit-junit5:1.1.0'
testImplementation 'org.mockito:mockito-junit-jupiter:5.4.0'
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.11.0' // cant go beyond this until Java 11
}

tasks.named('test') {
Expand Down Expand Up @@ -77,3 +77,6 @@ jacocoTestReport {
}
}

// Note, on 1 January 2024 this project will abandon support for Java 8, as SonarQube itself requires 17 on the server and 11 on the client and Spring now requires Java 17.
// Java 8 market share is below 33% as this is written and will likely be below 25% by 2024.

12 changes: 11 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/AssembledSearchHistory.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
package com.ldiamond.sqgraph;
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.util.List;

Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/Config.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.io.Serializable;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/DashboardCellRenderer.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.awt.Color;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/ldiamond/sqgraph/DashboardOutput.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.awt.image.BufferedImage;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/GraphOutput.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.util.ArrayList;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/MetricsResults.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import lombok.Data;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/ldiamond/sqgraph/PDFOutput.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.awt.image.BufferedImage;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/SearchHistory.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.util.Date;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/SqgraphApplication.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.io.File;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/SyntheticMetric.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import java.util.List;
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ldiamond/sqgraph/ValidationResult.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import lombok.Data;
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/com/ldiamond/sqgraph/ArchitectureUnitTests.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import com.tngtech.archunit.junit.AnalyzeClasses;
Expand Down
11 changes: 10 additions & 1 deletion src/test/java/com/ldiamond/sqgraph/DashboardOutputTests.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/com/ldiamond/sqgraph/GraphOutputTests.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
11 changes: 10 additions & 1 deletion src/test/java/com/ldiamond/sqgraph/SqgraphApplicationTests.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
// Copyright Larry Diamond 2023 All Rights Reserved
/**
* Copyright (C) 2023-present Larry Diamond, All Rights Reserved.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* license linked below for more details.
*
* For license terms, see <https://github.com/larrydiamond/sqgraph/blob/main/LICENSE.md>.
**/
package com.ldiamond.sqgraph;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down

0 comments on commit bec6cbe

Please sign in to comment.