You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/10/04 15:48:15 UTC
[1/2] incubator-edgent git commit: Edgent-260 [gradle] remove
dependency on retrolambda.jar in repo
Repository: incubator-edgent
Updated Branches:
refs/heads/master c8e3e0215 -> 0b1fcf85f
Edgent-260 [gradle] remove dependency on retrolambda.jar in repo
- download retrolambda to externalJars/java8/tools and use it from there
- unrelated tweak/correction to overview html for location of ext slf4j
jar
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/aaf6bb02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/aaf6bb02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/aaf6bb02
Branch: refs/heads/master
Commit: aaf6bb0224b033d0bb617cc80332363aca43ec9e
Parents: f6c77dc
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 4 11:19:50 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 4 11:19:50 2016 -0400
----------------------------------------------------------------------
build.gradle | 13 +++++++++++++
edgent_overview.html | 2 +-
platform/java7/build.gradle | 12 ++++++++++++
platform/java7/build.xml | 6 ++++--
4 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/aaf6bb02/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ad89eb1..a59ccf5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -390,6 +390,19 @@ subprojects {
}
}
+ ext.copyProjectExtJarsFn2 = { targetDir ->
+ // Copy the project jar's "private" external dependencies (transitively)
+ // into target-dir.
+
+ def nonCommonExtFiles = getProjectNonCommonExtDepFiles(project)
+ logger.info "$project.path copying projExtDepFiles jars: "+nonCommonExtFiles.collect { it.getName() }
+ copy {
+ from nonCommonExtFiles
+ includeEmptyDirs = false
+ into "$targetDir"
+ }
+ }
+
task setupProjectExtJars << {
// Helper for setupExternalJars task
copyProjectExtJarsFn external_jars_dir
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/aaf6bb02/edgent_overview.html
----------------------------------------------------------------------
diff --git a/edgent_overview.html b/edgent_overview.html
index e2a73ba..e2ad756 100644
--- a/edgent_overview.html
+++ b/edgent_overview.html
@@ -239,6 +239,6 @@ leaving the decision of the actual logging implementation to your application
(e.g., {@code java.util.logging} or {@code log4j}).
For {@code java.util.logging} you can include:
<ul>
-<li>{@code <edgent-target>/ext/slf4j-1.7.12/slf4j-jdk-1.7.12.jar}</li>
+<li>{@code <edgent-target>/ext/slf4j-jdk-1.7.12.jar}</li>
</ul>
</body>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/aaf6bb02/platform/java7/build.gradle
----------------------------------------------------------------------
diff --git a/platform/java7/build.gradle b/platform/java7/build.gradle
index b20e75d..c4dae75 100644
--- a/platform/java7/build.gradle
+++ b/platform/java7/build.gradle
@@ -14,6 +14,14 @@
defaultTasks 'addJava7TargetDir'
+ext.retrolambdaVersion = '2.1.0'
+ext.retrolambdaJarName = "retrolambda-${retrolambdaVersion}.jar"
+
+dependencies {
+ // TODO try the retrolambda gradle plugin!
+ addProjectExtDependency 'compile', "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"
+}
+
// Avoid creating/staging an empty jar (this is a 'java' subproject)
jar {
deleteAllActions()
@@ -42,6 +50,10 @@ task preAntTask << {
}
}
ant.properties.qcp = ant.references['edgent.classpath']
+
+ // make retrolambda available to the ant tooling
+ copyProjectExtJarsFn2 "$external_jars_dir/tools"
+ ant.properties['retrolambda.jar'] = "$external_jars_dir/tools/$retrolambdaJarName"
}
ant_retro7.doFirst {
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/aaf6bb02/platform/java7/build.xml
----------------------------------------------------------------------
diff --git a/platform/java7/build.xml b/platform/java7/build.xml
index d145487..b17dc23 100644
--- a/platform/java7/build.xml
+++ b/platform/java7/build.xml
@@ -35,10 +35,12 @@
<property name="slf4j.version" value="1.7.12"/>
<property name="gson.version" value="2.2.4"/>
<property name="metrics.version" value="3.1.2"/>
+ <property name="retrolambda.version" value="2.1.0"/>
<property name="slf4j.ext.dir" value="slf4j-${slf4j.version}/"/>
<property name="gson.ext.dir" value="google-gson-${gson.version}/"/>
<property name="metrics.ext.dir" value="metrics-${metrics.version}/"/>
+ <property name="retrolambda.jar" location="ext/retrolambda-${retrolambda.version}.jar"/>
<path id="edgent.classpath">
<pathelement location="${ext.dir}/${slf4j.ext.dir}slf4j-api-${slf4j.version}.jar"/>
@@ -69,7 +71,7 @@
<arg value="-Dretrolambda.outputDir=${output.dir}"/>
<arg value="-Dretrolambda.defaultMethods=false"/>
<arg value="-jar"/>
- <arg value="ext/retrolambda-2.1.0.jar"/>
+ <arg value="${retrolambda.jar}"/>
</exec>
<mkdir dir="${edgent7.target}/@{qdir}"/>
<jar destfile="${edgent7.target}/@{qdir}/@{qjar}"
@@ -202,7 +204,7 @@
<arg value="-Dretrolambda.outputDir=${edgent}/@{tdir}/test7.classes"/>
<arg value="-Dretrolambda.defaultMethods=true"/>
<arg value="-jar"/>
- <arg value="ext/retrolambda-2.1.0.jar"/>
+ <arg value="${retrolambda.jar}"/>
</exec>
<delete dir="${edgent}/@{tdir}/test.classes"/>
<move file="${edgent}/@{tdir}/test7.classes"
[2/2] incubator-edgent git commit: Merge pull request #207
Posted by dl...@apache.org.
Merge pull request #207
This closes #207
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/0b1fcf85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/0b1fcf85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/0b1fcf85
Branch: refs/heads/master
Commit: 0b1fcf85f8df9c2e4dcd2b514822efeee61ba31c
Parents: c8e3e02 aaf6bb0
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 4 11:48:08 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 4 11:48:08 2016 -0400
----------------------------------------------------------------------
build.gradle | 13 +++++++++++++
edgent_overview.html | 2 +-
platform/java7/build.gradle | 12 ++++++++++++
platform/java7/build.xml | 6 ++++--
4 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/0b1fcf85/build.gradle
----------------------------------------------------------------------