You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by cd...@apache.org on 2017/11/21 11:51:22 UTC

[42/50] incubator-edgent-samples git commit: remove all gradle tooling artifacts and "exclusions" from the repo

remove all gradle tooling artifacts and "exclusions" from the repo

We really want to support only a single set of build tooling.
Also, while perhaps not too too difficult to remedy, the current
state of the grade tooling won't work due to some repo restructuring.

TODO identify / cleanup items in buildTools that have no role going
forward (most if not all of them).

Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/eed412fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eed412fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eed412fd

Branch: refs/heads/develop
Commit: eed412fd6311737e92a562217671fd2c85ad2ac9
Parents: ef1c55d
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 30 11:26:41 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 30 11:26:41 2017 -0400

----------------------------------------------------------------------
 .gitignore              |  5 -----
 apps/build.gradle       | 30 ---------------------------
 connectors/build.gradle | 33 -----------------------------
 console/build.gradle    | 25 ----------------------
 scenarios/build.gradle  | 49 --------------------------------------------
 topology/build.gradle   | 28 -------------------------
 utils/build.gradle      | 27 ------------------------
 7 files changed, 197 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 128a2d4..d555b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,12 +9,7 @@
 
 # More generated artifacts
 target/
-/test/svt/lib
-/release-edgent
 /reports
-/.gradle/
-build/
-/externalJars
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/

http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/apps/build.gradle
----------------------------------------------------------------------
diff --git a/apps/build.gradle b/apps/build.gradle
deleted file mode 100644
index b94804b..0000000
--- a/apps/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-*/
-dependencies {
-  // N.B. common dependencies are set in root build.gradle
-
-  addTargetDirProjectJarDependency 'compile', ':connectors:mqtt'
-  addTargetDirProjectJarDependency 'compile', ':connectors:file'
-  addTargetDirProjectJarDependency 'compile', ':connectors:serial'
-  addTargetDirProjectJarDependency 'compile', ':analytics:math3'
-  addTargetDirProjectJarDependency 'compile', ':analytics:sensors'
-  addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
-  // N.B. root project adds test common dependencies
-}

http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/connectors/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/build.gradle b/connectors/build.gradle
deleted file mode 100644
index 909a8e6..0000000
--- a/connectors/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-*/
-dependencies {
-  // N.B. common dependencies are set in root build.gradle
-
-  addTargetDirProjectJarDependency 'compile', ':analytics:math3'
-  addTargetDirProjectJarDependency 'compile', ':connectors:mqtt'
-  addTargetDirProjectJarDependency 'compile', ':connectors:kafka'
-  addTargetDirProjectJarDependency 'compile', ':connectors:file'
-  addTargetDirProjectJarDependency 'compile', ':connectors:iotp'
-  addTargetDirProjectJarDependency 'compile', ':connectors:jdbc'
-  addTargetDirProjectJarDependency 'compile', ':connectors:serial'
-  addTargetDirProjectJarDependency 'compile', ':samples:topology'
-  addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
-  // N.B. root project adds test common dependencies
-}

http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/console/build.gradle
----------------------------------------------------------------------
diff --git a/console/build.gradle b/console/build.gradle
deleted file mode 100644
index 23795fc..0000000
--- a/console/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-*/
-dependencies {
-  // N.B. common dependencies are set in root build.gradle
-
-  addTargetDirProjectJarDependency 'compile', ':console:server'
-
-  // N.B. root project adds test common dependencies
-}

http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/scenarios/build.gradle
----------------------------------------------------------------------
diff --git a/scenarios/build.gradle b/scenarios/build.gradle
deleted file mode 100644
index f05b459..0000000
--- a/scenarios/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-*/
-
-sourceSets {
-  main {
-    java {
-      if (System.env.PI4J_LIB == null) {
-        exclude "**/scenarios/iotp/range/sensor/**"
-        logger.lifecycle 'PI4J_LIB ev not set. Omitting scenarios/iotp/range/sensor/.'
-      } 
-    }
-  }
-}
-
-dependencies {
-  // N.B. common dependencies are set in root build.gradle
-
-  addTargetDirProjectJarDependency 'compile', ':analytics:math3'
-  addTargetDirProjectJarDependency 'compile', ':samples:connectors'
-  addTargetDirProjectJarDependency 'compile', ':providers:iot'
-  addTargetDirProjectJarDependency 'compile', ':connectors:iot'
-  addTargetDirProjectJarDependency 'compile', ':connectors:iotp'
-  
-  // N.B. pi4J is strictly LGPL and hence incompatible with ASF licensing.
-  // Users will have to download it themselves and build the sample.
-  // addProjectExtDependency 'compile', 'com.pi4j:pi4j-core:1.0'
-  if (System.env.PI4J_LIB != null) {
-    // addProjectExtDependency 'compile', files("$System.env.PI4J_LIB/pi4j-core.jar")
-    compile files("$System.env.PI4J_LIB/pi4j-core.jar")
-  }
-
-  // N.B. root project adds test common dependencies
-}

http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/topology/build.gradle
----------------------------------------------------------------------
diff --git a/topology/build.gradle b/topology/build.gradle
deleted file mode 100644
index 5a8a2b6..0000000
--- a/topology/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-*/
-
-dependencies {
-  // N.B. common dependencies are set in root build.gradle
-
-  addTargetDirProjectJarDependency 'compile', ':analytics:math3'
-  addTargetDirProjectJarDependency 'compile', ':runtime:jobregistry'
-  addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
-  // N.B. root project adds test common dependencies
-}

http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/utils/build.gradle
----------------------------------------------------------------------
diff --git a/utils/build.gradle b/utils/build.gradle
deleted file mode 100644
index c70a06d..0000000
--- a/utils/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
-*/
-dependencies {
-  // N.B. common dependencies are set in root build.gradle
-
-  addTargetDirProjectJarDependency 'compile', ':utils:metrics'
-  addTargetDirProjectJarDependency 'compile', ':analytics:math3'
-  addTargetDirProjectJarDependency 'compile', ':analytics:sensors'
-
-  // N.B. root project adds test common dependencies
-}