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 2019/11/25 21:41:15 UTC
[juneau] branch master updated: Fix contents of juneau-distrib
pom.xml
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 151561f Fix contents of juneau-distrib pom.xml
151561f is described below
commit 151561f04dc0670cf4101e85a1af768f37ea181f
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Nov 25 16:40:57 2019 -0500
Fix contents of juneau-distrib pom.xml
---
juneau-release.sh | 44 +++++++++---
juneau-releng/juneau-distrib/pom.xml | 132 +++++++++++++++++++++++++++++------
2 files changed, 147 insertions(+), 29 deletions(-)
diff --git a/juneau-release.sh b/juneau-release.sh
index bbd2234..fe8daa2 100755
--- a/juneau-release.sh
+++ b/juneau-release.sh
@@ -84,8 +84,15 @@ cd ~/.m2
message "Cleaning existing Git repository"
st
-mv repository repository-old
-rm -rf repository-old &
+if [ "$X_CLEANM2" != "N" ] && [ "$X_CLEANM2" != "n" ]
+then
+ mv repository repository-old
+ rm -rf repository-old &
+fi
+et
+
+message "Making git folder"
+st
rm -rf $X_STAGING
mkdir -p $X_STAGING
mkdir $X_STAGING/git
@@ -123,12 +130,33 @@ WORKSPACE=target/workspace
XV=${X_VERSION}-SNAPSHOT
rm -Rf $WORKSPACE
mkdir -p $WORKSPACE
-unzip -o juneau-microservice/juneau-my-jetty-microservice/target/my-jetty-microservice-$XV-bin.zip -d $WORKSPACE/my-jetty-microservice
-unzip -o juneau-microservice/juneau-my-springboot-microservice/target/my-springboot-microservice-$XV-bin.zip -d $WORKSPACE/my-springboot-microservice
-unzip -o juneau-examples/juneau-examples-core/target/juneau-examples-core-$XV-bin.zip -d $WORKSPACE/juneau-examples-core
-unzip -o juneau-examples/juneau-examples-rest-jetty/target/juneau-examples-rest-jetty-$XV-bin.zip -d $WORKSPACE/juneau-examples-rest-jetty
-unzip -o juneau-examples/juneau-examples-rest-springboot/target/juneau-examples-rest-springboot-$XV-bin.zip -d $WORKSPACE/juneau-examples-rest-springboot
-yprompt "Can all workspace projecs in $X_STAGING/git/juneau/target/workspace be cleanly imported into Eclipse?"
+
+ZIP_SRC=juneau-microservice/juneau-my-jetty-microservice/target/my-jetty-microservice-$XV-bin.zip
+ZIP_TGT=$WORKSPACE/my-jetty-microservice
+echo Unzipping $ZIP_SRC to $ZIP_TGT
+unzip -o $ZIP_SRC -d $ZIP_TGT
+
+ZIP_SRC=juneau-microservice/juneau-my-springboot-microservice/target/my-springboot-microservice-$XV-bin.zip
+ZIP_TGT=$WORKSPACE/my-springboot-microservice
+echo Unzipping $ZIP_SRC to $ZIP_TGT
+unzip -o $ZIP_SRC -d $ZIP_TGT
+
+ZIP_SRC=juneau-examples/juneau-examples-core/target/juneau-examples-core-$XV-bin.zip
+ZIP_TGT=$WORKSPACE/juneau-examples-core
+echo Unzipping $ZIP_SRC to $ZIP_TGT
+unzip -o $ZIP_SRC -d $ZIP_TGT
+
+ZIP_SRC=juneau-examples/juneau-examples-rest-jetty/target/juneau-examples-rest-jetty-$XV-bin.zip
+ZIP_TGT=$WORKSPACE/juneau-examples-rest-jetty
+echo Unzipping $ZIP_SRC to $ZIP_TGT
+unzip -o $ZIP_SRC -d $ZIP_TGT
+
+ZIP_SRC=juneau-examples/juneau-examples-rest-springboot/target/juneau-examples-rest-springboot-$XV-bin.zip
+ZIP_TGT=$WORKSPACE/juneau-examples-rest-springboot
+echo Unzipping $ZIP_SRC to $ZIP_TGT
+unzip -o $ZIP_SRC -d $ZIP_TGT
+
+yprompt "Can all workspace projecs in $X_STAGING/git/juneau/target/workspace be cleanly imported as Maven projects into Eclipse?"
message "Running deploy"
st
diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml
index 7100b44..81442ee 100644
--- a/juneau-releng/juneau-distrib/pom.xml
+++ b/juneau-releng/juneau-distrib/pom.xml
@@ -43,6 +43,7 @@
<configuration>
<artifactItems>
+ <!-- juneau-all -->
<artifactItem>
<outputDirectory>${project.build.directory}/src</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -58,6 +59,7 @@
<version>${project.version}</version>
</artifactItem>
+ <!-- juneau-marshall -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -80,6 +82,7 @@
<destFileName>org.apache.juneau.marshall_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-marshall-rdf -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -102,10 +105,11 @@
<destFileName>org.apache.juneau.marshall.rdf_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-config -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-svl</artifactId>
+ <artifactId>juneau-config</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
@@ -113,21 +117,22 @@
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-svl</artifactId>
+ <artifactId>juneau-config</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-svl</artifactId>
+ <artifactId>juneau-config</artifactId>
<version>${project.version}</version>
- <destFileName>org.apache.juneau.svl_${project.version}.jar</destFileName>
+ <destFileName>org.apache.juneau.config_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-dto -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-config</artifactId>
+ <artifactId>juneau-dto</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
@@ -135,21 +140,22 @@
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-config</artifactId>
+ <artifactId>juneau-dto</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-config</artifactId>
+ <artifactId>juneau-dto</artifactId>
<version>${project.version}</version>
- <destFileName>org.apache.juneau.config_${project.version}.jar</destFileName>
+ <destFileName>org.apache.juneau.dto_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-rest-server -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-dto</artifactId>
+ <artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
@@ -157,21 +163,22 @@
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-dto</artifactId>
+ <artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-dto</artifactId>
+ <artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
- <destFileName>org.apache.juneau.dto_${project.version}.jar</destFileName>
+ <destFileName>org.apache.juneau.rest.server_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-rest-server-jaxrs -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
+ <artifactId>juneau-rest-server-jaxrs</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
@@ -179,21 +186,22 @@
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
+ <artifactId>juneau-rest-server-jaxrs</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
+ <artifactId>juneau-rest-server-jaxrs</artifactId>
<version>${project.version}</version>
- <destFileName>org.apache.juneau.rest.server_${project.version}.jar</destFileName>
+ <destFileName>org.apache.juneau.rest.server.jaxrs_${project.version}.jar</destFileName>
</artifactItem>
-
+
+ <!-- juneau-rest-server-rdf -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-jaxrs</artifactId>
+ <artifactId>juneau-rest-server-rdf</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
@@ -201,17 +209,18 @@
<artifactItem>
<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-jaxrs</artifactId>
+ <artifactId>juneau-rest-server-rdf</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-jaxrs</artifactId>
+ <artifactId>juneau-rest-server-rdf</artifactId>
<version>${project.version}</version>
- <destFileName>org.apache.juneau.rest.server.jaxrs_${project.version}.jar</destFileName>
+ <destFileName>org.apache.juneau.rest.server.rdf_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-rest-server-springboot -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -234,6 +243,7 @@
<destFileName>org.apache.juneau.rest.server.springboot_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-rest-client -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -256,6 +266,30 @@
<destFileName>org.apache.juneau.rest.client_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-rest-mock -->
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-mock</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-mock</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-mock</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.rest.mock_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!-- juneau-microservice-core -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -278,6 +312,53 @@
<destFileName>org.apache.juneau.microservice.core_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-sc-server -->
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-sc-server</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-sc-server</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-sc-server</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.sc.server_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!-- juneau-sc-client -->
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-sc-client</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-sc-client</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-sc-client</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.sc.client_${project.version}.jar</destFileName>
+ </artifactItem>
+
+ <!-- juneau-microservice-jetty -->
<artifactItem>
<outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -300,6 +381,7 @@
<destFileName>org.apache.juneau.microservice.jetty_${project.version}.jar</destFileName>
</artifactItem>
+ <!-- juneau-examples-core -->
<artifactItem>
<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -309,6 +391,8 @@
<version>${project.version}</version>
<destFileName>juneau-examples-core-${project.version}.zip</destFileName>
</artifactItem>
+
+ <!-- juneau-examples-rest-jetty -->
<artifactItem>
<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -318,6 +402,8 @@
<version>${project.version}</version>
<destFileName>juneau-examples-rest-jetty-${project.version}.zip</destFileName>
</artifactItem>
+
+ <!-- juneau-examples-springboot -->
<artifactItem>
<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -327,6 +413,8 @@
<version>${project.version}</version>
<destFileName>juneau-examples-rest-springboot-${project.version}.zip</destFileName>
</artifactItem>
+
+ <!-- juneau-my-jetty-microservice -->
<artifactItem>
<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
<groupId>org.apache.juneau</groupId>
@@ -336,6 +424,8 @@
<version>${project.version}</version>
<destFileName>my-jetty-microservice-${project.version}.zip</destFileName>
</artifactItem>
+
+ <!-- juneau-my-springboot-microservice -->
<artifactItem>
<outputDirectory>${project.build.directory}/bin/projects</outputDirectory>
<groupId>org.apache.juneau</groupId>