Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-cli for openSUSE:Factory
checked in at 2024-06-14 19:01:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-cli (Old)
and /work/SRC/openSUSE:Factory/.plexus-cli.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-cli"
Fri Jun 14 19:01:59 2024 rev:8 rq:1180745 version:1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-cli/plexus-cli.changes 2024-05-27
12:04:06.736109669 +0200
+++ /work/SRC/openSUSE:Factory/.plexus-cli.new.19518/plexus-cli.changes
2024-06-14 19:06:18.916764824 +0200
@@ -1,0 +2,23 @@
+Thu Jun 13 17:03:16 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Update to version 1.7
+ * Changes
+ + Bump plexus-components from 6.5 to 10.0
+ + Bump checkstyle from 9.2 to 9.2.1
+ + Bump plexus-container-default from 1.0-alpha-34 to 2.1.1
+ + Bump checkstyle from 9.2.1 to 9.3
+ + Bump commons-cli from 1.0 to 1.5.0
+ + Bump maven-checkstyle-plugin from 3.1.2 to 3.3.0
+ + Bump maven-shared-resources from 4 to 5
+ + Bump apache/maven-gh-actions-shared from 1 to 3
+ + Update to Parent pom 15
+ + Bump commons-cli:commons-cli from 1.5.0 to 1.6.0
+ + Reuse plexus-pom action for CI
+ + Bump org.codehaus.plexus:plexus from 15 to 16
+ + Replace plexus-container-default with Sisu Plexus
+ + Bump org.codehaus.plexus:plexus-testing from 1.2.0 to 1.3.0
+- Rebased patches:
+ * 0001-Do-not-use-commons-cli-deprecated-classes.patch
+ * 0002-No-unchecked-operations.patch
+
+-------------------------------------------------------------------
Old:
----
plexus-cli-1.6.tar.xz
New:
----
plexus-cli-1.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-cli.spec ++++++
--- /var/tmp/diff_new_pack.Y2GHQr/_old 2024-06-14 19:06:19.416782975 +0200
+++ /var/tmp/diff_new_pack.Y2GHQr/_new 2024-06-14 19:06:19.416782975 +0200
@@ -16,9 +16,8 @@
#
-%bcond_with tests
Name: plexus-cli
-Version: 1.6
+Version: 1.7
Release: 0
Summary: Command Line Interface facilitator for Plexus
License: Apache-2.0
@@ -38,10 +37,6 @@
BuildRequires: sisu-plexus
BuildRequires: xz
BuildArch: noarch
-%if %{with tests}
-BuildRequires: ant-junit
-BuildRequires: guava
-%endif
%description
Plexus contains end-to-end developer tools for writing applications.
@@ -64,19 +59,11 @@
cp -p %{SOURCE1} .
cp -p %{SOURCE100} build.xml
-%pom_change_dep :plexus-container-default
org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
-
mkdir -p lib
build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds
org.eclipse.sisu.plexus
-%if %{with tests}
-build-jar-repository -s lib guava/guava
-%endif
%build
ant \
-%if %{without tests}
- -Dtest.skip=true \
-%endif
jar javadoc
%install
++++++ 0001-Do-not-use-commons-cli-deprecated-classes.patch ++++++
--- /var/tmp/diff_new_pack.Y2GHQr/_old 2024-06-14 19:06:19.436783701 +0200
+++ /var/tmp/diff_new_pack.Y2GHQr/_new 2024-06-14 19:06:19.440783846 +0200
@@ -1,18 +1,18 @@
-From 50b6e1d26fdcecbfa40302d6b8f4ea6dbecb3e93 Mon Sep 17 00:00:00 2001
+From c35c0ecf6be620469b50cc904efc2152ba3d7dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Thu, 19 May 2022 09:30:24 +0200
Subject: [PATCH 1/2] Do not use commons-cli deprecated classes
---
- .../plexus/tools/cli/AbstractCli.java | 32 +++++++++----------
- .../codehaus/plexus/tools/cli/TestCli.java | 4 +--
- 2 files changed, 17 insertions(+), 19 deletions(-)
+ .../plexus/tools/cli/AbstractCli.java | 60 ++++++++++---------
+ .../codehaus/plexus/tools/cli/TestCli.java | 9 +--
+ 2 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
-index 1763c5a..e173774 100644
+index 505c128..7e72f08 100644
--- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
+++ b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
-@@ -18,9 +18,9 @@ package org.codehaus.plexus.tools.cli;
+@@ -24,9 +24,9 @@ import java.util.Properties;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -24,7 +24,7 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.codehaus.plexus.ContainerConfiguration;
-@@ -49,17 +49,17 @@ public abstract class AbstractCli
+@@ -45,17 +45,17 @@ public abstract class AbstractCli implements Cli {
// These are standard options that we would want to use for all our
projects.
//
----------------------------------------------------------------------------
@@ -48,64 +48,94 @@
//
----------------------------------------------------------------------------
// Abstract methods
-@@ -346,19 +346,17 @@ public abstract class AbstractCli
+@@ -284,25 +284,31 @@ public abstract class AbstractCli implements Cli {
+ public Options buildDefaultCliOptions() {
options = new Options();
- options.addOption(
-- OptionBuilder.withLongOpt( "define" ).hasArg().withDescription(
"Define a system property" ).create(
-- SET_SYSTEM_PROPERTY ) );
-+ Option.builder( SET_SYSTEM_PROPERTY ).longOpt( "define"
).hasArg().desc( "Define a system property" ).build() );
- options.addOption(
-- OptionBuilder.withLongOpt( "help" ).withDescription( "Display
help information" ).create( HELP ) );
-+ Option.builder( HELP ).longOpt( "help" ).desc( "Display help
information" ).build() );
- options.addOption(
-- OptionBuilder.withLongOpt( "version" ).withDescription( "Display
version information" ).create( VERSION ) );
-+ Option.builder( VERSION ).longOpt( "version" ).desc( "Display
version information" ).build() );
- options.addOption(
-- OptionBuilder.withLongOpt( "quiet" ).withDescription( "Quiet
output - only show errors" ).create( QUIET ) );
-+ Option.builder( QUIET ).longOpt( "quiet" ).desc( "Quiet output -
only show errors" ).build() );
- options.addOption(
-- OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce
execution debug output" ).create( DEBUG ) );
-+ Option.builder( DEBUG ).longOpt( "debug" ).desc( "Produce
execution debug output" ).build() );
- options.addOption(
-- OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce
execution error messages" ).create(
-- ERRORS ) );
-+ Option.builder( ERRORS ).longOpt( "errors" ).desc( "Produce
execution error messages" ).build() );
+- options.addOption(OptionBuilder.withLongOpt("define")
++ options.addOption(Option.builder( SET_SYSTEM_PROPERTY )
++ .longOpt( "define" )
+ .hasArg()
+- .withDescription("Define a system property")
+- .create(SET_SYSTEM_PROPERTY));
+- options.addOption(OptionBuilder.withLongOpt("help")
+- .withDescription("Display help information")
+- .create(HELP));
+- options.addOption(OptionBuilder.withLongOpt("version")
+- .withDescription("Display version information")
+- .create(VERSION));
+- options.addOption(OptionBuilder.withLongOpt("quiet")
+- .withDescription("Quiet output - only show errors")
+- .create(QUIET));
+- options.addOption(OptionBuilder.withLongOpt("debug")
+- .withDescription("Produce execution debug output")
+- .create(DEBUG));
+- options.addOption(OptionBuilder.withLongOpt("errors")
+- .withDescription("Produce execution error messages")
+- .create(ERRORS));
++ .desc( "Define a system property" )
++ .build() );
++ options.addOption(Option.builder( HELP )
++ .longOpt( "help" )
++ .desc( "Display help information" )
++ .build() );
++ options.addOption(Option.builder( VERSION )
++ .longOpt( "version" )
++ .desc( "Display version information" )
++ .build() );
++ options.addOption(Option.builder( QUIET )
++ .longOpt( "quiet" )
++ .desc( "Quiet output - only show errors" )
++ .build() );
++ options.addOption(Option.builder( DEBUG )
++ .longOpt( "debug" )
++ .desc( "Produce execution debug output" )
++ .build() );
++ options.addOption(Option.builder( ERRORS )
++ .longOpt( "errors" )
++ .desc( "Produce execution error messages" )
++ .build() );
- return buildCliOptions( options );
+ return buildCliOptions(options);
}
-@@ -369,7 +367,7 @@ public abstract class AbstractCli
+@@ -311,7 +317,7 @@ public abstract class AbstractCli implements Cli {
// We need to eat any quotes surrounding arguments...
- String[] cleanArgs = cleanArgs( args );
+ String[] cleanArgs = cleanArgs(args);
- CommandLineParser parser = new GnuParser();
+ CommandLineParser parser = new DefaultParser();
- return parser.parse( buildDefaultCliOptions(), cleanArgs );
+ return parser.parse(buildDefaultCliOptions(), cleanArgs);
}
diff --git a/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
b/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
-index 35b1a31..416edcc 100644
+index 90f487c..9e2b318 100644
--- a/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
+++ b/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
-@@ -20,7 +20,7 @@ import org.codehaus.plexus.PlexusContainer;
- import org.codehaus.plexus.util.FileUtils;
- import org.apache.commons.cli.Options;
+@@ -19,7 +19,7 @@ package org.codehaus.plexus.tools.cli;
+ import java.io.File;
+
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
+ import org.apache.commons.cli.Options;
+ import org.codehaus.plexus.PlexusContainer;
+ import org.codehaus.plexus.util.FileUtils;
+@@ -33,10 +33,11 @@ public class TestCli extends AbstractCli {
+ }
- import java.io.File;
-
-@@ -39,7 +39,7 @@ public class TestCli
- public Options buildCliOptions( Options options )
- {
- options.addOption(
-- OptionBuilder.withLongOpt( "name" ).withDescription( "Display
name." ).hasArg().create( 'n' ) );
-+ Option.builder( "n" ).longOpt( "name" ).desc( "Display name."
).hasArg().build() );
+ public Options buildCliOptions(Options options) {
+- options.addOption(OptionBuilder.withLongOpt("name")
+- .withDescription("Display name.")
++ options.addOption(Option.builder( "n" )
++ .longOpt( "name" )
++ .desc( "Display name." )
+ .hasArg()
+- .create('n'));
++ .build() );
return options;
}
--
-2.36.1
+2.45.2
++++++ 0002-No-unchecked-operations.patch ++++++
--- /var/tmp/diff_new_pack.Y2GHQr/_old 2024-06-14 19:06:19.452784282 +0200
+++ /var/tmp/diff_new_pack.Y2GHQr/_new 2024-06-14 19:06:19.456784427 +0200
@@ -1,4 +1,4 @@
-From ebc5470ee49188a0bdf07aa39138fc78c76f3698 Mon Sep 17 00:00:00 2001
+From d737f134f7a93b2443db04031fb4f5949ccb3de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Thu, 19 May 2022 09:30:58 +0200
Subject: [PATCH 2/2] No unchecked operations
@@ -8,19 +8,19 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
-index e173774..575c539 100644
+index 7e72f08..9619836 100644
--- a/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
+++ b/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
-@@ -374,7 +374,7 @@ public abstract class AbstractCli
+@@ -323,7 +323,7 @@ public abstract class AbstractCli implements Cli {
+ }
- private static String[] cleanArgs( String[] args )
- {
+ private static String[] cleanArgs(String[] args) {
- List cleaned = new ArrayList();
+ List<String> cleaned = new ArrayList<String>();
StringBuffer currentArg = null;
--
-2.36.1
+2.45.2
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Y2GHQr/_old 2024-06-14 19:06:19.504786169 +0200
+++ /var/tmp/diff_new_pack.Y2GHQr/_new 2024-06-14 19:06:19.508786315 +0200
@@ -2,9 +2,10 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://github.com/codehaus-plexus/plexus-cli.git</param>
- <param name="revision">8927458e81</param>
- <param name="versionformat">1.6</param>
- <param name="filename">plexus-cli</param>
+ <param name="revision">plexus-cli-1.7</param>
+ <param name="match-tag">plexus-cli-*</param>
+ <param name="versionformat">@PARENT_TAG@</param>
+ <param name="versionrewrite-pattern">plexus-cli-(.*)</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ plexus-cli-1.6.tar.xz -> plexus-cli-1.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-cli-1.6/.github/dependabot.yml
new/plexus-cli-1.7/.github/dependabot.yml
--- old/plexus-cli-1.6/.github/dependabot.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/plexus-cli-1.7/.github/dependabot.yml 2023-12-23 22:44:18.000000000
+0100
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-cli-1.6/.github/workflows/maven.yml
new/plexus-cli-1.7/.github/workflows/maven.yml
--- old/plexus-cli-1.6/.github/workflows/maven.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/plexus-cli-1.7/.github/workflows/maven.yml 2023-12-23
22:44:18.000000000 +0100
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+name: GitHub CI
+
+on: [push, pull_request]
+
+jobs:
+ build:
+ name: Build it
+ uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
+
+ deploy:
+ name: Deploy
+ needs: build
+ uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master
+ secrets: inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-cli-1.6/.gitignore
new/plexus-cli-1.7/.gitignore
--- old/plexus-cli-1.6/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/plexus-cli-1.7/.gitignore 2023-12-23 22:44:18.000000000 +0100
@@ -0,0 +1,7 @@
+target/
+.project
+.classpath
+.settings/
+bin
+*.iml
+.idea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-cli-1.6/README.md new/plexus-cli-1.7/README.md
--- old/plexus-cli-1.6/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/plexus-cli-1.7/README.md 2023-12-23 22:44:18.000000000 +0100
@@ -0,0 +1,7 @@
+Plexus-CLI
+===============
+
+[](http://www.apache.org/licenses/)
+[](https://search.maven.org/artifact/org.codehaus.plexus/plexus-cli)
+
+The canonical git repository is located at
https://github.com/codehaus-plexus/plexus-cli
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-cli-1.6/pom.xml new/plexus-cli-1.7/pom.xml
--- old/plexus-cli-1.6/pom.xml 2012-03-01 21:53:05.000000000 +0100
+++ new/plexus-cli-1.7/pom.xml 2023-12-23 22:44:18.000000000 +0100
@@ -1,45 +1,94 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>plexus-components</artifactId>
<groupId>org.codehaus.plexus</groupId>
- <version>1.1.20</version>
+ <artifactId>plexus</artifactId>
+ <version>16</version>
</parent>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cli</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
<name>Plexus CLI</name>
<description>Easily create CLIs with Plexus components</description>
+ <scm>
+
<connection>scm:git:https://github.com/codehaus-plexus/plexus-cli.git</connection>
+
<developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-cli.git</developerConnection>
+ <tag>plexus-cli-1.7</tag>
+
<url>https://github.com/codehaus-plexus/plexus-cli/tree/${project.scm.tag}/</url>
+ </scm>
+ <issueManagement>
+ <system>github</system>
+ <url>https://github.com/codehaus-plexus/plexus-cli/issues</url>
+ </issueManagement>
+ <distributionManagement>
+ <site>
+ <id>github:gh-pages</id>
+ <url>${project.scm.developerConnection}</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+
<project.build.outputTimestamp>2023-12-23T21:44:13Z</project.build.outputTimestamp>
+ </properties>
+
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-34</version>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <version>0.3.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-testing</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <!-- mono-module doesn't require site:stage -->
+ <content>${project.reporting.outputDirectory}</content>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- deploy site with maven-scm-publish-plugin -->
+ <id>scm-publish</id>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-cli-1.6/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
new/plexus-cli-1.7/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
---
old/plexus-cli-1.6/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
2012-03-01 21:53:05.000000000 +0100
+++
new/plexus-cli-1.7/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
2023-12-23 22:44:18.000000000 +0100
@@ -16,6 +16,12 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -31,20 +37,10 @@
import org.codehaus.plexus.classworlds.ClassWorld;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
/**
* @author jason van zyl
- * @version $Id$
- * @noinspection UseOfSystemOutOrSystemErr,ACCESS_STATIC_VIA_INSTANCE
*/
-public abstract class AbstractCli
- implements Cli
-{
+public abstract class AbstractCli implements Cli {
//
----------------------------------------------------------------------------
// These are standard options that we would want to use for all our
projects.
//
----------------------------------------------------------------------------
@@ -65,61 +61,51 @@
// Abstract methods
//
----------------------------------------------------------------------------
- public abstract Options buildCliOptions( Options options );
+ public abstract Options buildCliOptions(Options options);
- public abstract void invokePlexusComponent( CommandLine cli,
- PlexusContainer container )
- throws Exception;
+ public abstract void invokePlexusComponent(CommandLine cli,
PlexusContainer container) throws Exception;
- public String getPomPropertiesPath()
- {
+ public String getPomPropertiesPath() {
return null;
}
- public int execute( String[] args )
- {
- ClassWorld classWorld = new ClassWorld( "plexus.core",
Thread.currentThread().getContextClassLoader() );
+ public int execute(String[] args) {
+ ClassWorld classWorld =
+ new ClassWorld("plexus.core",
Thread.currentThread().getContextClassLoader());
- return execute( args, classWorld );
+ return execute(args, classWorld);
}
- public int execute( String[] args,
- ClassWorld classWorld )
- {
+ public int execute(String[] args, ClassWorld classWorld) {
CommandLine cli;
- try
- {
- cli = parse( args );
- }
- catch ( ParseException e )
- {
- System.err.println( "Unable to parse command line options: " +
e.getMessage() );
+ try {
+ cli = parse(args);
+ } catch (ParseException e) {
+ System.err.println("Unable to parse command line options: " +
e.getMessage());
displayHelp();
return 1;
}
- if ( System.getProperty( "java.class.version", "44.0" ).compareTo(
"48.0" ) < 0 )
- {
- System.err.println( "Sorry, but JDK 1.4 or above is required to
execute Maven" );
+ if (System.getProperty("java.class.version", "44.0").compareTo("48.0")
< 0) {
+ System.err.println("Sorry, but JDK 1.4 or above is required to
execute Maven");
System.err.println(
- "You appear to be using Java version: " + System.getProperty(
"java.version", "<unknown>" ) );
+ "You appear to be using Java version: " +
System.getProperty("java.version", "<unknown>"));
return 1;
}
- boolean debug = cli.hasOption( DEBUG );
+ boolean debug = cli.hasOption(DEBUG);
- boolean quiet = !debug && cli.hasOption( QUIET );
+ boolean quiet = !debug && cli.hasOption(QUIET);
- boolean showErrors = debug || cli.hasOption( ERRORS );
+ boolean showErrors = debug || cli.hasOption(ERRORS);
- if ( showErrors )
- {
- System.out.println( "+ Error stacktraces are turned on." );
+ if (showErrors) {
+ System.out.println("+ Error stacktraces are turned on.");
}
//
----------------------------------------------------------------------------
@@ -128,16 +114,11 @@
int loggingLevel;
- if ( debug )
- {
+ if (debug) {
loggingLevel = 0;
- }
- else if ( quiet )
- {
+ } else if (quiet) {
loggingLevel = 0;
- }
- else
- {
+ } else {
loggingLevel = 0;
}
@@ -145,21 +126,17 @@
// Process particular command line options
//
----------------------------------------------------------------------
- if ( cli.hasOption( HELP ) )
- {
+ if (cli.hasOption(HELP)) {
displayHelp();
return 0;
}
- if ( cli.hasOption( VERSION ) )
- {
+ if (cli.hasOption(VERSION)) {
showVersion();
return 0;
- }
- else if ( debug )
- {
+ } else if (debug) {
showVersion();
}
@@ -167,66 +144,46 @@
// This is what we will generalize for the invocation of the command
line.
//
----------------------------------------------------------------------------
- try
- {
- ContainerConfiguration configuration = new
DefaultContainerConfiguration()
- .setClassWorld( classWorld );
-
- customizeContainerConfiguration( configuration, cli );
-
- PlexusContainer plexus = new DefaultPlexusContainer( configuration
);
-
- invokePlexusComponent( cli, plexus );
- }
- catch ( PlexusContainerException e )
- {
- showFatalError( "Cannot create Plexus container.", e, true );
- }
- catch ( ComponentLookupException e )
- {
- showError( "Cannot lookup application component.", e, true );
- }
- catch ( Exception e )
- {
- showError( "Problem executing command line.", e, true );
+ try {
+ ContainerConfiguration configuration = new
DefaultContainerConfiguration().setClassWorld(classWorld);
+
+ customizeContainerConfiguration(configuration, cli);
+
+ PlexusContainer plexus = new DefaultPlexusContainer(configuration);
+
+ invokePlexusComponent(cli, plexus);
+ } catch (PlexusContainerException e) {
+ showFatalError("Cannot create Plexus container.", e, true);
+ } catch (ComponentLookupException e) {
+ showError("Cannot lookup application component.", e, true);
+ } catch (Exception e) {
+ showError("Problem executing command line.", e, true);
}
return 0;
}
- protected void customizeContainerConfiguration( ContainerConfiguration
configuration, CommandLine cli )
- {
- }
-
- protected int showFatalError( String message,
- Exception e,
- boolean show )
- {
- System.err.println( "FATAL ERROR: " + message );
-
- if ( show )
- {
- System.err.println( "Error stacktrace:" );
+ protected void customizeContainerConfiguration(ContainerConfiguration
configuration, CommandLine cli) {}
+
+ protected int showFatalError(String message, Exception e, boolean show) {
+ System.err.println("FATAL ERROR: " + message);
+
+ if (show) {
+ System.err.println("Error stacktrace:");
e.printStackTrace();
- }
- else
- {
- System.err.println( "For more information, run with the -e flag" );
+ } else {
+ System.err.println("For more information, run with the -e flag");
}
return 1;
}
- protected void showError( String message,
- Exception e,
- boolean show )
- {
- System.err.println( message );
-
- if ( show )
- {
- System.err.println( "Error stacktrace:" );
+ protected void showError(String message, Exception e, boolean show) {
+ System.err.println(message);
+
+ if (show) {
+ System.err.println("Error stacktrace:");
e.printStackTrace();
}
@@ -234,47 +191,38 @@
// Need to get the versions of the application in a general way, so that I
need a way to get the
// specifics of the application so that I can do this in a general way.
- private void showVersion()
- {
+ private void showVersion() {
InputStream is;
- try
- {
+ try {
Properties properties = new Properties();
String pomPropertiesPath = getPomPropertiesPath();
- if ( pomPropertiesPath == null )
- {
- System.err.println( "Unable determine version from JAR file."
);
+ if (pomPropertiesPath == null) {
+ System.err.println("Unable determine version from JAR file.");
return;
}
- is = AbstractCli.class.getClassLoader().getResourceAsStream(
pomPropertiesPath );
+ is =
AbstractCli.class.getClassLoader().getResourceAsStream(pomPropertiesPath);
- if ( is == null )
- {
- System.err.println( "Unable determine version from JAR file."
);
+ if (is == null) {
+ System.err.println("Unable determine version from JAR file.");
return;
}
- properties.load( is );
+ properties.load(is);
- if ( properties.getProperty( "builtOn" ) != null )
- {
- System.out.println( "Version: " + properties.getProperty(
"version", "unknown" ) + " built on " +
- properties.getProperty( "builtOn" ) );
- }
- else
- {
- System.out.println( "Version: " + properties.getProperty(
"version", "unknown" ) );
+ if (properties.getProperty("builtOn") != null) {
+ System.out.println("Version: " +
properties.getProperty("version", "unknown") + " built on "
+ + properties.getProperty("builtOn"));
+ } else {
+ System.out.println("Version: " +
properties.getProperty("version", "unknown"));
}
- }
- catch ( IOException e )
- {
- System.err.println( "Unable determine version from JAR file: " +
e.getMessage() );
+ } catch (IOException e) {
+ System.err.println("Unable determine version from JAR file: " +
e.getMessage());
}
}
@@ -282,8 +230,7 @@
// System properties handling
// ----------------------------------------------------------------------
- private Properties getExecutionProperties( CommandLine commandLine )
- {
+ private Properties getExecutionProperties(CommandLine commandLine) {
Properties executionProperties = new Properties();
//
----------------------------------------------------------------------
@@ -292,142 +239,127 @@
// are most dominant.
//
----------------------------------------------------------------------
- if ( commandLine.hasOption( SET_SYSTEM_PROPERTY ) )
- {
- String[] defStrs = commandLine.getOptionValues(
SET_SYSTEM_PROPERTY );
-
- for ( int i = 0; i < defStrs.length; ++i )
- {
- setCliProperty( defStrs[i], executionProperties );
+ if (commandLine.hasOption(SET_SYSTEM_PROPERTY)) {
+ String[] defStrs =
commandLine.getOptionValues(SET_SYSTEM_PROPERTY);
+
+ for (int i = 0; i < defStrs.length; ++i) {
+ setCliProperty(defStrs[i], executionProperties);
}
}
- executionProperties.putAll( System.getProperties() );
+ executionProperties.putAll(System.getProperties());
return executionProperties;
}
- private void setCliProperty( String property,
- Properties executionProperties )
- {
+ private void setCliProperty(String property, Properties
executionProperties) {
String name;
String value;
- int i = property.indexOf( "=" );
+ int i = property.indexOf("=");
- if ( i <= 0 )
- {
+ if (i <= 0) {
name = property.trim();
value = "true";
- }
- else
- {
- name = property.substring( 0, i ).trim();
+ } else {
+ name = property.substring(0, i).trim();
- value = property.substring( i + 1 ).trim();
+ value = property.substring(i + 1).trim();
}
- executionProperties.setProperty( name, value );
+ executionProperties.setProperty(name, value);
//
----------------------------------------------------------------------
// I'm leaving the setting of system properties here as not to break
// the SystemPropertyProfileActivator. This won't harm embedding. jvz.
//
----------------------------------------------------------------------
- System.setProperty( name, value );
+ System.setProperty(name, value);
}
private Options options;
- public Options buildDefaultCliOptions()
- {
+ public Options buildDefaultCliOptions() {
options = new Options();
- options.addOption(
- OptionBuilder.withLongOpt( "define" ).hasArg().withDescription(
"Define a system property" ).create(
- SET_SYSTEM_PROPERTY ) );
- options.addOption(
- OptionBuilder.withLongOpt( "help" ).withDescription( "Display help
information" ).create( HELP ) );
- options.addOption(
- OptionBuilder.withLongOpt( "version" ).withDescription( "Display
version information" ).create( VERSION ) );
- options.addOption(
- OptionBuilder.withLongOpt( "quiet" ).withDescription( "Quiet
output - only show errors" ).create( QUIET ) );
- options.addOption(
- OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce
execution debug output" ).create( DEBUG ) );
- options.addOption(
- OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce
execution error messages" ).create(
- ERRORS ) );
-
- return buildCliOptions( options );
- }
-
- public CommandLine parse( String[] args )
- throws ParseException
- {
+ options.addOption(OptionBuilder.withLongOpt("define")
+ .hasArg()
+ .withDescription("Define a system property")
+ .create(SET_SYSTEM_PROPERTY));
+ options.addOption(OptionBuilder.withLongOpt("help")
+ .withDescription("Display help information")
+ .create(HELP));
+ options.addOption(OptionBuilder.withLongOpt("version")
+ .withDescription("Display version information")
+ .create(VERSION));
+ options.addOption(OptionBuilder.withLongOpt("quiet")
+ .withDescription("Quiet output - only show errors")
+ .create(QUIET));
+ options.addOption(OptionBuilder.withLongOpt("debug")
+ .withDescription("Produce execution debug output")
+ .create(DEBUG));
+ options.addOption(OptionBuilder.withLongOpt("errors")
+ .withDescription("Produce execution error messages")
+ .create(ERRORS));
+
+ return buildCliOptions(options);
+ }
+
+ public CommandLine parse(String[] args) throws ParseException {
// We need to eat any quotes surrounding arguments...
- String[] cleanArgs = cleanArgs( args );
+ String[] cleanArgs = cleanArgs(args);
CommandLineParser parser = new GnuParser();
- return parser.parse( buildDefaultCliOptions(), cleanArgs );
+ return parser.parse(buildDefaultCliOptions(), cleanArgs);
}
- private static String[] cleanArgs( String[] args )
- {
+ private static String[] cleanArgs(String[] args) {
List cleaned = new ArrayList();
StringBuffer currentArg = null;
- for ( int i = 0; i < args.length; i++ )
- {
+ for (int i = 0; i < args.length; i++) {
String arg = args[i];
boolean addedToBuffer = false;
- if ( arg.startsWith( "\"" ) )
- {
+ if (arg.startsWith("\"")) {
// if we're in the process of building up another arg, push it
and start over.
// this is for the case: "-Dfoo=bar "-Dfoo2=bar two" (note the
first unterminated quote)
- if ( currentArg != null )
- {
- cleaned.add( currentArg.toString() );
+ if (currentArg != null) {
+ cleaned.add(currentArg.toString());
}
// start building an argument here.
- currentArg = new StringBuffer( arg.substring( 1 ) );
+ currentArg = new StringBuffer(arg.substring(1));
addedToBuffer = true;
}
// this has to be a separate "if" statement, to capture the case
of: "-Dfoo=bar"
- if ( arg.endsWith( "\"" ) )
- {
- String cleanArgPart = arg.substring( 0, arg.length() - 1 );
+ if (arg.endsWith("\"")) {
+ String cleanArgPart = arg.substring(0, arg.length() - 1);
// if we're building an argument, keep doing so.
- if ( currentArg != null )
- {
+ if (currentArg != null) {
// if this is the case of "-Dfoo=bar", then we need to
adjust the buffer.
- if ( addedToBuffer )
- {
- currentArg.setLength( currentArg.length() - 1 );
+ if (addedToBuffer) {
+ currentArg.setLength(currentArg.length() - 1);
}
// otherwise, we trim the trailing " and append to the
buffer.
- else
- {
+ else {
// TODO: introducing a space here...not sure what else
to do but collapse whitespace
- currentArg.append( ' ' ).append( cleanArgPart );
+ currentArg.append(' ').append(cleanArgPart);
}
// we're done with this argument, so add it.
- cleaned.add( currentArg.toString() );
- }
- else
- {
+ cleaned.add(currentArg.toString());
+ } else {
// this is a simple argument...just add it.
- cleaned.add( cleanArgPart );
+ cleaned.add(cleanArgPart);
}
// the currentArg MUST be finished when this completes.
@@ -440,49 +372,41 @@
// buffer, then append it with a preceding space...again, not sure
what else to
// do other than collapse whitespace.
// NOTE: The case of a trailing quote is handled by nullifying the
arg buffer.
- if ( !addedToBuffer )
- {
+ if (!addedToBuffer) {
// append to the argument we're building, collapsing
whitespace to a single space.
- if ( currentArg != null )
- {
- currentArg.append( ' ' ).append( arg );
+ if (currentArg != null) {
+ currentArg.append(' ').append(arg);
}
// this is a loner, just add it directly.
- else
- {
- cleaned.add( arg );
+ else {
+ cleaned.add(arg);
}
}
}
// clean up.
- if ( currentArg != null )
- {
- cleaned.add( currentArg.toString() );
+ if (currentArg != null) {
+ cleaned.add(currentArg.toString());
}
int cleanedSz = cleaned.size();
String[] cleanArgs = null;
- if ( cleanedSz == 0 )
- {
+ if (cleanedSz == 0) {
// if we didn't have any arguments to clean, simply pass the
original array through
cleanArgs = args;
- }
- else
- {
- cleanArgs = (String[]) cleaned.toArray( new String[cleanedSz] );
+ } else {
+ cleanArgs = (String[]) cleaned.toArray(new String[cleanedSz]);
}
return cleanArgs;
}
- public void displayHelp()
- {
+ public void displayHelp() {
System.out.println();
HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp( "mvn [options] [<goal(s)>] [<phase(s)>]",
"\nOptions:", options, "\n" );
+ formatter.printHelp("mvn [options] [<goal(s)>] [<phase(s)>]",
"\nOptions:", options, "\n");
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-cli-1.6/src/main/java/org/codehaus/plexus/tools/cli/Cli.java
new/plexus-cli-1.7/src/main/java/org/codehaus/plexus/tools/cli/Cli.java
--- old/plexus-cli-1.6/src/main/java/org/codehaus/plexus/tools/cli/Cli.java
2012-03-01 21:53:05.000000000 +0100
+++ new/plexus-cli-1.7/src/main/java/org/codehaus/plexus/tools/cli/Cli.java
2023-12-23 22:44:18.000000000 +0100
@@ -16,20 +16,17 @@
* limitations under the License.
*/
-import org.codehaus.plexus.PlexusContainer;
-import org.apache.commons.cli.Options;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Options;
+import org.codehaus.plexus.PlexusContainer;
/**
* @author Jason van Zyl
*/
-public interface Cli
-{
- Options buildCliOptions( Options options );
+public interface Cli {
+ Options buildCliOptions(Options options);
- void invokePlexusComponent( CommandLine cli,
- PlexusContainer container )
- throws Exception;
+ void invokePlexusComponent(CommandLine cli, PlexusContainer container)
throws Exception;
// this can be calculated
String getPomPropertiesPath();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-cli-1.6/src/site/site.xml
new/plexus-cli-1.7/src/site/site.xml
--- old/plexus-cli-1.6/src/site/site.xml 2012-03-01 21:53:05.000000000
+0100
+++ new/plexus-cli-1.7/src/site/site.xml 2023-12-23 22:44:18.000000000
+0100
@@ -1,4 +1,15 @@
-<project name="Plexus Interpolation"
xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-cli-1.6/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java
new/plexus-cli-1.7/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java
--- old/plexus-cli-1.6/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java
2012-03-01 21:53:05.000000000 +0100
+++ new/plexus-cli-1.7/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java
2023-12-23 22:44:18.000000000 +0100
@@ -16,40 +16,38 @@
* limitations under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
+import java.io.File;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.io.File;
+
+import org.codehaus.plexus.util.FileUtils;
+import org.junit.jupiter.api.Test;
+
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Jason van Zyl
*/
-public class CliTest
- extends PlexusTestCase
-{
- public void testCli()
- throws Exception
- {
- String[] args = new String[]{"-n", getBasedir()};
+class CliTest {
+ @Test
+ void cli() throws Exception {
+ String[] args = new String[] {"-n", getBasedir()};
Class clazz = TestCli.class;
- Method m = clazz.getMethod( "main", new Class[]{String[].class} );
+ Method m = clazz.getMethod("main", new Class[] {String[].class});
int modifiers = m.getModifiers();
- if ( Modifier.isStatic( modifiers ) && Modifier.isPublic( modifiers ) )
- {
- if ( m.getReturnType() == Integer.TYPE || m.getReturnType() ==
Void.TYPE )
- {
- m.invoke( clazz, new Object[]{args} );
+ if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
+ if (m.getReturnType() == Integer.TYPE || m.getReturnType() ==
Void.TYPE) {
+ m.invoke(clazz, new Object[] {args});
}
}
- String s = FileUtils.fileRead( new File( getBasedir(),
"target/cli.txt" ) );
+ String s = FileUtils.fileRead(new File(getBasedir(),
"target/cli.txt"));
- assertEquals( "NAME_OPTION_INVOKED", s );
+ assertEquals("NAME_OPTION_INVOKED", s);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plexus-cli-1.6/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
new/plexus-cli-1.7/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
--- old/plexus-cli-1.6/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
2012-03-01 21:53:05.000000000 +0100
+++ new/plexus-cli-1.7/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
2023-12-23 22:44:18.000000000 +0100
@@ -16,45 +16,38 @@
* limitations under the License.
*/
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.util.FileUtils;
-import org.apache.commons.cli.Options;
+import java.io.File;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.OptionBuilder;
-
-import java.io.File;
+import org.apache.commons.cli.Options;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.util.FileUtils;
/**
* @author Jason van Zyl
*/
-public class TestCli
- extends AbstractCli
-{
- public static void main( String[] args )
- throws Exception
- {
- new TestCli().execute( args );
+public class TestCli extends AbstractCli {
+ public static void main(String[] args) throws Exception {
+ new TestCli().execute(args);
}
- public Options buildCliOptions( Options options )
- {
- options.addOption(
- OptionBuilder.withLongOpt( "name" ).withDescription( "Display
name." ).hasArg().create( 'n' ) );
+ public Options buildCliOptions(Options options) {
+ options.addOption(OptionBuilder.withLongOpt("name")
+ .withDescription("Display name.")
+ .hasArg()
+ .create('n'));
return options;
}
- public void invokePlexusComponent( CommandLine cli,
- PlexusContainer container )
- throws Exception
- {
- if ( cli.hasOption( 'n' ) )
- {
- String directory = cli.getOptionValue( 'n' );
+ public void invokePlexusComponent(CommandLine cli, PlexusContainer
container) throws Exception {
+ if (cli.hasOption('n')) {
+ String directory = cli.getOptionValue('n');
- FileUtils.mkdir( new File( directory, "target" ).getAbsolutePath()
);
+ FileUtils.mkdir(new File(directory, "target").getAbsolutePath());
- FileUtils.fileWrite( new File( directory,
"target/cli.txt").getAbsolutePath() , "NAME_OPTION_INVOKED" );
+ FileUtils.fileWrite(new File(directory,
"target/cli.txt").getAbsolutePath(), "NAME_OPTION_INVOKED");
}
}
}
++++++ plexus-cli-build.xml ++++++
--- /var/tmp/diff_new_pack.Y2GHQr/_old 2024-06-14 19:06:19.592789364 +0200
+++ /var/tmp/diff_new_pack.Y2GHQr/_new 2024-06-14 19:06:19.596789510 +0200
@@ -1,20 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 2/21/19 7:19 AM -->
-<!-- See: http://apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
<project name="plexus-cli" default="package" basedir=".">
<!-- ======================================================================
-->
@@ -25,9 +10,10 @@
<property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.artifactId" value="plexus-cli"/>
- <property name="project.version" value="1.6"/>
+ <property name="project.version" value="1.7"/>
- <property name="compiler.source" value="1.8"/>
+ <property name="compiler.release" value="8"/>
+ <property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
@@ -35,10 +21,7 @@
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
- <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
- <property name="build.testDir" value="src/test/java"/>
- <property name="build.testResourceDir" value="src/test/resources"/>
- <property name="test.reports" value="${build.dir}/test-reports"/>
+
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ======================================================================
-->
@@ -47,15 +30,11 @@
<path id="build.classpath">
<fileset dir="lib">
- <!-- plexus-container-default-1.0-alpha-34 plexus-classworlds-2.4
- plexus-utils-3.0 commons-cli-1.0 -->
<include name="**/*"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
- <!-- plexus-container-default-1.0-alpha-34 plexus-classworlds-2.4
- plexus-utils-3.0 commons-cli-1.0 junit-3.8.2 guava-20.0 -->
<include name="**/*"/>
</fileset>
</path>
@@ -79,6 +58,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -91,95 +71,6 @@
</target>
<!-- ======================================================================
-->
- <!-- Test-compilation target
-->
- <!-- ======================================================================
-->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="test.skip">
- <mkdir dir="${build.testOutputDir}"/>
- <javac destdir="${build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="${compiler.target}"
- verbose="false"
- fork="false"
- source="${compiler.source}">
- <src>
- <pathelement location="${build.testDir}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Run all tests
-->
- <!-- ======================================================================
-->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true"
fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${build.outputDir}"/>
- <pathelement location="${build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${test.reports}" unless="test">
- <fileset dir="${build.testDir}">
- <include name="**/CliTest.java"/>
- <exclude name="**/TestCli.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${test.reports}" if="test">
- <fileset dir="${build.testDir}">
- <include name="**/${test}.java"/>
- <exclude name="**/TestCli.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"
classpathref="build.test.classpath"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING
===================================</echo>
- <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib
directory. Tests not executed.</echo>
-
<echo>===============================================================================</echo>
- </target>
-
- <!-- ======================================================================
-->
<!-- Javadoc target
-->
<!-- ======================================================================
-->
@@ -211,7 +102,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="compile,test" description="Package the
application">
+ <target name="package" depends="compile" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
