Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
1b97e8d9
Commit
1b97e8d9
authored
Jun 22, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip dependency exclusions if groupId is null
Fixes gh-1133
parent
078db8cb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
107 additions
and
14 deletions
+107
-14
FlatdirTests.java
...st/java/org/springframework/boot/gradle/FlatdirTests.java
+61
-0
flatdir.gradle
...-boot-integration-tests/src/test/resources/flatdir.gradle
+29
-0
ApplyExcludeRules.java
...pringframework/boot/gradle/exclude/ApplyExcludeRules.java
+17
-14
No files found.
spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java
0 → 100644
View file @
1b97e8d9
/*
* Copyright 2012-2014 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
.
springframework
.
boot
.
gradle
;
import
java.io.File
;
import
org.gradle.tooling.ProjectConnection
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.springframework.boot.dependency.tools.ManagedDependencies
;
import
org.springframework.util.FileCopyUtils
;
import
org.springframework.util.FileSystemUtils
;
/**
* Tests for using the Gradle plugin's support for flat directory repos
*
* @author Dave Syer
*/
public
class
FlatdirTests
{
private
ProjectConnection
project
;
private
File
libs
=
new
File
(
"target/flatdir/lib"
);
private
static
final
String
BOOT_VERSION
=
ManagedDependencies
.
get
().
find
(
"spring-boot"
).
getVersion
();
@Before
public
void
init
()
{
if
(
libs
.
exists
())
{
FileSystemUtils
.
deleteRecursively
(
libs
);
}
}
@Test
public
void
flatdir
()
throws
Exception
{
project
=
new
ProjectCreator
().
createProject
(
"flatdir"
);
if
(!
libs
.
exists
())
{
libs
.
mkdirs
();
}
FileCopyUtils
.
copy
(
new
File
(
"src/test/resources/foo.jar"
),
new
File
(
libs
,
"foo-1.0.0.jar"
));
project
.
newBuild
().
forTasks
(
"build"
).
withArguments
(
"-PbootVersion="
+
BOOT_VERSION
,
"--stacktrace"
).
run
();
}
}
spring-boot-integration-tests/src/test/resources/flatdir.gradle
0 → 100644
View file @
1b97e8d9
buildscript
{
repositories
{
mavenLocal
()
}
dependencies
{
classpath
(
"org.springframework.boot:spring-boot-gradle-plugin:${project.bootVersion}"
)
}
}
apply
plugin:
'spring-boot'
group
=
'flatdir'
version
=
'0.0.0'
run
{
main
=
'Foo'
}
jar
{
baseName
=
'flatdir'
}
repositories
{
flatDir
(
dirs:
'lib'
)
}
dependencies
{
compile
':foo:1.0.0'
}
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/exclude/ApplyExcludeRules.java
View file @
1b97e8d9
...
...
@@ -49,10 +49,12 @@ public class ApplyExcludeRules implements Action<Configuration> {
if
(!
VersionManagedDependencies
.
CONFIGURATION
.
equals
(
configuration
.
getName
()))
{
configuration
.
getIncoming
().
beforeResolve
(
new
Action
<
ResolvableDependencies
>()
{
@Override
public
void
execute
(
ResolvableDependencies
resolvableDependencies
)
{
resolvableDependencies
.
getDependencies
().
all
(
new
Action
<
Dependency
>()
{
@Override
public
void
execute
(
Dependency
dependency
)
{
applyExcludeRules
(
dependency
);
...
...
@@ -70,20 +72,21 @@ public class ApplyExcludeRules implements Action<Configuration> {
}
private
void
applyExcludeRules
(
ModuleDependency
dependency
)
{
ManagedDependencies
managedDependencies
=
versionManagedDependencies
.
getManagedDependencies
();
org
.
springframework
.
boot
.
dependency
.
tools
.
Dependency
managedDependency
=
managedDependencies
.
find
(
dependency
.
getGroup
(),
dependency
.
getName
());
if
(
managedDependency
!=
null
)
{
for
(
Exclusion
exclusion
:
managedDependency
.
getExclusions
())
{
addExcludeRule
(
dependency
,
exclusion
);
ManagedDependencies
managedDependencies
=
versionManagedDependencies
.
getManagedDependencies
();
// flat directory repositories do not have groups
if
(
dependency
.
getGroup
()
!=
null
)
{
org
.
springframework
.
boot
.
dependency
.
tools
.
Dependency
managedDependency
=
managedDependencies
.
find
(
dependency
.
getGroup
(),
dependency
.
getName
());
if
(
managedDependency
!=
null
)
{
for
(
Exclusion
exclusion
:
managedDependency
.
getExclusions
())
{
addExcludeRule
(
dependency
,
exclusion
);
}
addImplicitExcludeRules
(
dependency
);
return
;
}
addImplicitExcludeRules
(
dependency
);
}
else
{
logger
.
debug
(
"No exclusions rules applied for non-managed dependency "
+
dependency
);
}
logger
.
debug
(
"No exclusions rules applied for non-managed dependency "
+
dependency
);
}
private
void
addExcludeRule
(
ModuleDependency
dependency
,
Exclusion
exclusion
)
{
...
...
@@ -106,8 +109,8 @@ public class ApplyExcludeRules implements Action<Configuration> {
private
boolean
isStarter
(
ModuleDependency
dependency
)
{
return
(
dependency
.
getGroup
()
!=
null
&&
dependency
.
getGroup
().
equals
(
"org.springframework.boot"
)
&&
dependency
.
getName
().
startsWith
(
"spring-boot-starter"
));
&&
dependency
.
getGroup
().
equals
(
"org.springframework.boot"
)
&&
dependency
.
getName
().
startsWith
(
"spring-boot-starter"
));
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment