Skip to content

Commit

Permalink
Update groupId prefix to com.planet57.gshell
Browse files Browse the repository at this point in the history
Update to com.planet57.buildsupport:public-parent:1
org.sonatype.gshell -> com.planet57.gshell
Use gossip 2.0.0-SNAPSHOT
toss non-enabled command modules for now
Update version to 3.0.0-SNAPSHOT
  • Loading branch information
jdillon committed May 25, 2016
1 parent d5603f5 commit 5c61e41
Show file tree
Hide file tree
Showing 752 changed files with 26,948 additions and 32,406 deletions.
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: java

env:
global:
secure: mFUCLdRvMgBr7JAp6NStVrX2kuVH8WvnSP0qIF9KMNv4DEG3uHzS07eijOqDIWqjNRgEP9nYTiWueQ5lWrGZWK6O4zf8hY2pjWVzI5xQCwRa0UxTBVQOUxFFgcaeG4GIlvteKU07lvISwmx7X81AD/BnK3S0pGOWcUVPwekAasY=

branches:
except:
- /^release-.*$/

jdk:
- oraclejdk8

install: ./build ci-prepare -V -B -s .travis/settings.xml

script: ./build ci-deploy -V -B -s .travis/settings.xml
10 changes: 10 additions & 0 deletions .travis/settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<servers>
<server>
<id>ossrh</id>
<username>jdillon</username>
<password>${env.SONATYPE_PASSWORD}</password>
</server>
</servers>
</settings>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Check out and build:

After this completes, you can unzip the assembly and launch the shell:

unzip gshell-dist/gshell-assembly/target/gshell-*-bin.zip
./gshell-*/bin/gsh
unzip -d target gshell-dist/gshell-assembly/target/gshell-*-bin.zip
./target/gshell-*/bin/gsh

Use the 'help' command for further assistance.

Expand Down
95 changes: 95 additions & 0 deletions build
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#!/bin/bash
basename=`basename $0`
dirname=`dirname $0`
dirname=`cd "$dirname" && pwd`
cd "$dirname"

# load optional config
if [ -f ./build.rc ]; then
source ./build.rc
fi

# show message and exit
function die {
echo "$1"
exit 1
}

# show usage and exit
function usage {
echo "usage: $basename $*"
exit 2
}

# run self
function self {
$0 $*
}

# run maven
function mvn {
./mvnw $*
}

command="$1"; shift
case "$command" in
# change the version of the project
change-version)
newVersion="$1"
if [ -z "$newVersion" ]; then
usage "$command <version>"
fi

mvn org.eclipse.tycho:tycho-versions-plugin:0.25.0:set-version \
-Dtycho.mode=maven \
-Dartifacts=gshell \
-Dproperties=gshell.version \
-DnewVersion="$newVersion"
;;

# check license headers
license-check)
mvn -Plicense-check -N
;;

# format license headers
license-format)
mvn -Plicense-format -N
;;

# prepare CI build
ci-prepare)
self license-check $*
;;

# build and deploy for CI
ci-deploy)
mvn clean deploy $*
;;

# release automation
release)
version="$1"
nextVersion="$2"
if [ -z "$version" -o -z "$nextVersion" ]; then
usage "$command <version> <next-version>"
fi
releaseTag="release-$version"

# update version and tag
self change-version "$version"
git commit -a -m "update version: $version"
git tag $releaseTag

# deploy release
mvn -Pbuildsupport-release clean deploy

# update to next version
self change-version "$nextVersion"
git commit -a -m "update version: $nextVersion"
;;

*)
usage "<command> [options]"
;;
esac
99 changes: 50 additions & 49 deletions gshell-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,61 +16,62 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.gshell</groupId>
<artifactId>gshell</artifactId>
<version>2.7.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>com.planet57.gshell</groupId>
<artifactId>gshell</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>gshell-bootstrap</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<artifactId>gshell-bootstrap</artifactId>
<name>${project.groupId}:${project.artifactId}</name>

<dependencies>
<dependency>
<groupId>org.sonatype.gshell</groupId>
<artifactId>gshell-launcher</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>com.planet57.gshell</groupId>
<artifactId>gshell-launcher</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.sonatype.gshell</groupId>
<artifactId>gshell-launcher</artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<excludes>META-INF/maven/**</excludes>
</configuration>
</execution>
</executions>
</plugin>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.planet57.gshell</groupId>
<artifactId>gshell-launcher</artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<excludes>META-INF/maven/**</excludes>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
</plugins>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
</plugins>
</build>

</project>

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

shell.main=org.sonatype.gshell.Main
shell.main=com.planet57.gshell.Main
shell.program=gsh
shell.version=${project.version},${build.timestamp}
52 changes: 0 additions & 52 deletions gshell-commands/gshell-artifact/pom.xml

This file was deleted.

Loading

0 comments on commit 5c61e41

Please sign in to comment.