[Git][java-team/plexus-cipher][master] 14 commits: Track the new codehaus-plexus repository
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Feb 9 09:50:56 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-cipher
Commits:
0e128f14 by Emmanuel Bourg at 2021-01-20T10:08:31+01:00
Track the new codehaus-plexus repository
- - - - -
d6a225c1 by Emmanuel Bourg at 2021-01-20T10:09:39+01:00
Wrap and sort
- - - - -
94c42a43 by Emmanuel Bourg at 2021-01-20T10:13:19+01:00
Standards-Version updated to 4.5.1
- - - - -
5475def3 by Emmanuel Bourg at 2021-01-20T10:13:23+01:00
Switch to debhelper level 13
- - - - -
6ca38c46 by Emmanuel Bourg at 2021-01-20T10:13:29+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
f71ed008 by Emmanuel Bourg at 2021-01-20T10:14:35+01:00
Removed the -java-doc package
- - - - -
17ba326c by Emmanuel Bourg at 2021-02-09T09:50:28+01:00
New upstream version 1.8
- - - - -
d8524294 by Emmanuel Bourg at 2021-02-09T09:50:28+01:00
Update upstream source from tag 'upstream/1.8'
Update to upstream version '1.8'
with Debian dir 3ce94bd6bfd32ec39d0d044300d022473e5446c1
- - - - -
28e62a40 by Emmanuel Bourg at 2021-02-09T10:22:42+01:00
Removed the patches (all fixed upstream)
- - - - -
ecd69c80 by Emmanuel Bourg at 2021-02-09T10:23:17+01:00
Build depend on junit4 instead of junit
- - - - -
eced6771 by Emmanuel Bourg at 2021-02-09T10:24:43+01:00
Fixed the build failure with OpenJDK 17 (Closes: #982350)
- - - - -
8507c49a by Emmanuel Bourg at 2021-02-09T10:32:22+01:00
Switch to eclipse-sisu-maven-plugin
- - - - -
518a5286 by Emmanuel Bourg at 2021-02-09T10:41:25+01:00
Relocate the old org.sonatype.plexus artifact to org.codehaus.plexus
- - - - -
3ad40f3a by Emmanuel Bourg at 2021-02-09T10:50:33+01:00
Upload to unstable
- - - - -
23 changed files:
- + .travis.yml
- + LICENSE.txt
- + README.md
- debian/changelog
- − debian/compat
- debian/control
- − debian/libplexus-cipher-java-doc.doc-base.api
- − debian/libplexus-cipher-java-doc.install
- debian/libplexus-cipher-java.poms
- debian/maven.properties
- debian/maven.rules
- − debian/patches/0001_PBECipherTest.patch
- − debian/patches/0002_fix-junit-scope.patch
- debian/patches/series
- + debian/patches/sisu-maven-plugin.patch
- debian/rules
- debian/watch
- pom.xml
- src/main/java/org/sonatype/plexus/components/cipher/Base64.java
- src/main/java/org/sonatype/plexus/components/cipher/DefaultPlexusCipher.java
- src/main/java/org/sonatype/plexus/components/cipher/PBECipher.java
- src/test/java/org/sonatype/plexus/components/cipher/DefaultPlexusCipherTest.java
- src/test/java/org/sonatype/plexus/components/cipher/PBECipherTest.java
Changes:
=====================================
.travis.yml
=====================================
@@ -0,0 +1,23 @@
+language: java
+jdk:
+ - openjdk8
+ - openjdk11
+ - openjdk13
+ - openjdk14
+
+# No need for preliminary install step.
+install: true
+#
+# Run all integration tests.
+script:
+ - "mvn --show-version --errors --batch-mode clean verify"
+#
+cache:
+ directories:
+ - $HOME/.m2
+branches:
+ except:
+ - gh-pages
+notifications:
+ email:
+ - khmarbaise at apache.org
=====================================
LICENSE.txt
=====================================
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
=====================================
README.md
=====================================
@@ -0,0 +1,13 @@
+Plexus-Cipher
+============
+
+[](https://travis-ci.org/codehaus-plexus/plexus-cipher)
+[](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%plexus-cipher%22)
+
+The current master is now at https://github.com/codehaus-plexus/plexus-cipher
+
+For publishing [the site](https://codehaus-plexus.github.io/plexus-cipher/) do the following:
+
+```
+mvn -Preporting verify site site:stage scm-publish:publish-scm
+```
=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+plexus-cipher (1.8-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Removed the patches (all fixed upstream)
+ - Build depend on junit4 instead of junit
+ - Relocate the old org.sonatype.plexus artifact to org.codehaus.plexus
+ * Fixed the build failure with OpenJDK 17 (Closes: #982350)
+ * Switch to eclipse-sisu-maven-plugin
+ * Track the new codehaus-plexus repository
+ * Removed the -java-doc package
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 09 Feb 2021 10:41:29 +0100
+
plexus-cipher (1.7-3) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -3,22 +3,22 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
-Build-Depends-Indep: default-jdk-doc,
- junit,
- libmaven-javadoc-plugin-java,
- libplexus-container-default1.5-java,
- libsisu-maven-plugin-java
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-cipher.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-cipher.git
-Homepage: https://github.com/sonatype/plexus-cipher
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ junit4,
+ libeclipse-sisu-maven-plugin-java,
+ libplexus-container-default1.5-java,
+ maven-debian-helper (>= 2.2)
+Standards-Version: 4.5.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
Package: libplexus-cipher-java
Architecture: all
Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
-Suggests: libplexus-cipher-java-doc
Description: Plexus Cipher Component used by Maven
The Plexus project provides a full software stack for creating and
executing software projects. Based on the Plexus container, the applications
@@ -26,17 +26,3 @@ Description: Plexus Cipher Component used by Maven
components that can easily be assembled and reused.
.
This package provides a cipher component for Plexus.
-
-Package: libplexus-cipher-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libplexus-cipher-java
-Description: Documentation for Plexus Cipher Component used by Maven
- The Plexus project provides a full software stack for creating and
- executing software projects. Based on the Plexus container, the applications
- can utilise component-oriented programming to build modular, reusable
- components that can easily be assembled and reused.
- .
- This package contains the API documentation of libplexus-cipher-java.
=====================================
debian/libplexus-cipher-java-doc.doc-base.api deleted
=====================================
@@ -1,10 +0,0 @@
-Document: libplexus-cipher-java
-Title: API Javadoc for Plexus Cipher: encryption/decryption Component
-Author: Plexus Cipher: encryption/decryption Component developers
-Abstract: This is the API Javadoc provided for the
- libplexus-cipher-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-cipher-java/api/index.html
-Files: /usr/share/doc/libplexus-cipher-java/api/*
=====================================
debian/libplexus-cipher-java-doc.install deleted
=====================================
@@ -1,2 +0,0 @@
-
-target/apidocs/* usr/share/doc/libplexus-cipher-java/api
=====================================
debian/libplexus-cipher-java.poms
=====================================
@@ -25,4 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --no-parent --has-package-version --java-lib
+pom.xml --no-parent --has-package-version --java-lib --relocate=org.sonatype.plexus:plexus-cipher
=====================================
debian/maven.properties
=====================================
@@ -2,3 +2,4 @@
# For example:
# maven.test.skip=true
+argLine=--illegal-access=permit
=====================================
debian/maven.rules
=====================================
@@ -16,6 +16,7 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
org.sonatype.plexus plexus-cipher jar s/.*/debian/ * *
+s/org.sonatype.plugins/org.eclipse.sisu/ sisu-maven-plugin * * * *
=====================================
debian/patches/0001_PBECipherTest.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: force thread to sleep briefly to prevent build failures on
- fast systems when 2 PBECipher encryptions begin during the same
- millisecond.
-Author: Sjoerd Simons <sjoerd at debian.org>
-
---- a/src/test/java/org/sonatype/plexus/components/cipher/PBECipherTest.java
-+++ b/src/test/java/org/sonatype/plexus/components/cipher/PBECipherTest.java
-@@ -55,6 +55,8 @@
-
- System.out.println( enc );
-
-+ Thread.sleep (10);
-+
- String enc2 = _cipher.encrypt64( _cleatText, _password );
-
- assertNotNull( enc2 );
=====================================
debian/patches/0002_fix-junit-scope.patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: Fixes the scope of the junit dependency
- (the right scope should be inherited from the parent pom which is ignored)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -125,6 +125,7 @@
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
-+ <scope>test</scope>
- </dependency>
- </dependencies>
-
=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
-0001_PBECipherTest.patch
-0002_fix-junit-scope.patch
+sisu-maven-plugin.patch
=====================================
debian/patches/sisu-maven-plugin.patch
=====================================
@@ -0,0 +1,13 @@
+Description: Let Maven figure out the version availble of the sisu-maven-plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -105,7 +105,6 @@
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+- <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
=====================================
debian/rules
=====================================
@@ -2,6 +2,3 @@
%:
dh $@
-
-get-orig-source:
- uscan --download-current-version --force-download --rename
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
-https://github.com/sonatype/plexus-cipher/tags .*/plexus-cipher-([\d\.]+).tar.gz
+version=4
+https://github.com/codehaus-plexus/plexus-cipher/tags .*/plexus-cipher-([\d\.]+).tar.gz
=====================================
pom.xml
=====================================
@@ -3,32 +3,44 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>spice-parent</artifactId>
- <version>15</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>5.1</version>
</parent>
- <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
- <url>http://spice.sonatype.org/${project.artifactId}</url>
<name>Plexus Cipher: encryption/decryption Component</name>
+ <scm>
+ <connection>scm:git:git at github.com:codehaus-plexus/plexus-cipher.git</connection>
+ <developerConnection>scm:git:git at github.com:codehaus-plexus/plexus-cipher.git</developerConnection>
+ <url>http://github.com/codehaus-plexus/plexus-cipher</url>
+ <tag>plexus-cipher-1.8</tag>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://github.com/codehaus-plexus/plexus-cipher/issues</url>
+ </issueManagement>
<distributionManagement>
<site>
- <id>sonatype.org-sites</id>
- <url>${spiceSiteBaseUrl}/${project.artifactId}</url>
+ <id>github:gh-pages</id>
+ <url>${project.scm.developerConnection}</url>
</site>
</distributionManagement>
+ <properties>
+ <javaVersion>7</javaVersion>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
+ <version>2.22.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -59,14 +71,6 @@
</pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -118,20 +122,15 @@
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-bean</artifactId>
- <version>2.2.0</version>
+ <version>2.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.12</version>
+ <scope>test</scope>
</dependency>
</dependencies>
- <scm>
- <connection>scm:git:git at github.com/sonatype/plexus-cipher.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/sonatype/plexus-cipher.git</developerConnection>
- <url>http://github.com/sonatype/plexus-cipher</url>
- </scm>
-
</project>
=====================================
src/main/java/org/sonatype/plexus/components/cipher/Base64.java
=====================================
@@ -31,14 +31,13 @@ package org.sonatype.plexus.components.cipher;
*/
/**
- * Provides Base64 encoding and decoding as defined by RFC 2045.
- * <p/>
+ * <p>Provides Base64 encoding and decoding as defined by RFC 2045.</p>
+ *
* <p>This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite>
* from RFC 2045 <cite>Multipurpose Internet Mail Extensions (MIME) Part One:
* Format of Internet Message Bodies</cite> by Freed and Borenstein.</p>
*
* @author Apache Software Foundation
- * @version $Id$
* @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
* @since 1.0-dev
*/
=====================================
src/main/java/org/sonatype/plexus/components/cipher/DefaultPlexusCipher.java
=====================================
@@ -24,7 +24,7 @@ import javax.enterprise.inject.Typed;
import javax.inject.Named;
/**
- * @author Oleg Gusakov</a>
+ * @author Oleg Gusakov
*/
@Named( "default" )
@Typed( PlexusCipher.class )
=====================================
src/main/java/org/sonatype/plexus/components/cipher/PBECipher.java
=====================================
@@ -39,7 +39,6 @@ import javax.crypto.spec.SecretKeySpec;
/**
* @author Oleg Gusakov
- * @version $Id$
*/
public class PBECipher
{
@@ -63,9 +62,8 @@ public class PBECipher
protected MessageDigest _digester;
- protected SecureRandom _secureRandom;
-
- protected boolean _onLinux = false;
+ private static final SecureRandom _secureRandom = new SecureRandom();
+
//---------------------------------------------------------------
public PBECipher()
throws PlexusCipherException
@@ -73,21 +71,6 @@ public class PBECipher
try
{
_digester = MessageDigest.getInstance( DIGEST_ALG );
-
- if( System.getProperty( "os.name", "blah" ).toLowerCase().indexOf( "linux" ) != -1 )
- {
- _onLinux = true;
- }
-
- if( _onLinux )
- {
- System.setProperty( "securerandom.source", "file:/dev/./urandom");
- }
- else
- {
- _secureRandom = new SecureRandom();
- }
-
}
catch ( NoSuchAlgorithmException e )
{
@@ -96,21 +79,10 @@ public class PBECipher
}
//---------------------------------------------------------------
private byte[] getSalt( final int sz )
- throws NoSuchAlgorithmException, NoSuchProviderException
{
- byte [] res = null;
-
- if( _secureRandom != null )
- {
- _secureRandom.setSeed( System.currentTimeMillis() );
- res = _secureRandom.generateSeed( sz );
- }
- else
- {
- res = new byte[ sz ];
- Random r = new Random( System.currentTimeMillis() );
- r.nextBytes( res );
- }
+ byte[] res = new byte[ sz ];
+
+ _secureRandom.nextBytes( res );
return res;
}
@@ -124,12 +96,6 @@ public class PBECipher
byte[] salt = getSalt( SALT_SIZE );
- // spin it :)
- if( _secureRandom != null )
- {
- new SecureRandom().nextBytes( salt );
- }
-
Cipher cipher = createCipher( password.getBytes( STRING_ENCODING ), salt, Cipher.ENCRYPT_MODE );
byte [] encryptedBytes = cipher.doFinal( clearBytes );
=====================================
src/test/java/org/sonatype/plexus/components/cipher/DefaultPlexusCipherTest.java
=====================================
@@ -18,7 +18,6 @@ import org.sonatype.guice.bean.containers.InjectedTestCase;
* Test the Plexus Cipher container
*
* @author Oleg Gusakov
- * @version $Id$
*/
public class DefaultPlexusCipherTest
extends InjectedTestCase
=====================================
src/test/java/org/sonatype/plexus/components/cipher/PBECipherTest.java
=====================================
@@ -19,14 +19,10 @@ under the License.
package org.sonatype.plexus.components.cipher;
-import java.util.Arrays;
-import java.util.Properties;
-
import org.sonatype.guice.bean.containers.InjectedTestCase;
/**
* @author Oleg Gusakov
- * @version $Id$
*/
public class PBECipherTest
extends InjectedTestCase
View it on GitLab: https://salsa.debian.org/java-team/plexus-cipher/-/compare/8d78aef0fe86d14ec6c88391c2c3677138a210c4...3ad40f3a14805571d7be17992cca72fbacb68d78
--
View it on GitLab: https://salsa.debian.org/java-team/plexus-cipher/-/compare/8d78aef0fe86d14ec6c88391c2c3677138a210c4...3ad40f3a14805571d7be17992cca72fbacb68d78
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210209/a27ddca2/attachment.html>
More information about the pkg-java-commits
mailing list