Skip to content

Commit eabdc6b

Browse files
committed
remove duplicate checkstyle jar
1 parent c9f31fc commit eabdc6b

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Bundle-Vendor: %Bundle-Vendor
77
Bundle-ActivationPolicy: lazy
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Export-Package: .,
10+
com.google.common.base,
11+
com.google.common.cache,
12+
com.google.common.io,
1013
com.puppycrawl.tools.checkstyle,
1114
com.puppycrawl.tools.checkstyle.api;
1215
uses:="org.xml.sax.helpers,
@@ -31,7 +34,11 @@ Export-Package: .,
3134
com.puppycrawl.tools.checkstyle.checks.whitespace,
3235
com.puppycrawl.tools.checkstyle.filefilters,
3336
com.puppycrawl.tools.checkstyle.filters,
34-
com.puppycrawl.tools.checkstyle.utils
37+
com.puppycrawl.tools.checkstyle.meta,
38+
com.puppycrawl.tools.checkstyle.utils,
39+
org.apache.commons.lang3,
40+
org.codehaus.plexus.util
41+
Require-Bundle: org.eclipse.core.runtime
3542
Bundle-ClassPath: .,
3643
checkstyle-11.1.0-all.jar
3744
Automatic-Module-Name: net.sf.eclipsecs.checkstyle

net.sf.eclipsecs.core/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
</classpathentry>
88
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
99
<classpathentry kind="src" path="src"/>
10-
<classpathentry kind="lib" path="lib/checkstyle-11.1.0-all.jar"/>
1110
<classpathentry kind="output" path="target/classes"/>
1211
</classpath>

net.sf.eclipsecs.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-SymbolicName: net.sf.eclipsecs.core;singleton:=true
55
Bundle-Version: 11.1.0.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-17
7-
Bundle-ClassPath: .,
8-
lib/checkstyle-11.1.0-all.jar
7+
Bundle-ClassPath: .
98
Bundle-Activator: net.sf.eclipsecs.core.CheckstylePlugin
109
Bundle-ActivationPolicy: lazy
1110
Bundle-Vendor: %Bundle-Vendor

net.sf.eclipsecs.core/build.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ source.. = src/
22
jars.compile.order = .
33
bin.includes = .,\
44
META-INF/,\
5-
lib/,\
65
license/,\
76
plugin.xml,\
87
schema/,\
9-
lib/checkstyle-11.1.0-all.jar,\
108
OSGI-INF/
119
javacDefaultEncoding.. = UTF-8
-16.7 MB
Binary file not shown.

upgrade-version.build.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,10 @@ Apply all necessary manual code changes now.
4343
<replace dir="${basedir}/net.sf.eclipsecs.checkstyle" token="Bundle-Version: ${toVersion}" value="Bundle-Version: ${fromVersion}">
4444
<include name="**/MANIFEST.MF"/>
4545
</replace>
46-
<!-- replace dependencies from core to library -->
47-
<replace dir="${basedir}/net.sf.eclipsecs.core" token="checkstyle-${fromVersion}" value="checkstyle-${toVersion}">
48-
<include name="**/.classpath"/>
49-
<include name="**/build.properties"/>
50-
<include name="**/MANIFEST.MF"/>
51-
</replace>
5246

5347
<!-- download new version -->
5448
<get src="https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${toVersion}/checkstyle-${toVersion}-all.jar"
5549
dest="${basedir}/net.sf.eclipsecs.checkstyle/checkstyle-${toVersion}-all.jar"/>
56-
<copy file="${basedir}/net.sf.eclipsecs.checkstyle/checkstyle-${toVersion}-all.jar"
57-
tofile="${basedir}/net.sf.eclipsecs.core/lib/checkstyle-${toVersion}-all.jar"/>
5850
</target>
5951

6052
</project>

0 commit comments

Comments
 (0)