You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/12/25 20:38:40 UTC
(maven-jarsigner) branch MSHARED-1346 updated (c7275cc -> ca81caa)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-1346
in repository https://gitbox.apache.org/repos/asf/maven-jarsigner.git
discard c7275cc [MSHARED-1346] Convert to JSR330
new ca81caa [MSHARED-1346] Convert to JSR330 and switch to JUnit 5
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c7275cc)
\
N -- N -- N refs/heads/MSHARED-1346 (ca81caa)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 18 ++++++++----------
.../maven/shared/jarsigner/JarSignerUtilTest.java | 11 ++++++-----
.../maven/shared/jarsigner/SimpleJarSignTest.java | 16 ++++++++--------
3 files changed, 22 insertions(+), 23 deletions(-)
(maven-jarsigner) 01/01: [MSHARED-1346] Convert to JSR330 and switch to JUnit 5
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1346
in repository https://gitbox.apache.org/repos/asf/maven-jarsigner.git
commit ca81caaf3e4a0296268a37b895cca40b75aaa661
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Mon Dec 25 21:25:43 2023 +0100
[MSHARED-1346] Convert to JSR330 and switch to JUnit 5
---
pom.xml | 46 ++++++++++------------
.../maven/shared/jarsigner/DefaultJarSigner.java | 5 ++-
.../shared/jarsigner/AbstractJarSignerTest.java | 4 +-
.../maven/shared/jarsigner/JarSignerUtilTest.java | 10 +++--
.../maven/shared/jarsigner/SimpleJarSignTest.java | 26 ++++++------
5 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5668b06..24025ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,28 +66,33 @@
<artifactId>maven-shared-utils</artifactId>
<version>3.4.2</version>
</dependency>
-
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>2.1.1</version>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <version>0.9.0.M2</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xml</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.10.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -115,17 +120,8 @@
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>create-component-descriptor</id>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java b/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
index 991e03c..fdefc83 100644
--- a/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
+++ b/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
@@ -18,11 +18,12 @@
*/
package org.apache.maven.shared.jarsigner;
+import javax.inject.Named;
+
import org.apache.maven.shared.utils.cli.Commandline;
import org.apache.maven.shared.utils.cli.StreamConsumer;
import org.apache.maven.shared.utils.cli.javatool.AbstractJavaTool;
import org.apache.maven.shared.utils.cli.javatool.JavaToolException;
-import org.codehaus.plexus.component.annotations.Component;
import org.slf4j.LoggerFactory;
/**
@@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory;
* @author Tony Chemit
* @since 1.0
*/
-@Component(role = JarSigner.class, hint = "default")
+@Named
public class DefaultJarSigner extends AbstractJavaTool<JarSignerRequest> implements JarSigner {
public DefaultJarSigner() {
diff --git a/src/test/java/org/apache/maven/shared/jarsigner/AbstractJarSignerTest.java b/src/test/java/org/apache/maven/shared/jarsigner/AbstractJarSignerTest.java
index c8032a9..412afcb 100644
--- a/src/test/java/org/apache/maven/shared/jarsigner/AbstractJarSignerTest.java
+++ b/src/test/java/org/apache/maven/shared/jarsigner/AbstractJarSignerTest.java
@@ -22,9 +22,9 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.codehaus.plexus.PlexusTestCase;
+import org.eclipse.sisu.launch.InjectedTest;
-public abstract class AbstractJarSignerTest extends PlexusTestCase {
+public abstract class AbstractJarSignerTest extends InjectedTest {
protected File prepareTestJar(String filename) throws IOException {
File file = new File("src/test", filename);
diff --git a/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java b/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
index 2004c46..07a166a 100644
--- a/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/jarsigner/JarSignerUtilTest.java
@@ -25,6 +25,10 @@ import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Created on 11/8/13.
*
@@ -47,7 +51,7 @@ public class JarSignerUtilTest extends AbstractJarSignerTest {
Manifest originalCleanManifest = JarSignerUtil.buildUnsignedManifest(originalManifest);
assertFalse(containsDigest(originalCleanManifest));
- assertTrue(originalCleanManifest.equals(JarSignerUtil.buildUnsignedManifest(originalCleanManifest)));
+ assertEquals(originalCleanManifest, JarSignerUtil.buildUnsignedManifest(originalCleanManifest));
JarSignerUtil.unsignArchive(target);
@@ -60,8 +64,8 @@ public class JarSignerUtilTest extends AbstractJarSignerTest {
Manifest cleanManifest = JarSignerUtil.buildUnsignedManifest(manifest);
assertFalse(containsDigest(cleanManifest));
- assertTrue(manifest.equals(cleanManifest));
- assertTrue(manifest.equals(originalCleanManifest));
+ assertEquals(manifest, cleanManifest);
+ assertEquals(manifest, originalCleanManifest);
}
private Manifest readManifest(File file) throws IOException {
diff --git a/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java b/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
index 122837d..00f7a3d 100644
--- a/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
+++ b/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
@@ -18,23 +18,24 @@
*/
package org.apache.maven.shared.jarsigner;
+import javax.inject.Inject;
+
import java.io.File;
import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Olivier Lamy
*/
-public class SimpleJarSignTest extends AbstractJarSignerTest {
+class SimpleJarSignTest extends AbstractJarSignerTest {
+ @Inject
private JarSigner jarSigner;
- public void setUp() throws Exception {
- super.setUp();
-
- jarSigner = (JarSigner) lookup(JarSigner.class.getName());
- }
-
- public void testSimpleSign() throws Exception {
+ @Test
+ void checkSimpleSign() throws Exception {
File target = prepareTestJar("simple.jar");
JarSignerSignRequest jarSignerRequest = new JarSignerSignRequest();
@@ -48,11 +49,12 @@ public class SimpleJarSignTest extends AbstractJarSignerTest {
JavaToolResult jarSignerResult = jarSigner.execute(jarSignerRequest);
- assertEquals("not exit code 0 " + jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode());
+ assertEquals(0, jarSignerResult.getExitCode(), "not exit code 0 " + jarSignerResult.getExecutionException());
}
- public void testSimpleSignAndVerify() throws Exception {
- testSimpleSign();
+ @Test
+ void simpleSignAndVerify() throws Exception {
+ checkSimpleSign();
JarSignerVerifyRequest request = new JarSignerVerifyRequest();
request.setCerts(true);
@@ -64,6 +66,6 @@ public class SimpleJarSignTest extends AbstractJarSignerTest {
JavaToolResult jarSignerResult = jarSigner.execute(request);
- assertEquals("not exit code 0 " + jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode());
+ assertEquals(0, jarSignerResult.getExitCode(), "not exit code 0 " + jarSignerResult.getExecutionException());
}
}