Skip to content

Small fixes #138

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

Merged
merged 3 commits into from
Dec 11, 2024
+29 −17
Merged

Small fixes #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a180398
Minimum Java 8 target throughout
headius Dec 11, 2024
0178275
Update some plugins to get build working
headius Dec 11, 2024
6e51482
File.exists? no longer exist?
headius Dec 11, 2024
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 bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public String toString(){
}
private void getHistoryLogScript(RubyStringBuilder builder) {
builder.appendLine("log = File.join('log', 'history.log')");
builder.appendLine("if File.exists? File.dirname(log)");
builder.appendLine("if File.exist? File.dirname(log)");
builder.appendLine(" File.open(log, 'a') do |f|");
builder.appendLine(" f.puts \"#{$0.sub(/.*\\//, '')} #{ARGV.join ' '}\"");
builder.appendLine(" end");
Expand Down
4 changes: 2 additions & 2 deletions gem-assembly-descriptors/src/it/assemble-project-with-gems/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<version>3.7.1</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies-and-gems</descriptorRef>
Expand All @@ -71,7 +71,7 @@
<execution>
<phase>package</phase>
<goals>
<goal>assembly</goal>
<goal>single</goal>
</goals>
</execution>
</executions>
Expand Down
4 changes: 2 additions & 2 deletions gem-assembly-descriptors/src/it/assemble-project-without-gems/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions gem-assembly-descriptors/src/it/assemble-project-without-gems/java-world/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
Expand Down
4 changes: 4 additions & 0 deletions gem-maven-plugin/src/it/gemify-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 4 additions & 0 deletions gem-maven-plugin/src/it/include-rubygems-in-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 2 additions & 2 deletions gem-maven-plugin/src/it/include-rubygems-in-test-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<target>1.6</target>
<source>1.6</source>
<target>8</target>
<source>8</source>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 4 additions & 0 deletions gem-maven-plugin/src/it/small-project/java-world/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ else if ((Artifact.SCOPE_PROVIDED + Artifact.SCOPE_TEST).contains(dependency.get
writer.append("end\n");
writer.append("\n");
writer.append("load File.dirname(__FILE__) + '/" + this.gemHook
+ "' if File.exists?( File.dirname(__FILE__) + '/"
+ "' if File.exist?( File.dirname(__FILE__) + '/"
+ this.gemHook + "')\n");
}
catch (final IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion parent-mojo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.2.1</version>
<executions>
<execution>
<goals><goal>jar</goal></goals>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3</version>
<version>3.4.1</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ruby-tools/src/main/scripts/install_gems.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Dir[ 'target/dependency/*gem' ].each do |file|
f = "../target/rubygems/gems/#{File.basename(file).sub(/.gem/, '')}/lib"
unless File.exists?( f )
unless File.exist?( f )
f = "../target/rubygems/gems/#{File.basename(file).sub(/.gem/, '')}-java/lib"
end
Dir[ File.expand_path( f ) + "/*" ].each do |ff|
Expand Down
4 changes: 2 additions & 2 deletions ...ls/src/test/resources/repository/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<source>8</source>
<target>8</target>
<includes>
<include>org/apache/tools/ant/launch/*.java</include>
</includes>
Expand Down
4 changes: 2 additions & 2 deletions ruby-tools/src/test/resources/repository/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
<target>1.2</target>
<source>8</source>
<target>8</target>
<excludes>
<exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
Expand Down