New Upstream Snapshot - plexus-interactivity-api
Ready changes
Summary
Merged new upstream version: 1.1+git20220911.1.5e9568b (was: 1.1).
Resulting package
Built on 2022-10-09T20:39 (took 8m25s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libplexus-interactivity-api-java
Lintian Result
Diff
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..b76b895
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 0000000..8ae0341
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,2 @@
+_extends: .github
+tag-template: plexus-interactivity-$NEXT_MINOR_VERSION
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 216b262..0000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
- push:
- branches: [ master ]
- pull_request:
- # The branches below must be a subset of the branches above
- branches: [ master ]
- schedule:
- - cron: '33 3 * * 1'
-
-jobs:
- analyze:
- name: Analyze
- runs-on: ubuntu-latest
-
- strategy:
- fail-fast: false
- matrix:
- language: [ 'java' ]
- # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
- # Learn more:
- # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v2
-
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
-
- # ℹ️ Command-line programs to run using the OS shell.
- # 📚 https://git.io/JvXDl
-
- # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
-
- #- run: |
- # make bootstrap
- # make release
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..f7b2541
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,45 @@
+# 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:
+
+ strategy:
+ matrix:
+ os: [ubuntu-latest,windows-latest, macOS-latest]
+ java: [8, 11, 17]
+ jdk: [adopt-hotspot, zulu, temurin]
+ fail-fast: false
+
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ - name: Set up JDK
+ uses: actions/setup-java@v3
+ with:
+ cache: 'maven'
+ distribution: ${{ matrix.jdk }}
+ java-version: ${{ matrix.java }}
+
+ - name: Build with Maven
+ run: mvn install javadoc:javadoc -e -B -V
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 0000000..4000f8c
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,12 @@
+name: Release Drafter
+on:
+ push:
+ branches:
+ - master
+jobs:
+ update_release_draft:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: release-drafter/release-drafter@v5
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/debian/changelog b/debian/changelog
index f9a4b23..9ab24f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plexus-interactivity-api (1.1+git20220911.1.5e9568b-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 09 Oct 2022 20:33:10 -0000
+
plexus-interactivity-api (1.1-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/dependency_management.patch b/debian/patches/dependency_management.patch
index 68d64c1..0f5138a 100644
--- a/debian/patches/dependency_management.patch
+++ b/debian/patches/dependency_management.patch
@@ -6,9 +6,11 @@ Bug-Debian: https://bugs.debian.org/1021485
Forwarded: https://github.com/codehaus-plexus/plexus-interactivity/issues/34
Last-Update: 2022-10-09
---- a/pom.xml
-+++ b/pom.xml
-@@ -52,4 +52,18 @@
+Index: plexus-interactivity-api.git/pom.xml
+===================================================================
+--- plexus-interactivity-api.git.orig/pom.xml
++++ plexus-interactivity-api.git/pom.xml
+@@ -51,4 +51,18 @@
</plugins>
</build>
diff --git a/plexus-interactivity-api/pom.xml b/plexus-interactivity-api/pom.xml
index 367cdbd..3d74ecc 100644
--- a/plexus-interactivity-api/pom.xml
+++ b/plexus-interactivity-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>plexus-interactivity</artifactId>
<groupId>org.codehaus.plexus</groupId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<artifactId>plexus-interactivity-api</artifactId>
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
index 35b642a..ce4f87a 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
@@ -40,10 +40,10 @@ public abstract class AbstractInputHandler
extends AbstractLogEnabled
implements InputHandler
{
- public List readMultipleLines()
+ public List<String> readMultipleLines()
throws IOException
{
- List lines = new ArrayList();
+ List<String> lines = new ArrayList<>();
String line = readLine();
while ( line != null && line.length() > 0 )
{
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
index cc95e3d..75855f1 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
@@ -24,7 +24,6 @@ package org.codehaus.plexus.components.interactivity;
* SOFTWARE.
*/
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java
index b7de00e..43942b8 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java
@@ -100,7 +100,7 @@ public class DefaultPrompter
}
}
- public String prompt( String message, List possibleValues, String defaultReply )
+ public String prompt( String message, List<String> possibleValues, String defaultReply )
throws PrompterException
{
String formattedMessage = formatMessage( message, possibleValues, defaultReply );
@@ -152,7 +152,7 @@ public class DefaultPrompter
return line;
}
- public String prompt( String message, List possibleValues )
+ public String prompt( String message, List<String> possibleValues )
throws PrompterException
{
return prompt( message, possibleValues, null );
@@ -180,9 +180,9 @@ public class DefaultPrompter
}
}
- private String formatMessage( String message, List possibleValues, String defaultReply )
+ private String formatMessage( String message, List<String> possibleValues, String defaultReply )
{
- StringBuffer formatted = new StringBuffer( message.length() * 2 );
+ StringBuilder formatted = new StringBuilder( message.length() * 2 );
formatted.append( message );
@@ -190,9 +190,9 @@ public class DefaultPrompter
{
formatted.append( " (" );
- for ( Iterator it = possibleValues.iterator(); it.hasNext(); )
+ for ( Iterator<String> it = possibleValues.iterator(); it.hasNext(); )
{
- String possibleValue = (String) it.next();
+ String possibleValue = it.next();
formatted.append( possibleValue );
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java
index ca0ea24..14a0342 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java
@@ -30,9 +30,9 @@ import java.io.IOException;
/**
* Manage user input from different sources.
*
- * @todo should this also echo any prompts before the input?
- * @todo should this validate the input, reprompt if required?
- * @todo readBoolean, readInt, readSingleChar - readLine's that parse the input
+ * TODO should this also echo any prompts before the input?
+ * TODO should this validate the input, reprompt if required?
+ * TODO readBoolean, readInt, readSingleChar - readLine's that parse the input
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
@@ -61,6 +61,6 @@ public interface InputHandler
* Ends when an empty line is encountered.
* @return a list of lines read
*/
- List readMultipleLines()
+ List<String> readMultipleLines()
throws IOException;
}
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java
index 016597c..bd9b37c 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java
@@ -42,10 +42,10 @@ public interface Prompter
String prompt( String message, String defaultReply )
throws PrompterException;
- String prompt( String message, List possibleValues )
+ String prompt( String message, List<String> possibleValues )
throws PrompterException;
- String prompt( String message, List possibleValues, String defaultReply )
+ String prompt( String message, List<String> possibleValues, String defaultReply )
throws PrompterException;
String promptForPassword( String message )
diff --git a/plexus-interactivity-jline/pom.xml b/plexus-interactivity-jline/pom.xml
index c5a938f..c50420e 100644
--- a/plexus-interactivity-jline/pom.xml
+++ b/plexus-interactivity-jline/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>plexus-interactivity</artifactId>
<groupId>org.codehaus.plexus</groupId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<artifactId>plexus-interactivity-jline</artifactId>
diff --git a/pom.xml b/pom.xml
index 6fa0e5e..267960d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>plexus-components</artifactId>
<groupId>org.codehaus.plexus</groupId>
- <version>6.5</version>
+ <version>10.0</version>
</parent>
<artifactId>plexus-interactivity</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Plexus Interactivity Handler Component</name>
@@ -17,7 +17,6 @@
<connection>${scm.url}</connection>
<developerConnection>${scm.url}</developerConnection>
<url>https://github.com/codehaus-plexus/plexus-interactivity</url>
- <tag>plexus-interactivity-1.1</tag>
</scm>
<issueManagement>
<system>github</system>
@@ -32,7 +31,7 @@
<properties>
<scm.url>scm:git:https://github.com/codehaus-plexus/plexus-interactivity.git</scm.url>
- <project.build.outputTimestamp>2021-09-11T07:18:40Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2021-09-11T07:20:06Z</project.build.outputTimestamp>
</properties>
<modules>
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-interactivity-api/1.2-SNAPSHOT/plexus-interactivity-api-1.2-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-interactivity/1.2-SNAPSHOT/plexus-interactivity-1.2-SNAPSHOT.pom lrwxrwxrwx root/root /usr/share/java/plexus-interactivity-api-1.2-SNAPSHOT.jar -> plexus-interactivity-api.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-interactivity-api/1.2-SNAPSHOT/plexus-interactivity-api-1.2-SNAPSHOT.jar -> ../../../../../../java/plexus-interactivity-api.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-interactivity-api/1.1/plexus-interactivity-api-1.1.pom -rw-r--r-- root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-interactivity/1.1/plexus-interactivity-1.1.pom lrwxrwxrwx root/root /usr/share/java/plexus-interactivity-api-1.1.jar -> plexus-interactivity-api.jar lrwxrwxrwx root/root /usr/share/maven-repo/org/codehaus/plexus/plexus-interactivity-api/1.1/plexus-interactivity-api-1.1.jar -> ../../../../../../java/plexus-interactivity-api.jar
No differences were encountered in the control files