-
Notifications
You must be signed in to change notification settings - Fork 193
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for #1275: prevent linking of groovyXX and logback-classic
- Loading branch information
1 parent
ef0931b
commit c0907a1
Showing
19 changed files
with
375 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
base/org.codehaus.groovy.eclipse.compilerResolver/META-INF/p2.inf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1 @@ | ||
| instructions.configure = setStartLevel(startLevel:1); markStarted(started: true); | ||
|
|
||
| # logback declares optional linkage to groovy packages, which impacts efficacy | ||
| requires.0.namespace = org.eclipse.equinox.p2.iu | ||
| requires.0.name = ch.qos.logback.classic | ||
| requires.0.min = 0 | ||
| requires.0.max = 0 |
10 changes: 10 additions & 0 deletions
10
base/org.codehaus.groovy.eclipse.frameworkAdapter/.checkstyle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false"> | ||
| <local-check-config name="Greclipse Checks" location=".checkstyleConfig.xml" type="project"> | ||
| <additional-data name="protect-config-file" value="true" /> | ||
| </local-check-config> | ||
| <fileset name="ours" check-config-name="Greclipse Checks" enabled="true" local="true"> | ||
| <file-match-pattern match-pattern=".(groovy|java)$" include-pattern="true" /> | ||
| </fileset> | ||
| </fileset-config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <classpath> | ||
| <classpathentry kind="src" path="src" output="bin"/> | ||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /bin | ||
| /target |
30 changes: 30 additions & 0 deletions
30
base/org.codehaus.groovy.eclipse.frameworkAdapter/.project
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <projectDescription> | ||
| <name>org.codehaus.groovy.eclipse.frameworkAdapter</name> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.pde.ManifestBuilder</name> | ||
| </buildCommand> | ||
|
|
||
| <buildCommand> | ||
| <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.pde.PluginNature</nature> | ||
|
|
||
| <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> | ||
| </natures> | ||
| <linkedResources> | ||
| <link> | ||
| <name>.checkstyleConfig.xml</name> | ||
| <type>1</type> | ||
| <locationURI>PARENT-2-PROJECT_LOC/checkstyleConfig.xml</locationURI> | ||
| </link> | ||
| </linkedResources> | ||
| </projectDescription> |
2 changes: 2 additions & 0 deletions
2
base/org.codehaus.groovy.eclipse.frameworkAdapter/.settings/org.eclipse.core.runtime.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| line.separator=\n |
97 changes: 97 additions & 0 deletions
97
base/org.codehaus.groovy.eclipse.frameworkAdapter/.settings/org.eclipse.jdt.core.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled | ||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
| org.eclipse.jdt.core.compiler.codegen.methodParameters=generate | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 | ||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
| org.eclipse.jdt.core.compiler.compliance=1.8 | ||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
| org.eclipse.jdt.core.compiler.doc.comment.support=disabled | ||
| org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning | ||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.autoboxing=ignore | ||
| org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning | ||
| org.eclipse.jdt.core.compiler.problem.deadCode=warning | ||
| org.eclipse.jdt.core.compiler.problem.deprecation=warning | ||
| org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled | ||
| org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled | ||
| org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore | ||
| org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore | ||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning | ||
| org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore | ||
| org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled | ||
| org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore | ||
| org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning | ||
| org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error | ||
| org.eclipse.jdt.core.compiler.problem.forbiddenReference=error | ||
| org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning | ||
| org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning | ||
| org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning | ||
| org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore | ||
| org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore | ||
| org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled | ||
| org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled | ||
| org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning | ||
| org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning | ||
| org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore | ||
| org.eclipse.jdt.core.compiler.problem.nullReference=warning | ||
| org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore | ||
| org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning | ||
| org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore | ||
| org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore | ||
| org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning | ||
| org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore | ||
| org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning | ||
| org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore | ||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore | ||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore | ||
| org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled | ||
| org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning | ||
| org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled | ||
| org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled | ||
| org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning | ||
| org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning | ||
| org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled | ||
| org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning | ||
| org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning | ||
| org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning | ||
| org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning | ||
| org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info | ||
| org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning | ||
| org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedImport=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedLabel=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedLocal=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning | ||
| org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning | ||
| org.eclipse.jdt.core.compiler.source=1.8 | ||
| org.eclipse.jdt.core.formatter.tabulation.char=space | ||
| org.eclipse.jdt.core.formatter.tabulation.size=4 |
11 changes: 11 additions & 0 deletions
11
base/org.codehaus.groovy.eclipse.frameworkAdapter/.settings/org.eclipse.jdt.ui.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| eclipse.preferences.version=1 | ||
| editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true | ||
| org.eclipse.jdt.ui.importorder=\#java;\#javax;\#groovy;\#groovyx;\#;java;javax;groovy;groovyx;; | ||
| org.eclipse.jdt.ui.ondemandthreshold=99 | ||
| org.eclipse.jdt.ui.staticondemandthreshold=99 | ||
| sp_cleanup.on_save_use_additional_actions=true | ||
| sp_cleanup.organize_imports=true | ||
| sp_cleanup.remove_trailing_whitespaces=true | ||
| sp_cleanup.remove_trailing_whitespaces_all=true | ||
| sp_cleanup.remove_trailing_whitespaces_ignore_empty=false | ||
| sp_cleanup.update_copyright_notice=true |
10 changes: 10 additions & 0 deletions
10
base/org.codehaus.groovy.eclipse.frameworkAdapter/META-INF/MANIFEST.MF
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| Manifest-Version: 1.0 | ||
| Bundle-ManifestVersion: 2 | ||
| Bundle-SymbolicName: org.codehaus.groovy.eclipse.frameworkAdapter;singleton:=true | ||
| Bundle-Name: Groovy OSGi advice | ||
| Bundle-Vendor: Pivotal Software, Inc. | ||
| Bundle-Version: 4.3.0.qualifier | ||
| Bundle-ActivationPolicy: lazy | ||
| ExtensionBundle-Activator: org.codehaus.groovy.frameworkadapter.Activator | ||
| Fragment-Host: system.bundle;extension:=framework | ||
| Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
30 changes: 30 additions & 0 deletions
30
base/org.codehaus.groovy.eclipse.frameworkAdapter/about.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> | ||
| <html> | ||
| <head> | ||
| <title>About</title> | ||
| </head> | ||
| <body> | ||
| <h2>About This Content</h2> | ||
|
|
||
| <p>September 20, 2012</p> | ||
| <h3>License</h3> | ||
|
|
||
| <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise | ||
| indicated below, the Content is provided to you under the terms and conditions of the | ||
| Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available | ||
| at <a href="https://www.eclipse.org/legal/epl-v10.html">https://www.eclipse.org/legal/epl-v10.html</a>. | ||
| For purposes of the EPL, "Program" will mean the Content.</p> | ||
|
|
||
| <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is | ||
| being redistributed by another party ("Redistributor") and different terms and conditions may | ||
| apply to your use of any object code in the Content. Check the Redistributor's license that was | ||
| provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise | ||
| indicated below, the terms and conditions of the EPL still apply to any source code in the Content | ||
| and such source code may be obtained at <a href="https://www.eclipse.org">https://www.eclipse.org</a>.</p> | ||
|
|
||
| <h3>Third Party Content</h3> | ||
|
|
||
| <p>The Content includes class files that have been provided under the Apache Software License Version 2.0 ("ASL"). A copy of the ASL is available at <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a> and it is also included in this bundle in <a href="about_files/asl-v20.txt">about_files/asl-v20.txt</a>. If you did not receive this Content directly from the Eclipse Foundation, the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use. All source code for the ASL components of this bundle are available from the same update site that this bundle was installed from. You must choose to install the Groovy-Eclipse SDK feature. Also, all source code for Groovy-Eclipse is available from its canonical git repository at <a href="https://github.com/groovy/groovy-eclipse">https://github.com/groovy/groovy-eclipse</a>.<p> | ||
|
|
||
| </body> | ||
| </html> |
Oops, something went wrong.