You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2016/01/07 10:43:29 UTC

incubator-unomi git commit: UNOMI-7 - Remove need for JDK 8 to compile sample - Activate the src profile to generate source code packages by default.

Repository: incubator-unomi
Updated Branches:
  refs/heads/master 8ef38b9ec -> 47d47fdc0


UNOMI-7
- Remove need for JDK 8 to compile sample
- Activate the src profile to generate source code packages by default.


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/47d47fdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/47d47fdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/47d47fdc

Branch: refs/heads/master
Commit: 47d47fdc0775f5952af7c259a5d0497f6ca58a27
Parents: 8ef38b9
Author: Serge Huber <sh...@apache.org>
Authored: Thu Jan 7 10:43:24 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Thu Jan 7 10:43:24 2016 +0100

----------------------------------------------------------------------
 package/pom.xml                      |  3 +++
 package/src/main/descriptors/src.xml | 12 +-----------
 samples/tweet-button-plugin/pom.xml  |  9 ---------
 3 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/47d47fdc/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 49e3d3c..9e01503 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -231,6 +231,9 @@
     <profiles>
         <profile>
             <id>src</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/47d47fdc/package/src/main/descriptors/src.xml
----------------------------------------------------------------------
diff --git a/package/src/main/descriptors/src.xml b/package/src/main/descriptors/src.xml
index 2aa7625..bffa142 100644
--- a/package/src/main/descriptors/src.xml
+++ b/package/src/main/descriptors/src.xml
@@ -26,25 +26,15 @@
 
     <fileSets>
         <fileSet>
-            <directory>${basedir}/../..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
-                <exclude>LICENSE</exclude>
-                <exclude>NOTICE</exclude>
                 <exclude>**/target/**</exclude>
                 <exclude>**/eclipse-classes/**</exclude>
                 <exclude>**/*.i??</exclude>
                 <exclude>**/.idea/**</exclude>
             </excludes>
         </fileSet>
-        <fileSet>
-            <directory>src/main/distribution/src</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
     </fileSets>
 
 </assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/47d47fdc/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index 66c61c2..afff92e 100644
--- a/samples/tweet-button-plugin/pom.xml
+++ b/samples/tweet-button-plugin/pom.xml
@@ -40,15 +40,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>3.0.1</version>