You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/08/18 14:18:10 UTC
cayenne git commit: returning back maven-remote-resource-plugin
explicit declarations
Repository: cayenne
Updated Branches:
refs/heads/master e91e11a44 -> 1095966a2
returning back maven-remote-resource-plugin explicit declarations
... need to organize code in subfolders along the lines of mvn config
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1095966a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1095966a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1095966a
Branch: refs/heads/master
Commit: 1095966a27f744f5f15415c4ffb11cd71b72b531
Parents: e91e11a
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Thu Aug 18 17:12:57 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Thu Aug 18 17:12:57 2016 +0300
----------------------------------------------------------------------
cayenne-client-jetty/pom.xml | 11 +++++++++++
cayenne-client/pom.xml | 16 ++++++++++++++++
cayenne-crypto/pom.xml | 11 +++++++++++
cayenne-dbcp2/pom.xml | 11 +++++++++++
cayenne-di/pom.xml | 11 +++++++++++
cayenne-java8/pom.xml | 11 +++++++++++
cayenne-joda/pom.xml | 11 +++++++++++
cayenne-lifecycle/pom.xml | 15 +++++++++++++++
cayenne-project/pom.xml | 16 ++++++++++++++++
cayenne-protostuff/pom.xml | 11 +++++++++++
cayenne-server/pom.xml | 11 +++++++++++
cayenne-tools/pom.xml | 11 +++++++++++
itests/pom.xml | 7 +++++++
modeler/pom.xml | 16 ++++++++++++++++
plugins/pom.xml | 11 +++++++++++
pom.xml | 11 -----------
tutorials/pom.xml | 16 ++++++++++++++++
17 files changed, 196 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-client-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml
index 37120f6..946cb15 100644
--- a/cayenne-client-jetty/pom.xml
+++ b/cayenne-client-jetty/pom.xml
@@ -121,6 +121,17 @@
<target>1.8</target>
</configuration>
</plugin>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-client/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml
index d7e0a31..5c9affb 100644
--- a/cayenne-client/pom.xml
+++ b/cayenne-client/pom.xml
@@ -91,6 +91,22 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>code-quality</id>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml
index a47376b..14a5e1b 100644
--- a/cayenne-crypto/pom.xml
+++ b/cayenne-crypto/pom.xml
@@ -68,6 +68,17 @@
</dependencies>
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.cayenne.plugins</groupId>
<artifactId>maven-cayenne-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-dbcp2/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbcp2/pom.xml b/cayenne-dbcp2/pom.xml
index 3854866..5308f7b 100644
--- a/cayenne-dbcp2/pom.xml
+++ b/cayenne-dbcp2/pom.xml
@@ -49,6 +49,17 @@
</dependencies>
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<!--<configuration> <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-di/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-di/pom.xml b/cayenne-di/pom.xml
index 0fe0c2a..c284f17 100644
--- a/cayenne-di/pom.xml
+++ b/cayenne-di/pom.xml
@@ -29,6 +29,17 @@
</dependencies>
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-java8/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/pom.xml b/cayenne-java8/pom.xml
index 938a982..7f1ee61 100644
--- a/cayenne-java8/pom.xml
+++ b/cayenne-java8/pom.xml
@@ -49,6 +49,17 @@
</dependencies>
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-joda/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml
index 2022bf8..70623e5 100644
--- a/cayenne-joda/pom.xml
+++ b/cayenne-joda/pom.xml
@@ -77,6 +77,17 @@
</dependencies>
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.cayenne.plugins</groupId>
<artifactId>maven-cayenne-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-lifecycle/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml
index 904c7f8..3930824 100644
--- a/cayenne-lifecycle/pom.xml
+++ b/cayenne-lifecycle/pom.xml
@@ -66,6 +66,21 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>code-quality</id>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-project/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml
index 5cb3f09..0d04e47 100644
--- a/cayenne-project/pom.xml
+++ b/cayenne-project/pom.xml
@@ -54,6 +54,22 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>code-quality</id>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-protostuff/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/pom.xml b/cayenne-protostuff/pom.xml
index 10655be..05ffe0e 100644
--- a/cayenne-protostuff/pom.xml
+++ b/cayenne-protostuff/pom.xml
@@ -90,6 +90,17 @@
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 9a400e4..bf9c8e7 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -166,6 +166,17 @@
</resource>
</resources>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/cayenne-tools/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-tools/pom.xml b/cayenne-tools/pom.xml
index 0a26cb8..581c7df 100644
--- a/cayenne-tools/pom.xml
+++ b/cayenne-tools/pom.xml
@@ -118,6 +118,17 @@
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index ac4ae88..8b37338 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -45,6 +45,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/pom.xml b/modeler/pom.xml
index 218c4fe..64a42a5 100644
--- a/modeler/pom.xml
+++ b/modeler/pom.xml
@@ -41,4 +41,20 @@
<module>cayenne-modeler-mac</module>
<module>cayenne-modeler-win</module>
</modules>
+
+ <build>
+ <plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4068ec9..f23e9db 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -78,6 +78,17 @@
<build>
<plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93c6d66..b38d9e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -891,17 +891,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
- <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1095966a/tutorials/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index fc467ab..4974578 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -36,6 +36,22 @@
<module>tutorial-rop-client</module>
</modules>
+ <build>
+ <plugins>
+ <!-- This ensures LICESNE and NOTICE inclusion in all jars -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>cayenne-java8-module-to-build</id>