Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-02-29 14:53:52 +00:00
parent d9f4d6ce91 bb473c32e2
commit 779649bfdb
5 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-parent/pom.xml
View File

@@ -294,7 +294,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.14</version>
<version>1.15</version>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>

6
spring-boot-tools/spring-boot-loader-tools/pom.xml
View File

@@ -132,8 +132,10 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<!-- The use of SignalUtils seems to mess up animal sniffer -->
<skip>true</skip>
<annotations>
<annotation>org.springframework.boot.loader.tools.UsesUnsafeJava</annotation>
<annotation>org.springframework.lang.UsesJava7</annotation>
</annotations>
</configuration>
</plugin>
</plugins>

3
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
View File

@@ -42,6 +42,8 @@ import java.util.jar.Manifest;
import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import org.springframework.lang.UsesJava7;
/**
* Writes JAR content, ensuring valid directory entries are always create and duplicate
* items are ignored.
@@ -86,6 +88,7 @@ public class JarWriter {
this.jarOutput = new JarOutputStream(fileOutputStream);
}
@UsesJava7
private void setExecutableFilePermission(File file) {
try {
Path path = file.toPath();

1
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/SignalUtils.java
View File

@@ -26,6 +26,7 @@ import sun.misc.SignalHandler;
* @since 1.1.0
*/
@SuppressWarnings("restriction")
@UsesUnsafeJava
public final class SignalUtils {
private static final Signal SIG_INT = new Signal("INT");

34
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/UsesUnsafeJava.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.loader.tools;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Indicates that the annotated element uses unsafe Java calls.
*
* @author Phillip Webb
*/
@Retention(RetentionPolicy.CLASS)
@Target({ ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE })
@Documented
@interface UsesUnsafeJava {
}