#406 json dep

yegor256 · Nov 10, 2023 · 47227ee · 47227ee
1 parent 636d6a0
commit 47227ee
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -113,11 +113,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <version>1.18.30</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.jcabi</groupId>
-      <artifactId>jcabi-aspects</artifactId>
-      <version>0.25.1</version>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
@@ -224,6 +219,11 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
         <classifier>mock</classifier>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.jcabi</groupId>
+        <artifactId>jcabi-aspects</artifactId>
+        <version>0.25.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

diff --git a/s3auth-hosts/pom.xml b/s3auth-hosts/pom.xml
@@ -39,6 +39,11 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <packaging>jar</packaging>
   <name>s3auth-hosts</name>
   <dependencies>
+    <dependency>
+      <groupId>com.jcabi</groupId>
+      <artifactId>jcabi-aspects</artifactId>
+      <!-- version from parent -->
+    </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-immutable</artifactId>

diff --git a/s3auth-relay/pom.xml b/s3auth-relay/pom.xml
@@ -132,7 +132,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-aspects</artifactId>
-      <version>0.25.1</version>
+      <!-- version from parent -->
     </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>

diff --git a/s3auth-rest/pom.xml b/s3auth-rest/pom.xml
@@ -39,6 +39,11 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <packaging>jar</packaging>
   <name>s3auth-rest</name>
   <dependencies>
+    <dependency>
+      <groupId>com.jcabi</groupId>
+      <artifactId>jcabi-aspects</artifactId>
+      <!-- version from parent -->
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -56,14 +61,10 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <version>0.28.1</version>
     </dependency>
     <dependency>
-      <groupId>javax.json</groupId>
-      <artifactId>javax.json-api</artifactId>
-      <!-- version from parent -->
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>javax.json</artifactId>
-      <!-- version from parent -->
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20230227</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

diff --git a/s3auth-rest/src/main/resources/LICENSE.txt b/s3auth-rest/src/main/resources/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2012, TechnoPark Corp. (DBA "s3auth.com")
+Copyright (c) 2023, Zerocracy (DBA "s3auth.com")
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ April 24, 2014
 1. About the Terms of Service
 
 Within these Terms of Service ("Terms") the term "s3auth.com" or "we" will refer
-to TechnoPark Corp., and its respective subsidiaries and affiliates that own and
+to ZEROCRACY, and its respective subsidiaries and affiliates that own and
 operate s3auth.com on their behalf. The term "you" refers to you as a user
 of s3auth.com.
 
@@ -134,14 +134,14 @@ ANY DAMAGE TO YOUR COMPUTER SYSTEM OR LOSS OF DATA THAT RESULTS FROM ANY
 MATERIAL AND/OR DATA DOWNLOADED FROM OR OTHERWISE PROVIDED THROUGH S3AUTH.COM.
 
 S3AUTH.COM IS PROVIDED TO YOU "AS IS," "WITH ALL FAULTS," AND "AS AVAILABLE."
-TECHNOPARK CORP. AND ITS AGENTS AND LICENSORS CANNOT AND DO NOT WARRANT THE
+ZEROCRACY AND ITS AGENTS AND LICENSORS CANNOT AND DO NOT WARRANT THE
 ACCURACY, COMPLETENESS, USEFULNESS, TIMELINESS, NONINFRINGEMENT, MERCHANTABILITY
 OR FITNESS FOR A PARTICULAR PURPOSE OF THE INFORMATION AVAILABLE THROUGH
 S3AUTH.COM, NOR DO THEY GUARANTEE THAT S3AUTH.COM WILL BE ERROR-FREE, OR
 CONTINUOUSLY AVAILABLE, OR THAT S3AUTH.COM WILL BE FREE OF VIRUSES OR OTHER
 HARMFUL COMPONENTS.
 
-UNDER NO CIRCUMSTANCES SHALL TECHNOPARK CORP. (INCLUDING ITS PARENTS,
+UNDER NO CIRCUMSTANCES SHALL ZEROCRACY (INCLUDING ITS PARENTS,
 SUBSIDIARIES, AND AFFILIATES) OR ITS AGENTS OR LICENSORS BE LIABLE TO YOU OR
 ANYONE ELSE FOR ANY DAMAGES ARISING OUT OF ANY USE OR MISUSE OF S3AUTH.COM,
 INCLUDING, WITHOUT LIMITATION, LIABILITY FOR CONSEQUENTIAL, SPECIAL, INCIDENTAL,
@@ -150,11 +150,11 @@ THESE DAMAGES, REGARDLESS OF THE FORM OR CAUSE OF ACTION INCLUDING, BUT NOT
 LIMITED TO, CONTRACT, NEGLIGENCE, AND OTHER TORT ACTIONS. BECAUSE SOME STATES DO
 NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN CATEGORIES OF DAMAGES, THE
 ABOVE LIMITATION MAY NOT APPLY TO YOU. IN THESE STATES, THE LIABILITY OF
-TECHNOPARK CORP. AND ITS AGENTS AND LICENSORS IS LIMITED TO THE FULLEST EXTENT
+ZEROCRACY AND ITS AGENTS AND LICENSORS IS LIMITED TO THE FULLEST EXTENT
 PERMITTED BY APPLICABLE STATE LAW. YOU AGREE THAT THE LIABILITY OF TECHNOPARK
 CORP. (INCLUDING ITS PARENTS, SUBSIDIARIES, AND AFFILIATES) AND ITS AGENTS AND
 LICENSORS, IF ANY, ARISING OUT OF ANY KIND OF LEGAL CLAIM IN ANY WAY CONNECTED
-TO S3AUTH.COM SHALL NOT EXCEED THE AMOUNT YOU PAID TO TECHNOPARK CORP. FOR THE
+TO S3AUTH.COM SHALL NOT EXCEED THE AMOUNT YOU PAID TO ZEROCRACY FOR THE
 USE OF S3AUTH.COM.
 
 If you are the owner of any copyrighted work and believe your rights under U.S.

diff --git a/s3auth-rest/src/main/xsl/layout.xsl b/s3auth-rest/src/main/xsl/layout.xsl
@@ -80,21 +80,24 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
             </a>
             <xsl:text>, although we provide a service for their clients.</xsl:text>
             <xsl:text> The service is absolutely free of charge, since it is sponsored by </xsl:text>
-            <a href="http://www.technoparkcorp.com/">
-              <xsl:text>TechnoPark Corp.</xsl:text>
+            <a href="https://www.zerocracy.com/">
+              <xsl:text>Zerocracy</xsl:text>
             </a>
+            <!--
             <xsl:text> (a </xsl:text>
             <a href="http://www.aws-partner-directory.com/PartnerDirectory/PartnerDetail?Name=TechnoPark+Corp.">
               <xsl:text>Standard Technology Partner</xsl:text>
             </a>
-            <xsl:text> of AWS). </xsl:text>
+            <xsl:text> of AWS)</xsl:text>
+            -->
+            <xsl:text>. </xsl:text>
             <xsl:text>See also terms of use, privacy policy and license agreement at </xsl:text>
             <a href="https://github.com/yegor256/s3auth/blob/master/LICENSE.txt">
               <xsl:text>LICENSE.txt</xsl:text>
             </a>
             <xsl:text>.</xsl:text>
             <xsl:text> This website is using </xsl:text>
-            <a href="http://www.takes.org/">
+            <a href="https://www.takes.org/">
               <xsl:text>Takes</xsl:text>
             </a>
             <xsl:text> framework.</xsl:text>