feat: update plexus-cipher to 2.0

README.md

@@ -2,7 +2,7 @@ Plexus-Cipher
 ============
 
 [![Build Status](https://travis-ci.org/codehaus-plexus/plexus-cipher.svg?branch=master)](https://travis-ci.org/codehaus-plexus/plexus-cipher)
-[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-cipher.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%plexus-cipher%22)
+[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-cipher.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-cipher)
 
 The current master is now at https://github.com/codehaus-plexus/plexus-cipher
 

debian/changelog

@@ -1,3 +1,12 @@
+plexus-cipher (2.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Removed the patches
+  * Standards-Version updated to 4.6.0.1
+
+ -- Emmanuel Bourg <[email protected]>  Wed, 04 May 2022 01:31:06 +0200
+
 plexus-cipher (1.8-2) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -10,7 +10,7 @@ Build-Depends:
  libeclipse-sisu-maven-plugin-java,
  libplexus-container-default1.5-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0.1
 Vcs-Git: https://salsa.debian.org/java-team/plexus-cipher.git
 Vcs-Browser: https://salsa.debian.org/java-team/plexus-cipher
 Homepage: https://github.com/codehaus-plexus/plexus-cipher

debian/copyright

@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Plexus Cipher Component
 Upstream-Contact: Sonatype
 Source: http://www.sonatype.org
+Files-Excluded: .github/*
 
 Files: *
 Copyright: 2008, Sonatype Inc.

pom.xml

@@ -5,19 +5,19 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus</artifactId>
-    <version>5.1</version>
+    <version>8</version>
   </parent>
 
   <artifactId>plexus-cipher</artifactId>
-  <version>1.8</version>
+  <version>2.0</version>
 
   <name>Plexus Cipher: encryption/decryption Component</name>
 
   <scm>
-    <connection>scm:git:git@github.com:codehaus-plexus/plexus-cipher.git</connection>
-    <developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-cipher.git</developerConnection>
+    <connection>scm:git:https://github.com/codehaus-plexus/plexus-cipher.git</connection>
+    <developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-cipher.git</developerConnection>
     <url>http://github.com/codehaus-plexus/plexus-cipher</url>
-    <tag>plexus-cipher-1.8</tag>
+    <tag>plexus-cipher-2.0</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -32,15 +32,37 @@
 
   <properties>
     <javaVersion>7</javaVersion>
+    <sisuVersion>0.3.4</sisuVersion>
+    <project.build.outputTimestamp>2021-09-08T19:26:12Z</project.build.outputTimestamp>
   </properties>
-
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.inject</artifactId>
+      <version>${sisuVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>2.22.2</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
@@ -51,9 +73,9 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>org.sonatype.plugins</groupId>
+                    <groupId>org.eclipse.sisu</groupId>
                     <artifactId>sisu-maven-plugin</artifactId>
-                    <versionRange>[1.1,)</versionRange>
+                    <versionRange>[0.3.4,)</versionRange>
                     <goals>
                       <goal>test-index</goal>
                       <goal>main-index</goal>
@@ -82,9 +104,7 @@
               <goal>test</goal>
             </goals>
             <configuration>
-              <systemPropertyVariables>
-                <file.encoding>utf8</file.encoding>
-              </systemPropertyVariables>
+              <argLine>-Dfile.encoding=utf8</argLine>
             </configuration>
           </execution>
           <execution>
@@ -94,18 +114,16 @@
               <goal>test</goal>
             </goals>
             <configuration>
-              <systemPropertyVariables>
-                <file.encoding>iso8859-1</file.encoding>
-              </systemPropertyVariables>
+              <argLine>-Dfile.encoding=iso8859-1</argLine>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
+        <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
-        <version>1.1</version>
+        <version>${sisuVersion}</version>
         <executions>
           <execution>
             <goals>
@@ -118,19 +136,4 @@
     </plugins>
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-inject-bean</artifactId>
-      <version>2.6.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
 </project>

src/main/java/org/sonatype/plexus/components/cipher/Base64.java

@@ -95,7 +95,7 @@ public class Base64
      * The value of undefined encodings is <code>-1</code>.
      * </p>
      */
-    private static byte[] base64Alphabet = new byte[BASELENGTH];
+    private static final byte[] base64Alphabet = new byte[BASELENGTH];
 
     /**
      * <p/>
@@ -110,7 +110,7 @@ public class Base64
      * For example, <code>lookUpBase64Alphabet[62] </code> returns <code>'+'</code>.
      * </p>
      */
-    private static byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
+    private static final byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
 
     // Populating the lookup and character arrays
     static {