Repository: polygene-java Updated Branches: refs/heads/develop 3e0fd0b72 -> 801274aea
RAT fixes. Signed-off-by: niclas <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/801274ae Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/801274ae Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/801274ae Branch: refs/heads/develop Commit: 801274aea0f8f05d2f73b1f827327e450f5da306 Parents: 3e0fd0b Author: niclas <[email protected]> Authored: Sat Apr 15 19:48:15 2017 +0800 Committer: niclas <[email protected]> Committed: Sat Apr 15 19:48:15 2017 +0800 ---------------------------------------------------------------------- .../distributions/DistributionsPlugin.groovy | 15 ++++++++++----- .../sql/generator/grammar/query/Ordering.java | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/801274ae/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy index 23a3fb6..2a373da 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy @@ -19,8 +19,6 @@ package org.apache.polygene.gradle.structure.distributions import groovy.transform.CompileStatic import groovy.transform.TypeCheckingMode -import java.nio.file.Files -import java.nio.file.Path import org.apache.commons.io.FileUtils import org.apache.polygene.gradle.BasePlugin import org.apache.polygene.gradle.TaskGroups @@ -55,6 +53,9 @@ import org.gradle.plugins.ide.internal.resolver.model.IdeExtendedRepoFileDepende import org.gradle.plugins.signing.Sign import org.gradle.plugins.signing.SigningExtension +import java.nio.file.Files +import java.nio.file.Path + // TODO Expose all project outputs into configurations @CompileStatic class DistributionsPlugin implements Plugin<Project> @@ -155,7 +156,11 @@ class DistributionsPlugin implements Plugin<Project> spec.exclude '**/.git*' // Git files spec.exclude '**/.gradle/**' // Gradle caches spec.exclude '**/.gradletasknamecache' // Gradle shell completion cache - spec.into '.' + + // TODO: Doesn't belong here. Should probably remove the use of ServiceLoader in 3.1, which solves the issue. + spec.exclude '**/META-INF/services/*Vendor' // SQL Vendor services + + spec.into '.' } def srcDistSupplementaryFilesCopySpec = project.copySpec { CopySpec spec -> spec.from project.file( 'src/src-dist' ) @@ -505,8 +510,8 @@ class DistributionsPlugin implements Plugin<Project> } // Copy Maven artifacts using the Gradle IDE Model // Include sources if available, otherwise include javadoc if available - IdeDependenciesExtractor dependenciesExtractor = new IdeDependenciesExtractor(); - def ideDependencies = dependenciesExtractor.extractRepoFileDependencies project.dependencies, + IdeDependenciesExtractor dependenciesExtractor = new IdeDependenciesExtractor() + def ideDependencies = dependenciesExtractor.extractRepoFileDependencies project.dependencies, [ configuration ], [ ], true, true ideDependencies.each { IdeExtendedRepoFileDependency ideDependency -> http://git-wip-us.apache.org/repos/asf/polygene-java/blob/801274ae/libraries/sql-generator/src/main/java/org/apache/polygene/library/sql/generator/grammar/query/Ordering.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/main/java/org/apache/polygene/library/sql/generator/grammar/query/Ordering.java b/libraries/sql-generator/src/main/java/org/apache/polygene/library/sql/generator/grammar/query/Ordering.java index 01b35cb..14af2ea 100644 --- a/libraries/sql-generator/src/main/java/org/apache/polygene/library/sql/generator/grammar/query/Ordering.java +++ b/libraries/sql-generator/src/main/java/org/apache/polygene/library/sql/generator/grammar/query/Ordering.java @@ -1,3 +1,22 @@ +/* + * 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. + * + * + */ package org.apache.polygene.library.sql.generator.grammar.query; /**
