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

Combined PR #96

Closed
wants to merge 17 commits into from
Closed

Combined PR #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
65b5ac6
Bump quiltflower from 1.8.1 to 1.9.0
dependabot[bot] Nov 1, 2022
d7c42f6
Bump bcel from 6.6.0 to 6.7.0
dependabot[bot] Dec 6, 2022
43a4e27
Bump jaxb-runtime from 2.3.3 to 4.0.2
dependabot[bot] Feb 6, 2023
7ce1d9b
Bump jaxb-impl from 2.3.7 to 2.3.8
dependabot[bot] Feb 6, 2023
884551c
Bump tycho.version from 2.7.4 to 3.0.3
dependabot[bot] Feb 20, 2023
45759c5
Bump maven-assembly-plugin from 3.4.2 to 3.5.0
dependabot[bot] Feb 23, 2023
9bf9ee5
Bump jd-core from 1.2.18 to 1.2.25
dependabot[bot] Feb 27, 2023
d3196cb
Bump jd-util from 1.1.12 to 1.1.14
dependabot[bot] Feb 27, 2023
a2afb77
Merge dependabot/maven/com.github.nbauma109-jd-util-1.1.14 into combi…
nbauma109 Feb 28, 2023
7411fef
Merge dependabot/maven/com.github.nbauma109-jd-core-1.2.25 into combi…
nbauma109 Feb 28, 2023
1bbe9b0
Merge dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin…
nbauma109 Feb 28, 2023
0024662
Merge dependabot/maven/tycho.version-3.0.3 into combine-prs-branch
nbauma109 Feb 28, 2023
36e15e0
Merge dependabot/maven/com.sun.xml.bind-jaxb-impl-2.3.8 into combine-…
nbauma109 Feb 28, 2023
f681f89
Merge dependabot/maven/org.glassfish.jaxb-jaxb-runtime-4.0.2 into com…
nbauma109 Feb 28, 2023
08ab687
Merge dependabot/maven/org.apache.bcel-bcel-6.7.0 into combine-prs-br…
nbauma109 Feb 28, 2023
1bfbc9f
Merge dependabot/maven/com.github.QuiltMC-quiltflower-1.9.0 into comb…
nbauma109 Feb 28, 2023
f1c7d7b
Updated versions in **/MANIFEST.MF **/build.properties
invalid-email-address Feb 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
6 changes: 3 additions & 3 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/bcel-6.7.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/jd-util-1.1.14.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jd-core-1.2.25.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
6 changes: 3 additions & 3 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/bcel-6.7.0.jar,
lib/commons-io-2.11.0.jar,
lib/jd-util-1.1.12.jar,
lib/jd-core-1.2.18.jar
lib/jd-util-1.1.14.jar,
lib/jd-core-1.2.25.jar
Automatic-Module-Name: org.sf.feeling.decompiler.jd
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 @@ -32,8 +32,8 @@
<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-runtime-2.3.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.3.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-4.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
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 @@ -49,8 +49,8 @@ Bundle-ClassPath: lib/cvsclient-20060125.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-runtime-2.3.3.jar,
lib/jaxb-impl-2.3.8.jar,
lib/jaxb-runtime-4.0.2.jar,
lib/activation-1.1.1.jar,
.
Export-Package: org.sf.feeling.decompiler.source.attach,
Expand Down
4 changes: 2 additions & 2 deletions 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-runtime-2.3.3.jar
lib/jaxb-impl-2.3.8.jar,\
lib/jaxb-runtime-4.0.2.jar

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 @@ -6,7 +6,7 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/quiltflower-1.8.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/quiltflower-1.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/json.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.drgarbage.asm_5.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.drgarbage.asm.util_5.0.3.jar"/>
Expand Down
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
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/quiltflower-1.8.1.jar,
Bundle-ClassPath: lib/quiltflower-1.9.0.jar,
lib/json.jar,
lib/com.drgarbage.asm_5.0.3.jar,
lib/com.drgarbage.asm.util_5.0.3.jar,
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<tycho.version>2.7.4</tycho.version>
<tycho.version>3.0.3</tycho.version>
</properties>

<modules>
Expand Down Expand Up @@ -46,7 +46,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand Down Expand Up @@ -143,7 +143,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 @@ -268,7 +268,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.netbeans.lib</groupId>
Expand All @@ -293,22 +293,22 @@
<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.14</version>
</dependency>
<dependency>
<groupId>com.github.nbauma109</groupId>
<artifactId>jd-core</artifactId>
<version>1.2.18</version>
<version>1.2.25</version>
</dependency>
<dependency>
<groupId>com.github.QuiltMC</groupId>
<artifactId>quiltflower</artifactId>
<version>1.8.1</version>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>com.eclipsesource.minimal-json</groupId>
Expand Down