This is an automated email from the ASF dual-hosted git repository. fgreg pushed a commit to branch SDAP-48 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexusproto.git
commit d02c3c0cffb00488cba997fe37f2e8d8e858df6f Author: Frank Greguska <[email protected]> AuthorDate: Mon Jan 22 18:29:36 2018 -0800 add disclaimer update gradle version --- DISCLAIMER | 6 ++++++ build.gradle | 7 +++++++ gradle/wrapper/gradle-wrapper.jar | Bin 54711 -> 54333 bytes gradle/wrapper/gradle-wrapper.properties | 3 +-- gradlew | 6 +++--- src/main/python/nexusproto/setup.py | 4 ++-- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000..f01ee7a --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,6 @@ +Apache SDAP is an effort undergoing incubation at The Apache Software Foundation (ASF). +Incubation is required of all newly accepted projects until a further review indicates +that the infrastructure, communications, and decision making process have stabilized in +a manner consistent with other successful ASF projects. While incubation status is not +necessarily a reflection of the completeness or stability of the code, it does indicate +that the project has yet to be fully endorsed by the ASF. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 74dc927..be01e2c 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ plugins { id 'maven-publish' id 'project-report' id 'net.researchgate.release' version '2.6.0' + id "io.spring.dependency-management" version "1.0.4.RELEASE" } group = "org.apache.sdap" @@ -41,6 +42,12 @@ ext { pythonBuildDirPath = "${file(buildDir.path + '/python/nexusproto').path}" } +dependencyManagement { + imports { + mavenBom 'org.apache:apache:18' + } +} + protobuf { generatedFilesBaseDir = genDirectory diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 610d630..99340b4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b4965f4..2c2bbe5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Jan 18 14:53:09 PST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/src/main/python/nexusproto/setup.py b/src/main/python/nexusproto/setup.py index c4f0542..7a3250b 100644 --- a/src/main/python/nexusproto/setup.py +++ b/src/main/python/nexusproto/setup.py @@ -21,7 +21,7 @@ setup( version=__version__, url="https://github.com/apache/incubator-sdap-nexusproto";, - author="Frank Greguska", + author="[email protected]", description="Protobufs used while ingesting NEXUS tiles.", @@ -29,7 +29,7 @@ setup( platforms='any', install_requires=[ - 'protobuf' + 'protobuf==3.2.0' ], classifiers=[
