From 9f2c3cfd026095009d557ba91ad38e3bbc0f5628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cahit=20=C5=9Eahin?= <cahitbaba00@gmail.com>
Date: Fri, 19 Nov 2021 21:12:54 +0300
Subject: [PATCH 1/2] 1.9.4 - update for java 16.

---
 obfuscator-annotations/pom.xml |  2 +-
 obfuscator-core/pom.xml        | 52 +++++++++++++++++++++++++++-------
 pom.xml                        |  8 +++---
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/obfuscator-annotations/pom.xml b/obfuscator-annotations/pom.xml
index f2bf8ea..15e551d 100644
--- a/obfuscator-annotations/pom.xml
+++ b/obfuscator-annotations/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>me.superblaubeere27</groupId>
         <artifactId>obfuscator</artifactId>
-        <version>1.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>obfuscator-annotations</artifactId>
diff --git a/obfuscator-core/pom.xml b/obfuscator-core/pom.xml
index d745ba5..162904d 100644
--- a/obfuscator-core/pom.xml
+++ b/obfuscator-core/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>me.superblaubeere27</groupId>
         <artifactId>obfuscator</artifactId>
-        <version>1.9.3-SNAPSHOT</version>
+        <version>1.9.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>obfuscator-core</artifactId>
@@ -32,22 +32,30 @@
         </repository>
     </repositories>
     <properties>
-        <lombok.version>1.18.16</lombok.version>
-        <slf4j-api.version>1.7.30</slf4j-api.version>
-        <logback-classic.version>1.2.3</logback-classic.version>
-        <guava.version>29.0-jre</guava.version>
-        <rsyntaxtextarea.version>2.6.1</rsyntaxtextarea.version>
+        <lombok.version>1.18.22</lombok.version>
+        <slf4j-api.version>1.7.32</slf4j-api.version>
+        <logback-classic.version>1.2.7</logback-classic.version>
+        <guava.version>31.0.1-jre</guava.version>
+        <rsyntaxtextarea.version>3.1.3</rsyntaxtextarea.version>
         <jopt-simple.version>5.0.4</jopt-simple.version>
-        <gson.version>2.8.2</gson.version>
+        <gson.version>2.8.9</gson.version>
         <forms_rt.version>7.0.3</forms_rt.version>
-        <junit.version>4.13.1</junit.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+        <junit.version>4.13.2</junit.version>
+        <maven-shade-plugin.version>3.3.0-SNAPSHOT</maven-shade-plugin.version>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <jcp.version>6.1.4</jcp.version>
-        <commons-lang3.version>3.11</commons-lang3.version>
-        <nashorn.version>15.2</nashorn.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <nashorn.version>15.3</nashorn.version>
     </properties>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven-snapshots</id>
+            <url>https://repository.apache.org/content/repositories/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -219,6 +227,28 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+                <configuration>
+                    <argLine>
+                        --illegal-access=permit
+                    </argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.22.0</version>
+                <configuration>
+                    <argLine>
+                        --illegal-access=permit
+                    </argLine>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 9459f66..f57aa95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,14 +15,14 @@
 
     <groupId>me.superblaubeere27</groupId>
     <artifactId>obfuscator</artifactId>
-    <version>1.9.3-SNAPSHOT</version>
+    <version>1.9.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>15</maven.compiler.source>
-        <maven.compiler.target>15</maven.compiler.target>
-        <asm.version>9.1</asm.version>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+        <asm.version>9.2</asm.version>
     </properties>
 
     <modules>

From 50d171ae7b521b5764e25be307fd2659f09a2618 Mon Sep 17 00:00:00 2001
From: Whiron <dnlblasco@gmail.com>
Date: Sat, 15 Jun 2024 01:40:00 +0200
Subject: [PATCH 2/2] 1.9.5 - update for java 21

---
 obfuscator-annotations/pom.xml |  2 +-
 obfuscator-core/pom.xml        | 45 +++++++++++++++++-----------------
 pom.xml                        |  8 +++---
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/obfuscator-annotations/pom.xml b/obfuscator-annotations/pom.xml
index 15e551d..e949179 100644
--- a/obfuscator-annotations/pom.xml
+++ b/obfuscator-annotations/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>me.superblaubeere27</groupId>
         <artifactId>obfuscator</artifactId>
-        <version>1.9.4-SNAPSHOT</version>
+        <version>1.9.5</version>
     </parent>
 
     <artifactId>obfuscator-annotations</artifactId>
diff --git a/obfuscator-core/pom.xml b/obfuscator-core/pom.xml
index 162904d..2c8203a 100644
--- a/obfuscator-core/pom.xml
+++ b/obfuscator-core/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>me.superblaubeere27</groupId>
         <artifactId>obfuscator</artifactId>
-        <version>1.9.4-SNAPSHOT</version>
+        <version>1.9.5</version>
     </parent>
 
     <artifactId>obfuscator-core</artifactId>
@@ -32,20 +32,20 @@
         </repository>
     </repositories>
     <properties>
-        <lombok.version>1.18.22</lombok.version>
-        <slf4j-api.version>1.7.32</slf4j-api.version>
-        <logback-classic.version>1.2.7</logback-classic.version>
-        <guava.version>31.0.1-jre</guava.version>
-        <rsyntaxtextarea.version>3.1.3</rsyntaxtextarea.version>
+        <lombok.version>1.18.32</lombok.version>
+        <slf4j-api.version>2.0.13</slf4j-api.version>
+        <logback-classic.version>1.5.6</logback-classic.version>
+        <guava.version>32.2.1-jre</guava.version>
+        <rsyntaxtextarea.version>3.4.0</rsyntaxtextarea.version>
         <jopt-simple.version>5.0.4</jopt-simple.version>
-        <gson.version>2.8.9</gson.version>
+        <gson.version>2.11.0</gson.version>
         <forms_rt.version>7.0.3</forms_rt.version>
         <junit.version>4.13.2</junit.version>
-        <maven-shade-plugin.version>3.3.0-SNAPSHOT</maven-shade-plugin.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
         <jcp.version>6.1.4</jcp.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <nashorn.version>15.3</nashorn.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
+        <nashorn.version>15.4</nashorn.version>
     </properties>
 
     <pluginRepositories>
@@ -60,18 +60,18 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
+            <version>1.18.32</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
+            <version>2.0.13</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback-classic.version}</version>
+            <version>1.4.12</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
+            <version>32.0.0-android</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -112,13 +112,13 @@
         <dependency>
             <groupId>org.openjdk.nashorn</groupId>
             <artifactId>nashorn-core</artifactId>
-            <version>${nashorn.version}</version>
+            <version>15.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.fifesoft</groupId>
             <artifactId>rsyntaxtextarea</artifactId>
-            <version>${rsyntaxtextarea.version}</version>
+            <version>3.4.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/biz.aQute/bndlib -->
 
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.intellij</groupId>
@@ -168,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>${maven-shade-plugin.version}</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -231,17 +231,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>3.2.5</version>
                 <configuration>
                     <argLine>
-                        --illegal-access=permit
+                        --add-opens java.base/java.lang=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>3.2.5</version>
                 <configuration>
                     <argLine>
                         --illegal-access=permit
diff --git a/pom.xml b/pom.xml
index f57aa95..a18dfeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,14 +15,14 @@
 
     <groupId>me.superblaubeere27</groupId>
     <artifactId>obfuscator</artifactId>
-    <version>1.9.4-SNAPSHOT</version>
+    <version>1.9.5</version>
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
-        <asm.version>9.2</asm.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <asm.version>9.7</asm.version>
     </properties>
 
     <modules>