You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/21 10:24:52 UTC
[1/2] camel git commit: Upgrade RX
Repository: camel
Updated Branches:
refs/heads/master a5d458ddf -> f21452ad4
Upgrade RX
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f21452ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f21452ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f21452ad
Branch: refs/heads/master
Commit: f21452ad4521a9a474532b468f1d6cd6d346c80f
Parents: 4fc10ce
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jun 21 12:03:35 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 21 12:24:34 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f21452ad/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2011aea..f917846 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -570,7 +570,7 @@
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
<rxjava-version>1.3.0</rxjava-version>
- <rxjava2-version>2.1.0</rxjava2-version>
+ <rxjava2-version>2.1.1</rxjava2-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.7.0-18_1</saxon-bundle-version>
<saxon-version>9.7.0-18</saxon-version>
[2/2] camel git commit: CAMEL-11428 removed outdated IDEA plugin and
doc
Posted by da...@apache.org.
CAMEL-11428 removed outdated IDEA plugin and doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4fc10ce7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4fc10ce7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4fc10ce7
Branch: refs/heads/master
Commit: 4fc10ce7b35009b90ba1980e5e5af5168b0c3e74
Parents: a5d458d
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Tue Jun 20 14:10:09 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 21 12:24:34 2017 +0200
----------------------------------------------------------------------
etc/idea/README.txt | 22 ----------------------
etc/idea/settings.jar | Bin 9959 -> 0 bytes
pom.xml | 17 -----------------
3 files changed, 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4fc10ce7/etc/idea/README.txt
----------------------------------------------------------------------
diff --git a/etc/idea/README.txt b/etc/idea/README.txt
deleted file mode 100644
index 2cab261..0000000
--- a/etc/idea/README.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-To setup an IntelliJ project: (tested with version 5.1.2)
-
-1) From the trunk, run "mvn process-test-sources -Pnochecks idea:idea"
-
-2) From IntelliJ, open the project created above
-
-3) From IntelliJ, select "File -> Import Settings". Navigate to this folder
- and sellect the settings.jar file. Let it import everything. Restart.
-
-4) From IntelliJ, select "File -> Settings", select "Project Code Style",
- "Use per-project code style","Import", and select the "CXFStyle" option.
-
-Optional:
-5) If you have the "JetStyle" plugin installed, select "File -> Settings",
- "Checkstyle", "Select Checkstyle Configuration", navigate to trunk/checkstyle.xml.
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/camel/blob/4fc10ce7/etc/idea/settings.jar
----------------------------------------------------------------------
diff --git a/etc/idea/settings.jar b/etc/idea/settings.jar
deleted file mode 100644
index 06efeec..0000000
Binary files a/etc/idea/settings.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/camel/blob/4fc10ce7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60333e9..078ce11 100755
--- a/pom.xml
+++ b/pom.xml
@@ -209,23 +209,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.2.1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>