You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/01/12 06:22:33 UTC
[incubator-skywalking] branch ci-from-cache updated: Remove an
install.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch ci-from-cache
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/ci-from-cache by this push:
new 4a01c08 Remove an install.
4a01c08 is described below
commit 4a01c08dc45eb6066a55c14b5f6d07d7e95530c7
Author: wu-sheng <wu...@foxmail.com>
AuthorDate: Fri Jan 12 14:22:01 2018 +0800
Remove an install.
---
apm-sniffer/apm-sdk-plugin/pom.xml | 63 --------------------------------------
pom.xml | 32 +------------------
2 files changed, 1 insertion(+), 94 deletions(-)
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml
index 1ae9e03..0bba88f 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -212,38 +212,6 @@
<modules>
<module>oracle-10.x-plugin</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- <executions>
- <execution>
- <id>install-ojdbc</id>
- <inherited>false</inherited>
- <phase>process-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>mvn</executable>
- <arguments>
- <argument>install:install-file</argument>
- <argument>-Dfile=ojdbc14-10.2.0.4.0.jar</argument>
- <argument>-DgroupId=com.oracle</argument>
- <argument>-DartifactId=ojdbc14</argument>
- <argument>-Dversion=10.2.0.4.0</argument>
- <argument>-Dpackaging=jar</argument>
- </arguments>
- <workingDirectory>${basedir}/../../ci-dependencies</workingDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<!-- resin-3 is not Apache license compatible, so it must be manually downloaded first -->
@@ -268,37 +236,6 @@
<modules>
<module>resin-4.x-plugin</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- <executions>
- <execution>
- <id>install-ojdbc</id>
- <inherited>false</inherited>
- <phase>process-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>mvn</executable>
- <arguments>
- <argument>install:install-file</argument>
- <argument>-Dfile=resin-4.0.41.jar</argument>
- <argument>-DgroupId=com.caucho</argument>
- <argument>-DartifactId=resin</argument>
- <argument>-Dversion=4.0.41</argument>
- <argument>-Dpackaging=jar</argument>
- </arguments>
- <workingDirectory>${basedir}/../../ci-dependencies</workingDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 3b60d2e..c746218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,43 +323,13 @@
</profile>
<profile>
<!-- resin is not Apache license compatible, so it must be manually downloaded first -->
+ <!-- Use resin 3.x jar file as a trigger only -->
<id>install-resin-3</id>
<activation>
<file>
<exists>${basedir}/ci-dependencies/resin-3.0.9.jar</exists>
</file>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- <executions>
- <execution>
- <id>install-resin-3</id>
- <inherited>false</inherited>
- <phase>process-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>mvn</executable>
- <arguments>
- <argument>install:install-file</argument>
- <argument>-Dfile=resin-3.0.9.jar</argument>
- <argument>-DgroupId=com.caucho</argument>
- <argument>-DartifactId=resin</argument>
- <argument>-Dversion=3.0.9</argument>
- <argument>-Dpackaging=jar</argument>
- </arguments>
- <workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<!-- resin is not Apache license compatible, so it must be manually downloaded first -->
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].