[Git][java-team/plexus-io][master] 7 commits: Standards-Version updated to 4.6.0.1
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue May 3 17:45:00 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-io
Commits:
bbb259f6 by Emmanuel Bourg at 2022-05-03T18:01:54+02:00
Standards-Version updated to 4.6.0.1
- - - - -
ce400285 by Emmanuel Bourg at 2022-05-03T18:01:59+02:00
Switch to debhelper level 13
- - - - -
037954a5 by Emmanuel Bourg at 2022-05-03T18:03:40+02:00
New upstream version 3.3.0
- - - - -
05491d2c by Emmanuel Bourg at 2022-05-03T18:04:37+02:00
New upstream version 3.3.1
- - - - -
4aa4cdab by Emmanuel Bourg at 2022-05-03T18:04:37+02:00
Update upstream source from tag 'upstream/3.3.1'
Update to upstream version '3.3.1'
with Debian dir 26bd78c0da35a9016553bcb21ac171d641e8fe23
- - - - -
b208b2bb by Emmanuel Bourg at 2022-05-03T18:10:11+02:00
Refreshed the patch
- - - - -
9a4e7b9f by Emmanuel Bourg at 2022-05-03T18:44:31+02:00
Upload to unstable
- - - - -
15 changed files:
- + .github/dependabot.yml
- + .github/release-drafter.yml
- + .github/workflows/codeql-analysis.yml
- + .github/workflows/maven.yml
- + .github/workflows/release-drafter.yml
- − .travis.yml
- README.md
- debian/changelog
- debian/control
- debian/patches/01-backward-compatibility.patch
- pom.xml
- src/main/java/org/codehaus/plexus/components/io/filemappers/package.html
- src/main/java/org/codehaus/plexus/components/io/fileselectors/package.html
- src/main/java/org/codehaus/plexus/components/io/resources/package.html
- src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java
Changes:
=====================================
.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"
=====================================
.github/release-drafter.yml
=====================================
@@ -0,0 +1,3 @@
+_extends: .github
+tag-template: plexus-io-$NEXT_MINOR_VERSION
+name-template: plexus-io-$NEXT_MINOR_VERSION
=====================================
.github/workflows/codeql-analysis.yml
=====================================
@@ -0,0 +1,67 @@
+# 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: '24 19 * * 0'
+
+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 at v3.0.2
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init at v2
+ 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 at 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 at v2
+
+ # ℹ️ 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 at v2
=====================================
.github/workflows/maven.yml
=====================================
@@ -0,0 +1,25 @@
+# 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 with Maven
+ uses: codehaus-plexus/.github/.github/workflows/maven.yml at v0.0.4
=====================================
.github/workflows/release-drafter.yml
=====================================
@@ -0,0 +1,26 @@
+# 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: Release Drafter
+on:
+ push:
+ branches:
+ - master
+jobs:
+ update_release_draft:
+ name: Update Release Notes Draft
+ uses: codehaus-plexus/.github/.github/workflows/release-drafter.yml at v0.0.4
=====================================
.travis.yml deleted
=====================================
@@ -1,23 +0,0 @@
-language: java
-jdk:
- - openjdk7
- - oraclejdk8
-
-dist: trusty
-
-# 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:
- - kama at soebes.de
=====================================
README.md
=====================================
@@ -2,7 +2,7 @@ Plexus-IO
=========
[](https://travis-ci.org/codehaus-plexus/plexus-io)
-[](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%plexus-io%22)
+[](https://search.maven.org/artifact/org.codehaus.plexus/plexus-io)
The current master is now at https://github.com/codehaus-plexus/plexus-io
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+plexus-io (3.3.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patch
+ * Standards-Version updated to 4.6.0.1
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 03 May 2022 18:16:02 +0200
+
plexus-io (3.2.0-1) unstable; urgency=medium
* New upstream version 3.2.0
=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Uploaders:
Ludovic Claude <ludovic.claude at laposte.net>,
tony mancill <tmancill at debian.org>
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk,
junit4,
libcommons-io-java,
@@ -16,7 +16,7 @@ Build-Depends:
libplexus-container-default1.5-java,
libplexus-utils2-java,
maven-debian-helper (>= 2.2)
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0.1
Vcs-Git: https://salsa.debian.org/java-team/plexus-io.git
Vcs-Browser: https://salsa.debian.org/java-team/plexus-io
Homepage: https://github.com/codehaus-plexus/plexus-io
=====================================
debian/patches/01-backward-compatibility.patch
=====================================
@@ -60,13 +60,13 @@ Forwarded: not-needed
+}
--- a/pom.xml
+++ b/pom.xml
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
- <version>1.0-alpha-30</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
--- /dev/null
=====================================
pom.xml
=====================================
@@ -4,11 +4,11 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
- <version>5.1</version>
+ <version>8</version>
</parent>
<artifactId>plexus-io</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
<name>Plexus IO Components</name>
@@ -16,7 +16,7 @@
<connection>scm:git:git at github.com:codehaus-plexus/plexus-io.git</connection>
<developerConnection>scm:git:git at github.com:codehaus-plexus/plexus-io.git</developerConnection>
<url>http://github.com/codehaus-plexus/plexus-io</url>
- <tag>plexus-io-3.2.0</tag>
+ <tag>plexus-io-3.3.1</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -31,20 +31,21 @@
<properties>
<cobertura.skip>true</cobertura.skip>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
+ <project.build.outputTimestamp>2022-05-02T06:08:27Z</project.build.outputTimestamp>
</properties>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<scope>test</scope>
- <version>1.0-alpha-30</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -55,12 +56,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
@@ -68,10 +69,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
@@ -92,17 +89,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>never</forkMode>
+ <forkMode>never</forkMode>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -126,7 +115,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.12</version>
+ <version>1.21</version>
<executions>
<execution>
<id>sniff</id>
@@ -144,6 +133,16 @@
</signature>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <!--
+ maven totally change his way to copy symlink
+ this mean the symlink is copied as a symlink and not anymore as a new file
+ https://issues.apache.org/jira/browse/MRESOURCES-237
+ -->
+ <version>2.7</version>
+ </plugin>
</plugins>
</build>
</project>
=====================================
src/main/java/org/codehaus/plexus/components/io/filemappers/package.html
=====================================
@@ -1,5 +1,5 @@
<html><head><title>File Mappers</title></head>
-<body><h1>File Mappers</h1>
+<body><p><b>File Mappers</b></p>
<p>File mappers can be used, for example, when files are being copied, moved, archived, or unarchived.
The purpose of a file mapper is to select the target files name and destination.</p>
<p>Examples:</p>
=====================================
src/main/java/org/codehaus/plexus/components/io/fileselectors/package.html
=====================================
@@ -1,5 +1,5 @@
<html><head><title>File Selectors</title></head>
-<body><h1>File Selectors</h1>
+<body><p><b>File Selectors</b></p>
<p>File selectors can be used to select or deselect a subset of files.
For example, the plexus archivers or unarchivers use file selectors
for selecting a subset of files in a directory.</p>
=====================================
src/main/java/org/codehaus/plexus/components/io/resources/package.html
=====================================
@@ -1,5 +1,5 @@
<html><head><title>Resources and Resource Collections</title></head>
-<body><h1>Resources and Resource Collections</h1>
+<body><p><b>Resources and Resource Collections</b></p>
<p>This package implements ideas, which have been shamelessly
copied from Ants resource collection framework. Basically,
a resource is an abstraction of file-like entities: An actual
=====================================
src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java
=====================================
@@ -23,6 +23,7 @@ public void testRealSymlink()
assertTrue( attrs.isSymbolicLink() );
PlexusIoFileResource r = new PlexusIoFileResource( file, "symDir", attrs );
assertTrue( r.isSymbolicLink() );
+ assertTrue( r.isDirectory() );
final File target = SymlinkUtils.readSymbolicLink( file );
assertTrue( target.getName().endsWith( "targetDir" ) );
}
View it on GitLab: https://salsa.debian.org/java-team/plexus-io/-/compare/08449ab8796068cd2f3b6e01400bd512596d61bd...9a4e7b9f0af4b95eb31068e2031d3a9adffa0a8c
--
View it on GitLab: https://salsa.debian.org/java-team/plexus-io/-/compare/08449ab8796068cd2f3b6e01400bd512596d61bd...9a4e7b9f0af4b95eb31068e2031d3a9adffa0a8c
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/20220503/298af60c/attachment.htm>
More information about the pkg-java-commits
mailing list