You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/09/22 15:57:06 UTC
incubator-juneau git commit: juneau-distrib should produce separate
src and bin packages.
Repository: incubator-juneau
Updated Branches:
refs/heads/master c1289c8a0 -> af11f7bc8
juneau-distrib should produce separate src and bin packages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/af11f7bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/af11f7bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/af11f7bc
Branch: refs/heads/master
Commit: af11f7bc8437cf0a75f98c67bd0ce4e0f94826b7
Parents: c1289c8
Author: jamesbognar <ja...@gmail.com>
Authored: Thu Sep 22 11:57:02 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Thu Sep 22 11:57:02 2016 -0400
----------------------------------------------------------------------
juneau-client/pom.xml | 14 +++++++++
juneau-core/pom.xml | 14 +++++++++
juneau-distrib/pom.xml | 54 ++++++++++++++++++++++++++++++++
juneau-distrib/src/assembly/bin.xml | 18 ++---------
juneau-distrib/src/assembly/src.xml | 34 ++++++++++++++++++++
juneau-microservice/pom.xml | 14 +++++++++
juneau-samples/pom.xml | 15 +++++++++
juneau-server/pom.xml | 14 +++++++++
pom.xml | 1 -
9 files changed, 162 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-client/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-client/pom.xml b/juneau-client/pom.xml
index afba1c0..8d7b9ba 100644
--- a/juneau-client/pom.xml
+++ b/juneau-client/pom.xml
@@ -55,6 +55,20 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-core/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-core/pom.xml b/juneau-core/pom.xml
index 8deb027..9874452 100644
--- a/juneau-core/pom.xml
+++ b/juneau-core/pom.xml
@@ -64,6 +64,20 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.2.201409121644</version>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-distrib/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-distrib/pom.xml b/juneau-distrib/pom.xml
index af83f29..3fe88c0 100644
--- a/juneau-distrib/pom.xml
+++ b/juneau-distrib/pom.xml
@@ -42,37 +42,90 @@
</goals>
<configuration>
<artifactItems>
+
<artifactItem>
+ <outputDirectory>${project.build.directory}/bin</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-all</artifactId>
<version>${project.version}</version>
</artifactItem>
+
<artifactItem>
+ <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-core</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
</artifactItem>
<artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-core</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-server</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
</artifactItem>
<artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-server</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-client</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
</artifactItem>
<artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-client</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-microservice</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-microservice</artifactId>
<version>${project.version}</version>
</artifactItem>
+
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-samples</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
+ </artifactItem>
<artifactItem>
+ <outputDirectory>${project.build.directory}/bin</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-samples</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
+ <outputDirectory>${project.build.directory}/bin</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-samples</artifactId>
<version>${project.version}</version>
@@ -96,6 +149,7 @@
</goals>
<configuration>
<descriptors>
+ <descriptor>src/assembly/src.xml</descriptor>
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-distrib/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/juneau-distrib/src/assembly/bin.xml b/juneau-distrib/src/assembly/bin.xml
index d847b64..f61f5ea 100644
--- a/juneau-distrib/src/assembly/bin.xml
+++ b/juneau-distrib/src/assembly/bin.xml
@@ -17,29 +17,17 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>all</id>
+ <id>bin</id>
<formats>
- <format>dir</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<includes>
- <include>*core*</include>
- <include>*client*</include>
- <include>*server*</include>
- <include>*microservice*</include>
+ <include>**</include>
</includes>
- <directory>target/dependency</directory>
- <outputDirectory>/osgi-bundles</outputDirectory>
- </fileSet>
- <fileSet>
- <includes>
- <include>*all*</include>
- <include>*samples*</include>
- </includes>
- <directory>target/dependency</directory>
+ <directory>target/bin</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-distrib/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/juneau-distrib/src/assembly/src.xml b/juneau-distrib/src/assembly/src.xml
new file mode 100644
index 0000000..0261574
--- /dev/null
+++ b/juneau-distrib/src/assembly/src.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ***************************************************************************************************************************
+ * 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. *
+ ***************************************************************************************************************************
+-->
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>**</include>
+ </includes>
+ <directory>target/src</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-microservice/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml
index 9dcf851..38ac1b2 100644
--- a/juneau-microservice/pom.xml
+++ b/juneau-microservice/pom.xml
@@ -58,6 +58,20 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-samples/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-samples/pom.xml b/juneau-samples/pom.xml
index 7bfec51..b515731 100644
--- a/juneau-samples/pom.xml
+++ b/juneau-samples/pom.xml
@@ -60,6 +60,21 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<!--
This runs the _TestSuite class.
You must run within the testsuite so the REST microservice is started for the tests.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/juneau-server/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-server/pom.xml b/juneau-server/pom.xml
index ccbe5c3..53b809b 100644
--- a/juneau-server/pom.xml
+++ b/juneau-server/pom.xml
@@ -54,6 +54,20 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/af11f7bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1c85cf..563484c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,6 @@
</executions>
</plugin>
- <!-- Generates the source code xref pages. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>