Fix: decoding two encoded chars (#7)

* Update Maven/NPM depdendencies, remove Grunt (not necessary) * Add failing test * Fix decoding by doing two rounds: first 3-byte-chars, then 1-byte-chars * Fix Java JDK versions for Travis * Remove project Eclipse files and ignore them * Fix scope of JBOSS dependency Co-authored-by: Thomas Lutz <[email protected]>
majacQ · May 1, 2022 · dcef176 · dcef176
1 parent 5369f21
commit dcef176
Show file tree

Hide file tree

Showing 8 changed files with 630 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,12 @@
 /release.properties
 /pom.xml.releaseBackup
 *.iml
+  <<<<<<< fix/decoding-two-encoded-chars
+.idea
+.project
+.classpath
+.settings
+  =======
   <<<<<<< fix/dependencies-and-travis
 .idea
   =======
@@ -14,3 +20,5 @@
 .classpath
 .project
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
+
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,12 @@
 language: java
 
 jdk:
+  <<<<<<< fix/decoding-two-encoded-chars
+  - oraclejdk8
+  - oraclejdk11
+  - openjdk10
+  - openjdk11
+  =======
   <<<<<<< fix/dependencies-and-travis
   - oraclejdk8
   - oraclejdk9
@@ -22,4 +28,6 @@ jdk:
   - openjdk14
 
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+
+  >>>>>>> main
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,6 +7,9 @@
     "url": "https://github.com/js-cookie/java-cookie.git"
   },
   "devDependencies": {
+  <<<<<<< fix/decoding-two-encoded-chars
+    "bower": "1.8.8"
+  =======
   <<<<<<< fix/dependencies-and-travis
     "bower": "1.8.8"
   =======
@@ -15,6 +18,7 @@
   },
   "scripts": {
     "test": "cd bower_components/js-cookie && ../../node/node \"../../node/node_modules/npm/bin/npm-cli.js\" install"
+  >>>>>>> main
   }
 }
 
diff --git a/pom.xml b/pom.xml
@@ -74,13 +74,17 @@
       <dependency>
         <groupId>org.jboss.arquillian</groupId>
         <artifactId>arquillian-bom</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+        <version>1.4.1.Final</version>
+  =======
   <<<<<<< fix/dependencies-and-travis
         <version>1.4.1.Final</version>
         <scope>import</scope>
   =======
         <version>1.6.0.Final</version>
         <scope>test</scope>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
         <type>pom</type>
       </dependency>
     </dependencies>
@@ -95,15 +99,22 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+      <version>2.10.1</version>
+  =======
   <<<<<<< fix/dependencies-and-travis
       <version>2.10.1</version>
   =======
       <version>2.10.12</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+      <version>2.9.8</version>
+  =======
   <<<<<<< fix/issue-14-decoding-two-encoded-chars
   <<<<<<< fix/dependencies-and-travis
       <version>2.9.8</version>
@@ -112,6 +123,7 @@
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
   =======
       <version>2.12.6.1</version>
+  >>>>>>> main
   >>>>>>> main
     </dependency>
     <dependency>
@@ -151,6 +163,9 @@
     <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>
       <artifactId>arquillian-junit-container</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+      <version>1.4.1.Final</version>
+  =======
   <<<<<<< fix/dependencies-and-travis
       <version>1.4.1.Final</version>
   =======
@@ -176,21 +191,30 @@
   =======
       <version>3.1.4</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.shrinkwrap.resolver</groupId>
+  <<<<<<< fix/decoding-two-encoded-chars
+      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+      <version>3.1.3</version>
+  =======
       <artifactId>shrinkwrap-resolver-spi</artifactId>
   <<<<<<< fix/dependencies-and-travis
       <version>3.1.3</version>
   =======
       <version>3.1.4</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+      <version>4.5.7</version>
+  =======
   <<<<<<< fix/issue-14-decoding-two-encoded-chars
   <<<<<<< fix/dependencies-and-travis
       <version>4.5.7</version>
@@ -199,17 +223,29 @@
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
   =======
       <version>4.5.13</version>
+  >>>>>>> main
   >>>>>>> main
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>fluent-hc</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+      <version>4.5.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.as</groupId>
+      <artifactId>jboss-as-dist</artifactId>
+      <version>7.5.7.Final-redhat-3</version>
+      <type>pom</type>
+  =======
   <<<<<<< fix/dependencies-and-travis
       <version>4.5.7</version>
   =======
       <version>4.5.13</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -222,6 +258,11 @@
       <build>
         <plugins>
           <plugin>
+  <<<<<<< fix/decoding-two-encoded-chars
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>failsafe-maven-plugin</artifactId>
+            <version>2.4.3-alpha-1</version>
+  =======
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
@@ -249,6 +290,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>2.22.2</version>
+  >>>>>>> main
             <executions>
               <execution>
                 <goals>
@@ -261,24 +303,33 @@
           <plugin>
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+            <version>1.5</version>
+  =======
   <<<<<<< fix/dependencies-and-travis
             <version>1.5</version>
   =======
             <version>1.11.2</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
             <executions>
               <execution>
                 <id>install node and npm</id>
                 <goals>
                   <goal>install-node-and-npm</goal>
                 </goals>
                 <configuration>
+  <<<<<<< fix/decoding-two-encoded-chars
+                  <nodeVersion>v11.10.0</nodeVersion>
+                  <npmVersion>6.8.0</npmVersion>
+  =======
   <<<<<<< fix/dependencies-and-travis
                   <nodeVersion>v11.10.0</nodeVersion>
                   <npmVersion>6.8.0</npmVersion>
   =======
                   <nodeVersion>v15.6.0</nodeVersion>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
                 </configuration>
               </execution>
               <execution>
@@ -293,6 +344,8 @@
                   <goal>bower</goal>
                 </goals>
               </execution>
+  <<<<<<< fix/decoding-two-encoded-chars
+  =======
               <execution>
                 <id>npm test</id>
                 <goals>
@@ -302,6 +355,7 @@
                   <arguments>test</arguments>
                 </configuration>
               </execution>
+  >>>>>>> main
             </executions>
           </plugin>
         </plugins>
@@ -324,11 +378,15 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+            <version>3.0.1</version>
+  =======
   <<<<<<< fix/dependencies-and-travis
             <version>3.0.1</version>
   =======
             <version>3.2.0</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -341,11 +399,15 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
+  <<<<<<< fix/decoding-two-encoded-chars
+            <version>3.0.1</version>
+  =======
   <<<<<<< fix/dependencies-and-travis
             <version>3.0.1</version>
   =======
             <version>3.2.1</version>
   >>>>>>> fix/issue-14-decoding-two-encoded-chars
+  >>>>>>> main
             <executions>
               <execution>
                 <id>attach-sources</id>