Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Combined PR #127

Merged
merged 21 commits into from
May 28, 2023
Merged

Combined PR #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d7c42f6
Bump bcel from 6.6.0 to 6.7.0
dependabot[bot] Dec 6, 2022
7ce1d9b
Bump jaxb-impl from 2.3.7 to 2.3.8
dependabot[bot] Feb 6, 2023
eb0d4dd
Bump maven-release-plugin from 3.0.0-M7 to 3.0.0
dependabot[bot] Mar 20, 2023
a721c00
Bump asm from 9.4 to 9.5
dependabot[bot] Mar 27, 2023
39ea60b
Bump jd-util from 1.1.12 to 1.1.16
dependabot[bot] May 5, 2023
9c4aa69
Bump maven-assembly-plugin from 3.4.2 to 3.6.0
dependabot[bot] May 15, 2023
d197e54
Bump commons-io from 2.11.0 to 2.12.0
dependabot[bot] May 17, 2023
f05de85
Bump maven-dependency-plugin from 3.5.0 to 3.6.0
dependabot[bot] May 22, 2023
c25e810
Bump plexus-utils from 3.5.0 to 4.0.0
dependabot[bot] May 23, 2023
0a6dd09
Bump jd-core from 1.2.18 to 1.2.26
dependabot[bot] May 28, 2023
86925bb
Merge dependabot/maven/com.github.nbauma109-jd-core-1.2.26 into combi…
nbauma109 May 28, 2023
d765caf
Merge dependabot/maven/org.codehaus.plexus-plexus-utils-4.0.0 into co…
nbauma109 May 28, 2023
a4063e9
Merge dependabot/maven/org.apache.maven.plugins-maven-dependency-plug…
nbauma109 May 28, 2023
f0564e0
Merge dependabot/maven/commons-io-commons-io-2.12.0 into combine-prs-…
nbauma109 May 28, 2023
e0943f6
Merge dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin…
nbauma109 May 28, 2023
bf21505
Merge dependabot/maven/com.github.nbauma109-jd-util-1.1.16 into combi…
nbauma109 May 28, 2023
d295d28
Merge dependabot/maven/org.ow2.asm-asm-9.5 into combine-prs-branch
nbauma109 May 28, 2023
cdc3bae
Merge dependabot/maven/org.apache.maven.plugins-maven-release-plugin-…
nbauma109 May 28, 2023
121e985
Merge dependabot/maven/com.sun.xml.bind-jaxb-impl-2.3.8 into combine-…
nbauma109 May 28, 2023
ca6b787
Merge dependabot/maven/org.apache.bcel-bcel-6.7.0 into combine-prs-br…
nbauma109 May 28, 2023
7aaa9d3
Updated versions in **/MANIFEST.MF **/build.properties
invalid-email-address May 28, 2023
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
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.cfr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy</id>
Expand Down
8 changes: 4 additions & 4 deletions org.sf.feeling.decompiler.jd/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/bcel-6.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.11.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jd-util-1.1.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jd-core-1.2.18.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bcel-6.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.12.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jd-util-1.1.16.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jd-core-1.2.26.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
8 changes: 4 additions & 4 deletions org.sf.feeling.decompiler.jd/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Bundle-Vendor: ECD Project Team
Export-Package: org.sf.feeling.decompiler.jd.actions,
org.sf.feeling.decompiler.jd.decompiler
Bundle-ClassPath: .,
lib/bcel-6.6.0.jar,
lib/commons-io-2.11.0.jar,
lib/jd-util-1.1.12.jar,
lib/jd-core-1.2.18.jar
lib/bcel-6.7.0.jar,
lib/commons-io-2.12.0.jar,
lib/jd-util-1.1.16.jar,
lib/jd-core-1.2.26.jar
Automatic-Module-Name: org.sf.feeling.decompiler.jd
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.jd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy</id>
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.procyon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy</id>
Expand Down
4 changes: 2 additions & 2 deletions org.sf.feeling.decompiler.source.attach/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<classpathentry exported="true" kind="lib" path="lib/maven-scm-provider-synergy-1.13.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/maven-scm-provider-tfs-1.13.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/maven-scm-provider-vss-1.13.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.5.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/plexus-utils-4.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/nexus-indexer-lucene-model-2.14.20-02.jar"/>
<classpathentry exported="true" kind="lib" path="lib/nexus-restlet1x-model-2.15.1-02.jar"/>
<classpathentry exported="true" kind="lib" path="lib/maven-scm-provider-jgit-1.13.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.3.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.3.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.3.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
<classpathentry kind="src" path="src/"/>
Expand Down
4 changes: 2 additions & 2 deletions org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ Bundle-ClassPath: lib/cvsclient-20060125.jar,
lib/maven-scm-provider-synergy-1.13.0.jar,
lib/maven-scm-provider-tfs-1.13.0.jar,
lib/maven-scm-provider-vss-1.13.0.jar,
lib/plexus-utils-3.5.0.jar,
lib/plexus-utils-4.0.0.jar,
lib/nexus-indexer-lucene-model-2.14.20-02.jar,
lib/nexus-restlet1x-model-2.15.1-02.jar,
lib/maven-scm-provider-jgit-1.13.0.jar,
lib/jaxb-api-2.3.1.jar,
lib/jaxb-impl-2.3.7.jar,
lib/jaxb-impl-2.3.8.jar,
lib/jaxb-runtime-2.3.3.jar,
lib/activation-1.1.1.jar,
.
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.source.attach/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ bin.includes = META-INF/,\
lib/nexus-indexer-lucene-model-2.14.20-02.jar,\
lib/jaxb-api-2.3.1.jar,\
lib/activation-1.1.1.jar,\
lib/jaxb-impl-2.3.7.jar,\
lib/jaxb-impl-2.3.8.jar,\
lib/jaxb-runtime-2.3.3.jar

2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.source.attach/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy</id>
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<classpathentry exported="true" kind="lib" path="lib/com.drgarbage.asm.util_5.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.drgarbage.bytecodevisualizer.plugin_4.4.1.201408050542.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.drgarbage.core.plugin_4.4.1.201408050542.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-9.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-9.5.jar"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bundle-ClassPath: lib/fernflower-403.jar,
lib/com.drgarbage.asm.util_5.0.3.jar,
lib/com.drgarbage.bytecodevisualizer.plugin_4.4.1.201408050542.jar,
lib/com.drgarbage.core.plugin_4.4.1.201408050542.jar,
lib/asm-9.4.jar,
lib/asm-9.5.jar,
.
Bundle-Name: Enhanced Class Decompiler
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ bin.includes = META-INF/,\
icons/,\
lib/,\
doc/,\
lib/asm-9.4.jar
lib/asm-9.5.jar
jars.compile.order = .
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>copy</id>
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand All @@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.0.0</version>
<configuration>
<goals>install</goals>
<tagNameFormat>@{project.version}</tagNameFormat>
Expand Down Expand Up @@ -146,7 +146,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.7</version>
<version>2.3.8</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand Down Expand Up @@ -266,7 +266,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.0</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand All @@ -291,22 +291,22 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
<version>6.6.0</version>
<version>6.7.0</version>
</dependency>
<dependency>
<groupId>com.github.nbauma109</groupId>
<artifactId>jd-util</artifactId>
<version>1.1.12</version>
<version>1.1.16</version>
</dependency>
<dependency>
<groupId>com.github.nbauma109</groupId>
<artifactId>jd-core</artifactId>
<version>1.2.18</version>
<version>1.2.26</version>
</dependency>
<dependency>
<groupId>com.github.QuiltMC</groupId>
Expand All @@ -321,7 +321,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.4</version>
<version>9.5</version>
</dependency>
<dependency>
<groupId>org.benf</groupId>
Expand Down