-
Notifications
You must be signed in to change notification settings - Fork 1.5k
feat(dependencies): update dependencies for security #6400
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.
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
base: release_v4.8.1
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,10 +21,8 @@ | |
import org.springframework.context.annotation.ComponentScan; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.context.annotation.EnableAspectJAutoProxy; | ||
import org.springframework.transaction.annotation.EnableTransactionManagement; | ||
|
||
@Configuration | ||
@EnableTransactionManagement | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why remove There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The @EnableTransactionManagementExpand annotation serves no practical purpose in the Java-Tron project. Since Java-Tron uses LevelDB/RocksDB as its underlying storage engine, and LevelDB/RocksDB does not support traditional database transaction mechanisms, Spring's transaction management capabilities cannot be effectively utilized in this context. |
||
@EnableAspectJAutoProxy | ||
@ComponentScan(basePackages = "org.tron") | ||
public class CommonConfig { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what InvalidMediaTypeException.java is used for? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For |
||
* Copyright 2002-2018 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 | ||
* | ||
* https://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.http; | ||
|
||
import org.springframework.util.InvalidMimeTypeException; | ||
|
||
/** | ||
* Exception thrown from {@link MediaType#parseMediaType(String)} in case of | ||
* encountering an invalid media type specification String. | ||
* | ||
* @author Juergen Hoeller | ||
* @since 3.2.2 | ||
*/ | ||
@SuppressWarnings("serial") | ||
public class InvalidMediaTypeException extends IllegalArgumentException { | ||
|
||
private final String mediaType; | ||
|
||
|
||
/** | ||
* Create a new InvalidMediaTypeException for the given media type. | ||
* | ||
* @param mediaType the offending media type | ||
* @param message a detail message indicating the invalid part | ||
*/ | ||
public InvalidMediaTypeException(String mediaType, String message) { | ||
super("Invalid media type \"" + mediaType + "\": " + message); | ||
this.mediaType = mediaType; | ||
} | ||
|
||
/** | ||
* Constructor that allows wrapping {@link InvalidMimeTypeException}. | ||
*/ | ||
InvalidMediaTypeException(InvalidMimeTypeException ex) { | ||
super(ex.getMessage(), ex); | ||
this.mediaType = ex.getMimeType(); | ||
} | ||
|
||
|
||
/** | ||
* Return the offending media type. | ||
*/ | ||
public String getMediaType() { | ||
return this.mediaType; | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not upgrade zksnark-java-sdk to new version?