[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/26: gnu: java-plexus-container-default-bootstrap: Update to 2.1.0.
From: |
guix-commits |
Subject: |
16/26: gnu: java-plexus-container-default-bootstrap: Update to 2.1.0. |
Date: |
Sat, 5 Feb 2022 14:18:58 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 7c32460aa2f208a61e8da325e215b1b2e221ee64
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Mon Dec 20 03:45:56 2021 +0100
gnu: java-plexus-container-default-bootstrap: Update to 2.1.0.
* gnu/packages/java.scm (java-plexus-container-default-bootstrap):
Update to 2.1.0.
(java-plexus-container-default-1.7, java-plexus-containers-parent-pom-1.7)
(java-plexus-component-annotations-1.7, java-plexus-component-metadata-1.7):
New variables.
---
gnu/packages/java.scm | 188 ++++++++++++++++++++++++++++++++++++++++++++++---
gnu/packages/maven.scm | 22 +++---
2 files changed, 191 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0686a46571..7d01a81e47 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4094,7 +4094,7 @@ components.")
(define java-plexus-container-default-bootstrap
(package
(name "java-plexus-container-default-bootstrap")
- (version "1.7.1")
+ (version "2.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4103,7 +4103,7 @@ components.")
(file-name (git-file-name name version))
(sha256
(base32
- "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228"))))
+ "0r9yq67c1hvi1pz5wmx6x6hk5fmavp8a7yal3j5hkaad757firn1"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "container-default.jar"
@@ -4350,7 +4350,82 @@ from source tags and class annotations.")))
(lambda _
(copy-recursively "src/main/resources"
"build/classes/")
- #t)))))
+ #t))
+ (add-before 'build 'reinstate-cli
+ ;; The CLI was removed in 2.1.0, but we still need it to build some
+ ;; maven dependencies, and some parts of maven itself. We can't use
+ ;; the maven plugin for that yet.
+ (lambda _
+ (with-output-to-file
"src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java"
+ (lambda _
+ ;; Copied from a previous version of this package.
+ (display "package org.codehaus.plexus.metadata;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.tools.cli.AbstractCli;
+
+public class PlexusMetadataGeneratorCli
+ extends AbstractCli
+{
+ public static final char SOURCE_DIRECTORY = 's';
+ public static final char SOURCE_ENCODING = 'e';
+ public static final char CLASSES_DIRECTORY = 'c';
+ public static final char OUTPUT_FILE = 'o';
+ public static final char DESCRIPTORS_DIRECTORY = 'm';
+
+ public static void main( String[] args )
+ throws Exception
+ {
+ new PlexusMetadataGeneratorCli().execute( args );
+ }
+
+ @Override
+ public String getPomPropertiesPath()
+ {
+ return
\"META-INF/maven/org.codehaus.plexus/plexus-metadata-generator/pom.properties\";
+ }
+
+ @Override
+ @SuppressWarnings(\"static-access\")
+ public Options buildCliOptions( Options options )
+ {
+ options.addOption( OptionBuilder.withLongOpt( \"source\"
).hasArg().withDescription( \"Source directory.\" ).create( SOURCE_DIRECTORY )
);
+ options.addOption( OptionBuilder.withLongOpt( \"encoding\"
).hasArg().withDescription( \"Source file encoding.\" ).create( SOURCE_ENCODING
) );
+ options.addOption( OptionBuilder.withLongOpt( \"classes\"
).hasArg().withDescription( \"Classes directory.\" ).create( CLASSES_DIRECTORY
) );
+ options.addOption( OptionBuilder.withLongOpt( \"output\"
).hasArg().withDescription( \"Output directory.\" ).create( OUTPUT_FILE ) );
+ options.addOption( OptionBuilder.withLongOpt( \"descriptors\"
).hasArg().withDescription( \"Descriptors directory.\" ).create(
DESCRIPTORS_DIRECTORY ) );
+ return options;
+ }
+
+ public void invokePlexusComponent( CommandLine cli, PlexusContainer plexus
)
+ throws Exception
+ {
+ MetadataGenerator metadataGenerator = plexus.lookup(
MetadataGenerator.class );
+
+ MetadataGenerationRequest request = new MetadataGenerationRequest();
+ request.classesDirectory = new File( cli.getOptionValue(
CLASSES_DIRECTORY ) );
+ request.classpath = Collections.emptyList();
+ request.sourceDirectories = Arrays.asList( new String[]{ new File(
cli.getOptionValue( SOURCE_DIRECTORY ) ).getAbsolutePath() } );
+ request.sourceEncoding = cli.getOptionValue( SOURCE_ENCODING );
+ request.useContextClassLoader = true;
+ request.outputFile = new File( cli.getOptionValue( OUTPUT_FILE ) );
+ request.componentDescriptorDirectory = new File( cli.getOptionValue(
DESCRIPTORS_DIRECTORY ) );
+
+ metadataGenerator.generateDescriptor( request );
+ }
+}")))))
+ (add-before 'check 'fix-test-location
+ (lambda _
+ (substitute*
'("src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java"
+
"src/test/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMergerTest.java")
+ (("target") "build")))))))
(propagated-inputs
`(("java-plexus-container-default" ,java-plexus-container-default)
("java-plexu-component-annotations" ,java-plexus-component-annotations)
@@ -4364,7 +4439,104 @@ from source tags and class annotations.")))
("java-commons-cli" ,java-commons-cli)
("java-qdox" ,java-qdox)
("java-jdom2" ,java-jdom2)
- ("java-asm" ,java-asm)))
+ ("java-asm-8" ,java-asm-8)))
+ (native-inputs
+ (list java-junit java-guava java-geronimo-xbean-reflect))
+ (synopsis "Inversion-of-control container for Maven")
+ (description "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
+provides the Maven plugin generating the component metadata.")))
+
+(define-public java-plexus-container-default-1.7
+ (package
+ (inherit java-plexus-container-default)
+ (version "1.7.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
"https://github.com/codehaus-plexus/plexus-containers")
+ (commit (string-append "plexus-containers-" version))))
+ (file-name (git-file-name "java-plexus-container-default"
version))
+ (sha256
+ (base32
+ "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228"))))))
+
+(define java-plexus-containers-parent-pom-1.7
+ (package
+ (inherit java-plexus-container-default-1.7)
+ (name "java-plexus-containers-parent-pom")
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (replace 'install
+ (install-pom-file "pom.xml")))))
+ (propagated-inputs
+ `(("plexus-parent-pom" ,plexus-parent-pom-4.0)))))
+
+(define-public java-plexus-component-annotations-1.7
+ (package
+ (inherit java-plexus-container-default-1.7)
+ (name "java-plexus-component-annotations")
+ (arguments
+ `(#:jar-name "plexus-component-annotations.jar"
+ #:source-dir "plexus-component-annotations/src/main/java"
+ #:tests? #f; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ (install-from-pom "plexus-component-annotations/pom.xml")))))
+ (propagated-inputs
+ `(("java-plexus-containers-parent-pom-1.7"
,java-plexus-containers-parent-pom-1.7)))
+ (inputs '())
+ (native-inputs '())
+ (synopsis "Plexus descriptors generator")
+ (description "This package is a Maven plugin to generate Plexus descriptors
+from source tags and class annotations.")))
+
+(define-public java-plexus-component-metadata-1.7
+ (package
+ (inherit java-plexus-container-default-1.7)
+ (name "java-plexus-component-metadata")
+ (arguments
+ `(#:jar-name "plexus-component-metadata.jar"
+ #:source-dir "src/main/java"
+ #:test-dir "src/test"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "plexus-component-metadata")
+ #t))
+ (add-before 'build 'copy-resources
+ (lambda _
+ (copy-recursively "src/main/resources"
+ "build/classes/")
+ #t))
+ (add-before 'check 'fix-test-location
+ (lambda _
+ (substitute*
'("src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java"
+
"src/test/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMergerTest.java")
+ (("target") "build")))))))
+ (propagated-inputs
+ (list java-plexus-container-default-1.7
+ java-plexus-component-annotations-1.7
+ java-plexus-utils
+ java-plexus-cli
+ java-plexus-cli
+ java-plexus-classworlds
+ maven-plugin-api
+ maven-plugin-annotations
+ maven-core-bootstrap
+ maven-model
+ java-commons-cli
+ java-qdox
+ java-jdom2
+ java-asm))
(native-inputs
(list java-junit java-guava java-geronimo-xbean-reflect))
(synopsis "Inversion-of-control container for Maven")
@@ -4497,9 +4669,9 @@ and decryption.")
(list java-asm java-qdox-2-M9 java-javax-inject
plexus-parent-pom-4.0))
(inputs
- (list java-plexus-component-annotations))
+ (list java-plexus-component-annotations-1.7))
(native-inputs
- (list java-plexus-component-metadata java-junit))
+ (list java-plexus-component-metadata-1.7 java-junit))
(home-page
"https://codehaus-plexus.github.io/plexus-languages/plexus-java")
(synopsis "Shared language features for Java")
(description "This package contains shared language features of the Java
@@ -4616,9 +4788,9 @@ compilers.")
(install-from-pom "plexus-compiler-manager/pom.xml")))))
(propagated-inputs
(list java-plexus-compiler-api java-plexus-compiler-pom
- java-plexus-container-default))
+ java-plexus-container-default-1.7))
(native-inputs
- (list unzip java-plexus-component-metadata))
+ (list unzip java-plexus-component-metadata-1.7))
(synopsis "Compiler management for Plexus Compiler component")
(description "Plexus Compiler is a Plexus component to use different
compilers through a uniform API. This component chooses the compiler
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index da1619b03b..34af8992dc 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -293,7 +293,7 @@ for repositories using URI-based layouts.")))
("maven-resolver-util" ,maven-resolver-util)
("java-javax-inject" ,java-javax-inject)
("mavne-wagon-provider-api" ,maven-wagon-provider-api)
- ("java-plexus-component-annotation" ,java-plexus-component-annotations)
+ ("java-plexus-component-annotation"
,java-plexus-component-annotations-1.7)
("java-plexus-classworld" ,java-plexus-classworlds)
("java-plexus-plexus-util" ,java-plexus-utils)
("java-slf4j-api" ,java-slf4j-api)
@@ -832,8 +832,8 @@ classes used in multiple maven-wagon components.")))
(list java-plexus-utils maven-wagon-provider-api))
(native-inputs
`(("maven-wagon-provider-test" ,maven-wagon-provider-test)
- ("java-plexus-component-metadata" ,java-plexus-component-metadata)
- ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7)
+ ("java-plexus-component-annotations"
,java-plexus-component-annotations-1.7)
("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
("java-plexus-classworlds" ,java-plexus-classworlds)
@@ -920,8 +920,8 @@ Test Compatibility Kit.")))
maven-wagon-provider-api))
(native-inputs
`(("maven-wagon-provider-test" ,maven-wagon-provider-test)
- ("java-plexus-component-metadata" ,java-plexus-component-metadata)
- ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7)
+ ("java-plexus-component-annotations"
,java-plexus-component-annotations-1.7)
("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
("java-plexus-classworlds" ,java-plexus-classworlds)
@@ -992,8 +992,8 @@ wagon providers supporting HTTP.")))
maven-wagon-provider-api))
(native-inputs
`(("maven-wagon-provider-test" ,maven-wagon-provider-test)
- ("java-plexus-component-metadata" ,java-plexus-component-metadata)
- ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7)
+ ("java-plexus-component-annotations"
,java-plexus-component-annotations-1.7)
("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
("java-plexus-container-default" ,java-plexus-container-default)
("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
@@ -1569,7 +1569,7 @@ generally generated from plugin sources using
maven-plugin-plugin.")))
("maven-plugin-api" ,maven-plugin-api)
("maven-repository-metadata" ,maven-repository-metadata)
("maven-shared-utils" ,maven-shared-utils)
- ("java-plexus-component-annotations"
,java-plexus-component-annotations)
+ ("java-plexus-component-annotations"
,java-plexus-component-annotations-1.7)
("java-plexus-utils" ,java-plexus-utils)
("java-commons-lang3" ,java-commons-lang3)
("java-guava" ,java-guava)
@@ -1687,7 +1687,7 @@ artifactId=maven-core" ,(package-version
maven-core-bootstrap))))
(invoke "ant" "jar")
#t))))))
(native-inputs
- `(("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ `(("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7)
("java-commons-cli" ,java-commons-cli)
("java-plexus-cli" ,java-plexus-cli)
("java-jdom2" ,java-jdom2)
@@ -1964,7 +1964,7 @@ logging support.")))
(native-inputs
`(("java-modello-core" ,java-modello-core)
("java-plexus-utils" ,java-plexus-utils)
- ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-component-annotations"
,java-plexus-component-annotations-1.7)
("java-plexus-classworlds" ,java-plexus-classworlds)
("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
("java-plexus-build-api" ,java-plexus-build-api)
@@ -1979,7 +1979,7 @@ logging support.")))
("java-modello-plugins-xml" ,java-modello-plugins-xml)
("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
;; metadata
- ("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7)
("java-commons-cli" ,java-commons-cli)
("java-plexus-cli" ,java-plexus-cli)
("java-jdom2" ,java-jdom2)
- branch master updated (dda56249ae -> 26c74ed808), guix-commits, 2022/02/05
- 08/26: gnu: Add java-plexus-build-api., guix-commits, 2022/02/05
- 15/26: gnu: maven-common-artifact-filters: Update to 3.2.0., guix-commits, 2022/02/05
- 01/26: gnu: Add apache-parent-pom-23., guix-commits, 2022/02/05
- 13/26: gnu: java-eclipse-sisu-inject: Update to 0.3.5., guix-commits, 2022/02/05
- 12/26: gnu: java-jsr250: Use proper source., guix-commits, 2022/02/05
- 16/26: gnu: java-plexus-container-default-bootstrap: Update to 2.1.0.,
guix-commits <=
- 03/26: gnu: Add plexus-parent-pom-8., guix-commits, 2022/02/05
- 06/26: gnu: java-commons-codec: Use latest commons parent., guix-commits, 2022/02/05
- 10/26: gnu: java-plexus-sec-dispatcher: Update to 2.0., guix-commits, 2022/02/05
- 20/26: gnu: Add java-sonatype-aether-util-1.13., guix-commits, 2022/02/05
- 04/26: gnu: Add maven-parent-pom-34., guix-commits, 2022/02/05
- 05/26: gnu: maven-parent-pom: Fix dependency versions., guix-commits, 2022/02/05
- 23/26: gnu: maven-enforcer-api: Update to 3.0.0., guix-commits, 2022/02/05
- 24/26: gnu: maven-wagon-provider-api: Update to 3.4.3., guix-commits, 2022/02/05
- 02/26: gnu: Add apache-commons-parent-pom-52., guix-commits, 2022/02/05
- 17/26: gnu: Add java-sonatype-aether-api-1.13., guix-commits, 2022/02/05