Browse Source

final-persist解决冲突

qufenxi
abby 4 years ago
parent
commit
77fcbd6160
  1. 53
      build.third_step0.gradle
  2. 2
      fine-jackson/src/main/java/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java
  3. 3
      fine-jackson/src/main/java/com/fr/third/fasterxml/jackson/databind/type/TypeFactory.java
  4. 2
      fine-spring/pom.xml
  5. 23
      pom.xml

53
build.third_step0.gradle

@ -16,7 +16,7 @@ targetCompatibility=1.7
//lib下的jar到classes文件夹
version='10.0'
jar{
baseName="fine-third"
zip64 true
@ -42,11 +42,21 @@ FileTree files =fileTree(dir:'./',include:'build*.gradle')
def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator))
def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
def date = new Date()
def formattedDate = date.format('yyyy.MM.dd')
def srcDir="."
def MVN_BRANCH = branchVariable.toUpperCase()
def maven_version_build = ""
def indexV = branchName.indexOf( "%2F");
if(indexV != -1){
version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
maven_version_build = project.version +"-" + branchName.substring(0, indexV).toUpperCase() +"-SNAPSHOT"
} else {
version= branchName
maven_version_build = project.version +"-SNAPSHOT"
}
// @branch -
def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT"
def maven_version="${version}.${formattedDate}"
def jar_version = version
configurations {
@ -67,13 +77,32 @@ publishing {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version
ext.repo = 'release'
from components.java
}
third_build(MavenPublication) {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version_build
ext.repo = 'snapshot'
from components.java
}
}
repositories {
maven {
url "http://mvn.finedevelop.com/repository/fanruan/"
name "release"
url "http://mvn.finedevelop.com/repository/fanruan-release/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
}
maven {
name "snapshot"
url "http://mvn.finedevelop.com/repository/fanruan/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
@ -83,6 +112,17 @@ publishing {
}
}
afterEvaluate {
tasks.withType(PublishToMavenRepository) { task ->
if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) {
task.enabled = false
task.group = null
}
}
}
task unpack(type:Copy) {
delete classesDir
destinationDir=file(classesDir)
@ -114,4 +154,3 @@ task unpack(type:Copy) {
}
jar.dependsOn unpack

2
fine-jackson/src/main/java/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java

@ -8,4 +8,4 @@ public interface ClassFactory {
Class<?> classForName(String className) throws ClassNotFoundException;
Class<?> classForName(String className, ClassLoader classLoader) throws ClassNotFoundException;
}
}

3
fine-jackson/src/main/java/com/fr/third/fasterxml/jackson/databind/type/TypeFactory.java

@ -137,7 +137,7 @@ public final class TypeFactory
* ClassLoader used by this factory [databind#624].
*/
protected final ClassLoader _classLoader;
private ClassFactory classFactory;
/*
@ -146,6 +146,7 @@ public final class TypeFactory
/**********************************************************
*/
public void setClassFactory(ClassFactory classFactory) {
this.classFactory = classFactory;

2
fine-spring/pom.xml

@ -65,7 +65,7 @@
<artifactId>fine-javax-annotation</artifactId>
<version>${revision}</version>
</dependency>
<!-->以下是lib的本地jar包依赖<-->
<!-->以下是lib的本地jar包依赖<-->
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>aopalliance</artifactId>

23
pom.xml

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modules>
<module>fine-hibernate</module>
<module>fine-druid</module>
</modules>>
<parent>
<groupId>com.fr.maven</groupId>
<artifactId>finereport-maven</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version>
<relativePath>../finereport-maven</relativePath>
</parent>
<groupId>com.fr.third</groupId>
<artifactId>base-third-code</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
Loading…
Cancel
Save