Revert to java 6

.github/workflows/pipeline.yml

@@ -10,21 +10,46 @@ on:
     branches: [ master ]
 
 jobs:
+  # old-school build and jar method. No tests run or compiled.
+  build-1_6: 
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # build for java 1.6, however don't run any tests
+        java: [ 1.6 ]
+    name: Java ${{ matrix.java }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Compile Java ${{ matrix.java }}
+        run: |
+          mkdir -p target/classes
+          javac -d target/classes/ src/main/java/org/json/*.java
+      - name: Create java ${{ matrix.java }} JAR
+        run: |
+          jar cvf target/org.json.jar -C target/classes .
+      - name: Upload Java ${{ matrix.java }} JAR
+        uses: actions/upload-artifact@v1
+        with:
+          name: Java ${{ matrix.java }} JAR
+          path: target/org.json.jar
+
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         # build against supported Java LTS versions:
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11 ]
     name: Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - name: Setup java
+        uses: actions/setup-java@v1
         with:
-          distribution: 'temurin'
           java-version: ${{ matrix.java }}
-          cache: 'maven'
       - name: Compile Java ${{ matrix.java }}
         run: mvn clean compile -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true
       - name: Run Tests ${{ matrix.java }}

README.md

@@ -62,7 +62,7 @@ javac -cp .:json-java.jar Test.java (Unix Systems)
 *Test file contents*
 
 ````
-import org.json.JSONObject;
+import org.rookout.json.JSONObject;
 public class Test {
     public static void main(String args[]){
        JSONObject jo = new JSONObject("{ \"abc\" : \"def\" }");

build.gradle

@@ -22,17 +22,17 @@ repositories {
 dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.jayway.jsonpath:json-path:2.1.0'
-    testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
 }
 
 subprojects {
     tasks.withType(Javadoc).all { enabled = false }
 }
 
 group = 'org.json'
-version = 'v20230618-SNAPSHOT'
+version = 'v20211205-SNAPSHOT'
 description = 'JSON in Java'
-sourceCompatibility = '1.8'
+sourceCompatibility = '1.7'
 
 configurations.all {
 }

pom.xml

@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.2.0</version>
+            <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -86,7 +86,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.9</version>
+                <version>3.0.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -100,16 +100,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>2.3.2</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>2.1.2</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -122,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>2.7</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -138,7 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
+                <version>1.5</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -193,7 +193,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.2.0</version>
             </plugin>
         </plugins>
     </build>

src/main/java/org/json/CDL.java → src/main/java/org/rookout/json/CDL.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/Cookie.java → src/main/java/org/rookout/json/Cookie.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 import java.util.Locale;
 

src/main/java/org/json/CookieList.java → src/main/java/org/rookout/json/CookieList.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/HTTP.java → src/main/java/org/rookout/json/HTTP.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/HTTPTokener.java → src/main/java/org/rookout/json/HTTPTokener.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONArray.java → src/main/java/org/rookout/json/JSONArray.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONException.java → src/main/java/org/rookout/json/JSONException.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONML.java → src/main/java/org/rookout/json/JSONML.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONMLParserConfiguration.java → src/main/java/org/rookout/json/JSONMLParserConfiguration.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 /*
 Public Domain.
 */

src/main/java/org/json/JSONObject.java → src/main/java/org/rookout/json/JSONObject.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONPointer.java → src/main/java/org/rookout/json/JSONPointer.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 import static java.lang.String.format;
 

src/main/java/org/json/JSONPointerException.java → src/main/java/org/rookout/json/JSONPointerException.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONPropertyIgnore.java → src/main/java/org/rookout/json/JSONPropertyIgnore.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONPropertyName.java → src/main/java/org/rookout/json/JSONPropertyName.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONString.java → src/main/java/org/rookout/json/JSONString.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONStringer.java → src/main/java/org/rookout/json/JSONStringer.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/JSONTokener.java → src/main/java/org/rookout/json/JSONTokener.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 import java.io.*;
 import java.nio.charset.Charset;

src/main/java/org/json/JSONWriter.java → src/main/java/org/rookout/json/JSONWriter.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 import java.io.IOException;
 import java.util.Collection;

src/main/java/org/json/ParserConfiguration.java → src/main/java/org/rookout/json/ParserConfiguration.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 /*
 Public Domain.
 */

src/main/java/org/json/Property.java → src/main/java/org/rookout/json/Property.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/XML.java → src/main/java/org/rookout/json/XML.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/XMLParserConfiguration.java → src/main/java/org/rookout/json/XMLParserConfiguration.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 /*
 Public Domain.
 */

src/main/java/org/json/XMLTokener.java → src/main/java/org/rookout/json/XMLTokener.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 
 /*
 Public Domain.

src/main/java/org/json/XMLXsiTypeConverter.java → src/main/java/org/rookout/json/XMLXsiTypeConverter.java

@@ -1,4 +1,4 @@
-package org.json;
+package org.rookout.json;
 /*
 Public Domain.
 */

src/test/java/org/json/junit/CDLTest.java

@@ -7,10 +7,10 @@
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONArray;
-import org.json.CDL;
+import org.rookout.json.JSONException;
+import org.rookout.json.JSONObject;
+import org.rookout.json.JSONArray;
+import org.rookout.json.CDL;
 
 /**
  * Tests for CDL.java.

src/test/java/org/json/junit/CookieListTest.java

@@ -8,10 +8,12 @@
 
 import java.util.*;
 
-import org.json.*;
 import org.junit.Test;
 
 import com.jayway.jsonpath.*;
+import org.rookout.json.CookieList;
+import org.rookout.json.JSONException;
+import org.rookout.json.JSONObject;
 
 /**
  * HTTP cookie specification RFC6265: http://tools.ietf.org/html/rfc6265

src/test/java/org/json/junit/CookieTest.java

@@ -6,8 +6,10 @@
 
 import static org.junit.Assert.*;
 
-import org.json.*;
 import org.junit.Test;
+import org.rookout.json.Cookie;
+import org.rookout.json.JSONException;
+import org.rookout.json.JSONObject;
 
 
 /**

src/test/java/org/json/junit/EnumTest.java

@@ -12,8 +12,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.rookout.json.JSONArray;
+import org.rookout.json.JSONObject;
 import org.json.junit.data.MyEnum;
 import org.json.junit.data.MyEnumClass;
 import org.json.junit.data.MyEnumField;

src/test/java/org/json/junit/HTTPTest.java

@@ -6,8 +6,10 @@
 
 import static org.junit.Assert.*;
 
-import org.json.*;
 import org.junit.Test;
+import org.rookout.json.HTTP;
+import org.rookout.json.JSONException;
+import org.rookout.json.JSONObject;
 
 
 /**

src/test/java/org/json/junit/JSONArrayTest.java

@@ -25,12 +25,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONPointerException;
-import org.json.JSONString;
-import org.json.JSONTokener;
+import org.rookout.json.JSONArray;
+import org.rookout.json.JSONException;
+import org.rookout.json.JSONObject;
+import org.rookout.json.JSONPointerException;
+import org.rookout.json.JSONString;
+import org.rookout.json.JSONTokener;
 import org.json.junit.data.MyJsonString;
 import org.junit.Test;
 
@@ -1377,7 +1377,7 @@ public void jsonArrayClearMethodTest() {
 		jsonArray.put(new JSONArray());
 		jsonArray.clear(); //Clears the JSONArray
 		assertTrue("expected jsonArray.length() == 0", jsonArray.length() == 0); //Check if its length is 0
-		jsonArray.getInt(0); //Should throws org.json.JSONException: JSONArray[0] not found
+		jsonArray.getInt(0); //Should throws org.rookout.json.JSONException: JSONArray[0] not found
         Util.checkJSONArrayMaps(jsonArray);
 	}