Skip to content
This repository was archived by the owner on Jul 9, 2022. It is now read-only.

Upgrade Apache Commons Collections to v3.2.2 #103

Open
bramp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade Apache Commons Collections to v3.2.2 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions open_source_licenses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES

SECTION 2: Apache License, V2.0

>>> commons-collections-3.2.1
>>> commons-collections-3.2.2
>>> gradle-base-services-2.2.1
>>> gradle-base-services-groovy-2.2.1
>>> gradle-core-2.2.1
Expand Down Expand Up @@ -171,7 +171,7 @@ all copies or substantial portions of the Software.
Apache License, V2.0 is applicable to the following component(s).


>>> commons-collections-3.2.1
>>> commons-collections-3.2.2

Apache Commons Collections
Copyright 2001-2008 The Apache Software Foundation
Expand Down
2 changes: 1 addition & 1 deletion ...ringsource.ide.eclipse.gradle.core.test/resources/projects/non-exported-deps/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ project(":main") {

project(":lib") {
dependencies {
compile "commons-collections:commons-collections:3.2.1"
compile "commons-collections:commons-collections:3.2.2"
}
}
4 changes: 2 additions & 2 deletions ...ource.ide.eclipse.gradle.core.test/resources/projects/remapping-multiproject/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ project(":main") {
project(":lib") {
dependencies {
compile project(":sublib")
compile "commons-collections:commons-collections:3.2.1"
compile "commons-collections:commons-collections:3.2.2"
}
}

project(":sublib") {
dependencies {
compile "commons-collections:commons-collections:3.2"
}
}
}
2 changes: 1 addition & 1 deletion org.springsource.ide.eclipse.gradle.core.test/resources/projects/sts2405/main/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repositories {
dependencies {
// compile group: 'com.kdvolder', name: 'myCrap', version: '0.1.1'
compile group: 'com.kdvolder', name: 'myLib', version: '0.0.1-SNAPSHOT'
compile group: 'commons-collections', name: 'commons-collections', version: '3.2.1'
compile group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
testCompile group: 'junit', name: 'junit', version: '4.+'
}

Expand Down
4 changes: 2 additions & 2 deletions ...gradle.core.test/src/org/springsource/ide/eclipse/gradle/core/test/GradleImportTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,8 @@ public void testNonExportedDependencies() throws Exception {

@Override
public boolean test() throws Exception {
assertClasspathJarEntry("commons-collections-3.2.1.jar", getGradleProject("main"));
assertClasspathJarEntry("commons-collections-3.2.1.jar", getGradleProject("lib"));
assertClasspathJarEntry("commons-collections-3.2.2.jar", getGradleProject("main"));
assertClasspathJarEntry("commons-collections-3.2.2.jar", getGradleProject("lib"));
assertClasspathProjectEntry(getProject("lib"), getJavaProject("main"));
return true;
}
Expand Down
8 changes: 4 additions & 4 deletions ...gradle.core.test/src/org/springsource/ide/eclipse/gradle/core/test/JarRemappingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ public void testRemappingMultiProject() throws Exception {

new ACondition() {
public boolean test() throws Exception {
assertClasspathJarEntry("commons-collections-3.2.1.jar", main);
assertClasspathJarEntry("commons-collections-3.2.2.jar", main);
assertNoClasspathJarEntry("commons-collections-3.2.jar", main); //thanks to custom model this problem can be solved!
assertClasspathJarEntry("commons-collections-3.2.1.jar", lib);
assertClasspathJarEntry("commons-collections-3.2.2.jar", lib);
assertClasspathJarEntry("commons-collections-3.2.jar", sublib);

assertClasspathProjectEntry(lib, main);
Expand All @@ -364,7 +364,7 @@ public boolean test() throws Exception {

new ACondition() {
public boolean test() throws Exception {
assertClasspathJarEntry("commons-collections-3.2.1.jar", main);
assertClasspathJarEntry("commons-collections-3.2.2.jar", main);
assertNoClasspathJarEntry("commons-collections-3.2.jar", main); //thanks to custom model this problem can be solved!
// assertClasspathJarEntry("commons-collections-3.2.1.jar", lib); // CLOSED! not applicable
assertClasspathJarEntry("commons-collections-3.2.jar", sublib);
Expand All @@ -382,7 +382,7 @@ public boolean test() throws Exception {

new ACondition() {
public boolean test() throws Exception {
assertClasspathJarEntry("commons-collections-3.2.1.jar", main);
assertClasspathJarEntry("commons-collections-3.2.2.jar", main);
assertNoClasspathJarEntry("commons-collections-3.2.jar", main); //thanks to custom model this problem can be solved!
// assertClasspathJarEntry("commons-collections-3.2.1.jar", lib); // CLOSED! not applicable
// assertClasspathJarEntry("commons-collections-3.2.jar", sublib); // CLOSED! not applicable
Expand Down
4 changes: 2 additions & 2 deletions org.springsource.ide.eclipse.gradle.feature/feature.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES\n\
\n\
SECTION 2: Apache License, V2.0\n\
\n\
>>> commons-collections-3.2.1\n\
>>> commons-collections-3.2.2\n\
>>> gradle-base-services-2.2.1\n\
>>> gradle-base-services-groovy-2.2.1\n\
>>> gradle-core-2.2.1\n\
Expand Down Expand Up @@ -197,7 +197,7 @@ all copies or substantial portions of the Software.\n\
Apache License, V2.0 is applicable to the following component(s).\n\
\n\
\n\
>>> commons-collections-3.2.1\n\
>>> commons-collections-3.2.2\n\
\n\
Apache Commons Collections\n\
Copyright 2001-2008 The Apache Software Foundation\n\
Expand Down
2 changes: 1 addition & 1 deletion org.springsource.ide.eclipse.gradle.feature/open_source_licenses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES

SECTION 2: Apache License, V2.0

>>> commons-collections-3.2.1
>>> commons-collections-3.2.2
>>> gradle-base-services-2.2.1
>>> gradle-base-services-groovy-2.2.1
>>> gradle-core-2.2.1
Expand Down
2 changes: 1 addition & 1 deletion org.springsource.ide.eclipse.gradle.toolingapi/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<classpathentry exported="true" kind="lib" path="lib/gradle-core-2.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gradle-tooling-api-2.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gradle-wrapper-2.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.7.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/model-1.0.jar" sourcepath="lib/model-1.0-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion org.springsource.ide.eclipse.gradle.toolingapi/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Bundle-ClassPath: .,
lib/gradle-core-2.2.1.jar,
lib/gradle-tooling-api-2.2.1.jar,
lib/gradle-wrapper-2.2.1.jar,
lib/commons-collections-3.2.1.jar,
lib/commons-collections-3.2.2.jar,
lib/slf4j-simple-1.7.7.jar,
lib/model-1.0.jar,
lib/slf4j-api-1.7.7.jar,
Expand Down
4 changes: 2 additions & 2 deletions org.springsource.ide.eclipse.gradle.toolingapi/embedded-libs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
objenesis-1.2.jar-version=1.2
gradle-base-services-2.2.1.jar-name=gradle-base-services
reflectasm-1.07-shaded.jar-name=reflectasm
commons-collections-3.2.1.jar-name=commons-collections
commons-collections-3.2.2.jar-name=commons-collections
gradle-wrapper-2.2.1.jar-name=gradle-wrapper
slf4j-api-1.7.7.jar-name=slf4j-api
gradle-resources-2.2.1.jar-version=2.2.1
Expand All @@ -21,7 +21,7 @@ gradle-resources-2.2.1.jar-name=gradle-resources
plugin-1.0.jar-name=plugin
reflectasm-1.07-shaded.jar-version=1.07
gradle-messaging-2.2.1.jar-name=gradle-messaging
commons-collections-3.2.1.jar-version=3.2.1
commons-collections-3.2.2.jar-version=3.2.2
gradle-tooling-api-2.2.1.jar-name=gradle-tooling-api
asm-4.0.jar-name=asm
kryo-2.20.jar-version=2.20
Expand Down
2 changes: 1 addition & 1 deletion toolingapi/updateLibs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
"org.gradle:gradle-core:$project.gradleApiVersion",
"org.gradle:gradle-tooling-api:$project.gradleApiVersion",
"org.gradle:gradle-wrapper:$project.gradleApiVersion",
"commons-collections:commons-collections:3.2.1",
"commons-collections:commons-collections:3.2.2",
"org.slf4j:slf4j-simple:1.7.7"
].each { dep ->
eclipseBundle dep
Expand Down