[Git][java-team/gradle][master] 12 commits: Add patch for backporting capabilities
Andrej Shadura
gitlab at salsa.debian.org
Mon Aug 24 16:11:39 BST 2020
Andrej Shadura pushed to branch master at Debian Java Maintainers / gradle
Commits:
fe677c53 by Samyak Jain at 2020-08-13T16:29:56+05:30
Add patch for backporting capabilities
- - - - -
9cee0dc5 by Samyak Jain at 2020-08-13T16:30:18+05:30
Add patch for backporting CommandLineArgumentProvider
- - - - -
5692af37 by Samyak Jain at 2020-08-13T16:30:36+05:30
Add patch for backporting ComponentWithCoordinates
- - - - -
cd4de7ee by Samyak Jain at 2020-08-13T16:30:58+05:30
Add patch for backporting DependencyConstraint
- - - - -
ea565485 by Samyak Jain at 2020-08-13T16:31:20+05:30
Add patch for backporting FeaturePreviews
- - - - -
ba293a44 by Samyak Jain at 2020-08-13T16:31:40+05:30
Add patch for backporting NamedDomainObjectProvider
- - - - -
fbf2947e by Samyak Jain at 2020-08-13T16:32:11+05:30
Add patch for backporting TaskProvider
- - - - -
8c93dd0b by Samyak Jain at 2020-08-13T16:34:45+05:30
Bump debhelper-compat version to 13
- - - - -
fe4c2870 by Samyak Jain at 2020-08-13T16:35:12+05:30
Updates d/changelog for 4.4.1-12 release
- - - - -
2899f36d by Andrej Shadura at 2020-08-20T17:16:06+02:00
Fix the AsciiDoc-to-POD conversion
- - - - -
d24d5536 by Andrej Shadura at 2020-08-20T17:16:56+02:00
Update the changelog
- - - - -
06588fe9 by Andrej Shadura at 2020-08-24T17:11:25+02:00
Bump libguava-java dependency to 23.0
- - - - -
12 changed files:
- debian/changelog
- debian/control
- debian/gradle.pod.in
- + debian/patches/backport-CommandLineArgumentProvider.patch
- + debian/patches/backport-ComponentWithCoordinates.patch
- + debian/patches/backport-DependencyConstraint.patch
- + debian/patches/backport-FeaturePreviews.patch
- + debian/patches/backport-NamedDomainObjectProvider.patch
- + debian/patches/backport-TaskProvider.patch
- + debian/patches/backport-capabilities.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+gradle (4.4.1-12) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Samyak Jain ]
+ * Backport changes from Gradle 4.7 and 5.0 (needed to package Kotlin).
+ * Switch to debhelper level 13.
+
+ [ Andrej Shadura ]
+ * Improve Asciidoc-to-POD conversion for the manpage generation.
+
+ -- Andrej Shadura <andrewsh at debian.org> Thu, 20 Aug 2020 17:16:51 +0200
+
gradle (4.4.1-11) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Section: java
Priority: optional
Build-Depends: ant,
bnd (>= 3.5.0),
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk-doc,
default-jdk (>= 2:1.9),
dh-exec,
@@ -32,7 +32,7 @@ Build-Depends: ant,
libdom4j-java,
libfindbugs-java,
libgoogle-gson-java,
- libguava-java,
+ libguava-java (>= 23.0),
libguice-java,
libhttpclient-java,
libhttpcore-java,
@@ -103,7 +103,7 @@ Depends: ant,
libcommons-compress-java,
libcommons-io-java,
libcommons-lang-java (>= 2.6),
- libguava-java,
+ libguava-java (>= 23.0),
libhttpclient-java,
libhttpcore-java,
libjansi-java,
=====================================
debian/gradle.pod.in
=====================================
@@ -15,7 +15,9 @@ it is error-prone and costly.
The summary of the options is provided below.
=over
+
@GENERATED@
+
=back
=head1 SEE ALSO
=====================================
debian/patches/backport-CommandLineArgumentProvider.patch
=====================================
@@ -0,0 +1,40 @@
+Description: Backport CommandLineArgumentProvider (Needed to package kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/blob/v5.0.0/subprojects/process-services/src/main/java/org/gradle/process/CommandLineArgumentProvider.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/process/CommandLineArgumentProvider.java
+@@ -0,0 +1,30 @@
++/*
++ * Copyright 2018 the original author or authors.
++ *
++ * Licensed 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.
++ */
++
++package org.gradle.process;
++
++/**
++ * Provides arguments to a process.
++ *
++ * @since 4.6
++ */
++public interface CommandLineArgumentProvider {
++ /**
++ * The arguments which will be provided to the process.
++ */
++ Iterable<String> asArguments();
++}
++
=====================================
debian/patches/backport-ComponentWithCoordinates.patch
=====================================
@@ -0,0 +1,42 @@
+Description: Backporting ComponentWithCoordinates (needed to package kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/blob/master/subprojects/core-api/src/main/java/org/gradle/api/component/ComponentWithCoordinates.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/api/component/ComponentWithCoordinates.java
+@@ -0,0 +1,31 @@
++/*
++ * Copyright 2018 the original author or authors.
++ *
++ * Licensed 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.
++ */
++
++package org.gradle.api.component;
++
++import org.gradle.api.artifacts.ModuleVersionIdentifier;
++
++/**
++ * Represents a component that determines its publication coordinates.
++ *
++ * @since 4.7
++ */
++public interface ComponentWithCoordinates extends SoftwareComponent {
++ /**
++ * The publication coordinates for this component.
++ */
++ ModuleVersionIdentifier getCoordinates();
++}
+
=====================================
debian/patches/backport-DependencyConstraint.patch
=====================================
@@ -0,0 +1,92 @@
+Description: Backport DependencyConstraint (needed for kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/blob/master/subprojects/core-api/src/main/java/org/gradle/api/artifacts/DependencyConstraint.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/api/artifacts/DependencyConstraint.java
+@@ -0,0 +1,82 @@
++/*
++ * Copyright 2017 the original author or authors.
++ *
++ * Licensed 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.
++ */
++package org.gradle.api.artifacts;
++
++import org.gradle.api.Action;
++import org.gradle.api.attributes.AttributeContainer;
++import org.gradle.api.attributes.HasConfigurableAttributes;
++
++import javax.annotation.Nullable;
++
++/**
++ * Represents a constraints over all, including transitive, dependencies.
++ *
++ * @since 4.5
++ */
++public interface DependencyConstraint extends ModuleVersionSelector, HasConfigurableAttributes<DependencyConstraint> {
++
++ /**
++ * Configures the version constraint for this dependency constraint.
++ *
++ * @param configureAction the configuration action for the module version
++ */
++ void version(Action<? super MutableVersionConstraint> configureAction);
++
++ /**
++ * Returns a reason why this dependency constraint should be used, in particular with regards to its version. The dependency report will use it to explain why a specific dependency was selected, or why a
++ * specific dependency version was used.
++ *
++ * @return a reason to use this dependency constraint
++ * @since 4.6
++ */
++ @Nullable
++ String getReason();
++
++ /**
++ * Sets the reason why this dependency constraint should be used.
++ *
++ * @since 4.6
++ */
++ void because(@Nullable String reason);
++
++ /**
++ * Returns the attributes for this constraint. Mutation of the attributes of a constraint must be done through
++ * the {@link #attributes(Action)} method.
++ *
++ * @return the attributes container for this dependency
++ *
++ * @since 4.8
++ */
++ @Override
++ AttributeContainer getAttributes();
++
++ /**
++ * Mutates the attributes of this constraint. Attributes are used during dependency resolution to select the appropriate
++ * target variant, in particular when a single component provides different variants.
++ *
++ * @param configureAction the attributes mutation action
++ *
++ * @since 4.8
++ */
++ @Override
++ DependencyConstraint attributes(Action<? super AttributeContainer> configureAction);
++
++ /**
++ * Returns the version constraint to be used during selection.
++ * @return the version constraint
++ */
++ VersionConstraint getVersionConstraint();
++}
=====================================
debian/patches/backport-FeaturePreviews.patch
=====================================
@@ -0,0 +1,94 @@
+Description: Backport FeaturePreviews (Needed to package kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/subprojects/core-api/src/main/java/org/gradle/api/internal/FeaturePreviews.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/api/internal/FeaturePreviews.java
+@@ -0,0 +1,83 @@
++/*
++ * Copyright 2017 the original author or authors.
++ *
++ * Licensed 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.
++ */
++package org.gradle.api.internal;
++
++import java.util.Collections;
++import java.util.EnumSet;
++import java.util.Set;
++
++public class FeaturePreviews {
++
++ /**
++ * Feature previews that can be turned on.
++ * A feature that is no longer relevant will have the {@code active} flag set to {@code false}.
++ */
++ public enum Feature {
++ GRADLE_METADATA(false),
++ GROOVY_COMPILATION_AVOIDANCE(true),
++ ONE_LOCKFILE_PER_PROJECT(true),
++ VERSION_ORDERING_V2(true);
++
++ public static Feature withName(String name) {
++ try {
++ return valueOf(name);
++ } catch (IllegalArgumentException e) {
++ // Re-wording to exception message to get rid of the fqcn it contains
++ throw new IllegalArgumentException("There is no feature named " + name);
++ }
++ }
++
++ private final boolean active;
++
++ Feature(boolean active) {
++ this.active = active;
++ }
++
++ public boolean isActive() {
++ return active;
++ }
++ }
++
++ private final Set<Feature> activeFeatures;
++ private final EnumSet<Feature> enabledFeatures = EnumSet.noneOf(Feature.class);
++
++ public FeaturePreviews() {
++ Set<Feature> tmpActiveSet = EnumSet.noneOf(Feature.class);
++ for (Feature feature : Feature.values()) {
++ if (feature.isActive()) {
++ tmpActiveSet.add(feature);
++ }
++ }
++ activeFeatures = Collections.unmodifiableSet(tmpActiveSet);
++ }
++
++ public void enableFeature(Feature feature) {
++ if (feature.isActive()) {
++ enabledFeatures.add(feature);
++ }
++ }
++
++ public boolean isFeatureEnabled(Feature feature) {
++ return feature.isActive() && enabledFeatures.contains(feature);
++ }
++
++ /**
++ * Returns the set of active {@linkplain Feature features}.
++ */
++ public Set<Feature> getActiveFeatures() {
++ return activeFeatures;
++ }
++}
+
=====================================
debian/patches/backport-NamedDomainObjectProvider.patch
=====================================
@@ -0,0 +1,56 @@
+Description: Backport NamedDomainObjectProvider (Needed to package kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/blob/v5.0.0/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectProvider.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/api/NamedDomainObjectProvider.java
+@@ -0,0 +1,45 @@
++/*
++ * Copyright 2018 the original author or authors.
++ *
++ * Licensed 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.
++ */
++
++package org.gradle.api;
++
++import org.gradle.api.provider.Provider;
++
++/**
++ * Provides a domain object of the given type.
++ *
++ * @param <T> type of domain object
++ * @since 4.10
++ */
++public interface NamedDomainObjectProvider<T> extends Provider<T> {
++ /**
++ * Configures the domain object with the given action. Actions are run in the order added.
++ *
++ * @param action A {@link Action} that can configure the domain object when required.
++ * @since 4.10
++ */
++ void configure(Action<? super T> action);
++
++ /**
++ * The domain object name referenced by this provider.
++ * <p>
++ * Must be constant for the life of the object.
++ *
++ * @return The domain object. Never null.
++ * @since 4.10
++ */
++ String getName();
++}
+
=====================================
debian/patches/backport-TaskProvider.patch
=====================================
@@ -0,0 +1,59 @@
+Description: Backport TaskProvider (Needed to package kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/blob/v5.0.0/subprojects/process-services/src/main/java/org/gradle/api/tasks/TaskProvider.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/api/tasks/TaskProvider.java
+@@ -0,0 +1,49 @@
++/*
++ * Copyright 2018 the original author or authors.
++ *
++ * Licensed 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.
++ */
++
++package org.gradle.api.tasks;
++
++import org.gradle.api.Action;
++import org.gradle.api.NamedDomainObjectProvider;
++import org.gradle.api.Task;
++
++/**
++ * Providers a task of the given type.
++ *
++ * @param <T> Task type
++ * @since 4.8
++ */
++public interface TaskProvider<T extends Task> extends NamedDomainObjectProvider<T> {
++ /**
++ * Configures the task with the given action. Actions are run in the order added.
++ *
++ * @param action A {@link Action} that can configure the task when required.
++ * @since 4.8
++ */
++ @Override
++ void configure(Action<? super T> action);
++
++ /**
++ * The task name referenced by this provider.
++ * <p>
++ * Must be constant for the life of the object.
++ *
++ * @return The task name. Never null.
++ * @since 4.9
++ */
++ @Override
++ String getName();
++}
=====================================
debian/patches/backport-capabilities.patch
=====================================
@@ -0,0 +1,41 @@
+Description: Backport capabilities (Needed to package kotlin)
+Author: Samyak Jain <samyak.jn11 at gmail.com>
+
+---
+
+Origin: https://github.com/gradle/gradle/blob/v5.0.0/subprojects/process-services/src/main/java/org/gradle/api/capabilities/Capability.java
+
+--- /dev/null
++++ gradle-4.4.1/subprojects/core-api/src/main/java/org/gradle/api/capabilities/Capability.java
+@@ -0,0 +1,31 @@
++/*
++ * Copyright 2018 the original author or authors.
++ *
++ * Licensed 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.
++ */
++package org.gradle.api.capabilities;
++
++import javax.annotation.Nullable;
++
++/**
++ * Represents a capability. Capabilities are versioned. Only one component for a specific capability
++ * can be found on a dependency graph.
++ *
++ * @since 4.7
++ */
++public interface Capability {
++ String getGroup();
++ String getName();
++ @Nullable
++ String getVersion();
++}
=====================================
debian/patches/series
=====================================
@@ -29,3 +29,10 @@ asm7.patch
ivy-artifact-backport.patch
fix-CVE-2019-11065.patch
guava-compatibility.patch
+backport-ComponentWithCoordinates.patch
+backport-DependencyConstraint.patch
+backport-CommandLineArgumentProvider.patch
+backport-FeaturePreviews.patch
+backport-TaskProvider.patch
+backport-NamedDomainObjectProvider.patch
+backport-capabilities.patch
=====================================
debian/rules
=====================================
@@ -44,7 +44,7 @@ endif
debian/gradle.1: debian/gradle.pod
touch -d@$(SOURCE_DATE_EPOCH) $<
- pod2man -r "Gradle $(GRADLE_VERSION)" -c "Gradle Command Line Manual" $< > $@
+ pod2man --errors=stderr --utf8 -r "Gradle $(GRADLE_VERSION)" -c "Gradle Command Line Manual" $< > $@
debian/gradle.pod: debian/gradle.pod.in
sed '/@GENERATED@/,$$d' $< > $@
@@ -54,6 +54,9 @@ debian/gradle.pod: debian/gradle.pod.in
# drop text from links: https://gradle.com/build-scans[...]
# drop underscores from documentation links
# replace documentation links by UPPERCASE LABELS
+ # ... but not those where the link is in a middle of a sentence
+ # ... since otherwise it breaks the sentence structure
+ # ... so just make it *bold* instead
# move parethesed option "(comments)" outside of the bold parts
# cut off everything after and including the [[daemon_cli]] section
# cut off the introduction
@@ -63,11 +66,16 @@ debian/gradle.pod: debian/gradle.pod.in
-e 's/^+$$//g' \
-e 's/\(https:[^[]*\)[[][^]]*\]/L<\1>/g' \
-e '/<<sec:[^>]*>>/y/_/ /' \
+ -e 's/\([Tt]he\) <<sec:\([^>]*\)>>/\1 documentation section B<\U\2\E>/g' \
-e 's/<<sec:\([^>]*\)>>/the documentation section B<\U\1\E>/g' \
-e '/<<[^>]*>>/y/_/ /' \
+ -e 's/<<.[^,]*,\([^>]*\)>>/B<\1>/g' \
+ -e 's/\([Tt]he\) <<\([^>]*\)>>/\1 documentation section B<\U\2\E>/g' \
-e 's/<<\([^>]*\)>>/the documentation section B<\U\1\E>/g' \
-e 's/ (\([^)]*\))>/> (\1)/g' \
- -e '/daemon_cli]]/,$$d' \
+ -e '/^\[\[.*]]$$/d' \
+ -e 's/GRADLE OPTS/GRADLE_OPTS/g' \
+ -e 's/^=== \(.*\)$$/=back\n\n=head1 \U\1\n\n/g' \
-e '0,/The command-line options available/d' \
subprojects/docs/src/docs/userguide/commandLine.adoc >> $@
sed '0,/@GENERATED@/d' $< >> $@
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/da78f28c4c3a3e888df5d731c0fac7a37f7b8cd9...06588fe912cca025f36908a716cbb31ed8dedd97
--
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/da78f28c4c3a3e888df5d731c0fac7a37f7b8cd9...06588fe912cca025f36908a716cbb31ed8dedd97
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/20200824/d8ce8060/attachment.html>
More information about the pkg-java-commits
mailing list