Skip to content

Commit c0907a1

Browse files
eric-milleseric-milles
committed
Fix for #1275: prevent linking of groovyXX and logback-classic
1 parent ef0931b commit c0907a1

19 files changed

Lines changed: 375 additions & 11 deletions

File tree

‎base/org.codehaus.groovy.eclipse.compilerResolver/.project‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<buildCommand>
1010
<name>org.eclipse.pde.ManifestBuilder</name>
1111
</buildCommand>
12-
<buildCommand>
13-
<name>org.eclipse.pde.SchemaBuilder</name>
14-
</buildCommand>
1512

1613
<buildCommand>
1714
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

‎base/org.codehaus.groovy.eclipse.compilerResolver/META-INF/p2.inf‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
11
instructions.configure = setStartLevel(startLevel:1); markStarted(started: true);
2-
3-
# logback declares optional linkage to groovy packages, which impacts efficacy
4-
requires.0.namespace = org.eclipse.equinox.p2.iu
5-
requires.0.name = ch.qos.logback.classic
6-
requires.0.min = 0
7-
requires.0.max = 0

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.checkstyle‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
4+
<local-check-config name="Greclipse Checks" location=".checkstyleConfig.xml" type="project">
5+
<additional-data name="protect-config-file" value="true" />
6+
</local-check-config>
7+
<fileset name="ours" check-config-name="Greclipse Checks" enabled="true" local="true">
8+
<file-match-pattern match-pattern=".(groovy|java)$" include-pattern="true" />
9+
</fileset>
10+
</fileset-config>

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.classpath‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<classpath>
4+
<classpathentry kind="src" path="src" output="bin"/>
5+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
7+
</classpath>

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/bin
2+
/target

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.project‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<projectDescription>
4+
<name>org.codehaus.groovy.eclipse.frameworkAdapter</name>
5+
<buildSpec>
6+
<buildCommand>
7+
<name>org.eclipse.jdt.core.javabuilder</name>
8+
</buildCommand>
9+
<buildCommand>
10+
<name>org.eclipse.pde.ManifestBuilder</name>
11+
</buildCommand>
12+
13+
<buildCommand>
14+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
15+
</buildCommand>
16+
</buildSpec>
17+
<natures>
18+
<nature>org.eclipse.jdt.core.javanature</nature>
19+
<nature>org.eclipse.pde.PluginNature</nature>
20+
21+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
22+
</natures>
23+
<linkedResources>
24+
<link>
25+
<name>.checkstyleConfig.xml</name>
26+
<type>1</type>
27+
<locationURI>PARENT-2-PROJECT_LOC/checkstyleConfig.xml</locationURI>
28+
</link>
29+
</linkedResources>
30+
</projectDescription>

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.settings/org.eclipse.core.runtime.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
line.separator=\n

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
3+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4+
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
5+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
6+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
7+
org.eclipse.jdt.core.compiler.compliance=1.8
8+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
9+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
10+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
11+
org.eclipse.jdt.core.compiler.doc.comment.support=disabled
12+
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
13+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
14+
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
15+
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
16+
org.eclipse.jdt.core.compiler.problem.deadCode=warning
17+
org.eclipse.jdt.core.compiler.problem.deprecation=warning
18+
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
19+
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
20+
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
21+
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
22+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
23+
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
24+
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
25+
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
26+
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
27+
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
28+
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
29+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
30+
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
31+
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
32+
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
33+
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
34+
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
35+
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
36+
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
37+
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
38+
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
39+
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
40+
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
41+
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
42+
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
43+
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
44+
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
45+
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
46+
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
47+
org.eclipse.jdt.core.compiler.problem.nullReference=warning
48+
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
49+
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
50+
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
51+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
52+
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
53+
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
54+
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
55+
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
56+
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
57+
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
58+
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
59+
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
60+
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
61+
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
62+
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
63+
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
64+
org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
65+
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
66+
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
67+
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
68+
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
69+
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
70+
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
71+
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
72+
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
73+
org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
74+
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
75+
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
76+
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
77+
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
78+
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
79+
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
80+
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
81+
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
82+
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
83+
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
84+
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
85+
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
86+
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
87+
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
88+
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
89+
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
90+
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
91+
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
92+
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
93+
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
94+
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
95+
org.eclipse.jdt.core.compiler.source=1.8
96+
org.eclipse.jdt.core.formatter.tabulation.char=space
97+
org.eclipse.jdt.core.formatter.tabulation.size=4

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
eclipse.preferences.version=1
2+
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
3+
org.eclipse.jdt.ui.importorder=\#java;\#javax;\#groovy;\#groovyx;\#;java;javax;groovy;groovyx;;
4+
org.eclipse.jdt.ui.ondemandthreshold=99
5+
org.eclipse.jdt.ui.staticondemandthreshold=99
6+
sp_cleanup.on_save_use_additional_actions=true
7+
sp_cleanup.organize_imports=true
8+
sp_cleanup.remove_trailing_whitespaces=true
9+
sp_cleanup.remove_trailing_whitespaces_all=true
10+
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
11+
sp_cleanup.update_copyright_notice=true

‎base/org.codehaus.groovy.eclipse.frameworkAdapter/META-INF/MANIFEST.MF‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-SymbolicName: org.codehaus.groovy.eclipse.frameworkAdapter;singleton:=true
4+
Bundle-Name: Groovy OSGi advice
5+
Bundle-Vendor: Pivotal Software, Inc.
6+
Bundle-Version: 4.3.0.qualifier
7+
Bundle-ActivationPolicy: lazy
8+
ExtensionBundle-Activator: org.codehaus.groovy.frameworkadapter.Activator
9+
Fragment-Host: system.bundle;extension:=framework
10+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

0 commit comments

Comments
 (0)