Skip to content
This repository was archived by the owner on Jan 28, 2019. It is now read-only.

Commit fe182d4

Browse files
author
Sameer Pandit
committed
changes to pom, assembly descriptor
1 parent 30ed073 commit fe182d4

File tree

4 files changed

+123
-33
lines changed

4 files changed

+123
-33
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ watch for changes and rebuild incrementally.
5555
## Deploy the site to Github Pages
5656

5757
```
58-
mvn deploy
58+
mvn deploy -Ppublish-site
5959
```
6060

6161
## Produce a zip file for download

pom.xml

+41-31
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,25 @@
4242
-->
4343
<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/maven-v4_0_0.xsd">
4444
<modelVersion>4.0.0</modelVersion>
45-
<groupId>org.glassfish</groupId>
45+
<parent>
46+
<groupId>net.java</groupId>
47+
<artifactId>jvnet-parent</artifactId>
48+
<version>5</version>
49+
</parent>
50+
<groupId>org.glassfish.docs</groupId>
4651
<artifactId>javaee-tutorial</artifactId>
4752
<packaging>pom</packaging>
48-
<version>1.0.0-SNAPSHOT</version>
53+
<version>8.0-SNAPSHOT</version>
4954
<name>Java EE Tutorial</name>
50-
5155
<properties>
5256
<site.output.dir>${project.build.directory}/staging</site.output.dir>
5357
<maven.site.skip>true</maven.site.skip>
54-
<maven.deploy.skip>true</maven.deploy.skip>
5558
</properties>
56-
57-
<distributionManagement>
58-
<site>
59-
<url>scm:git:[email protected]:javaee/tutorial.git</url>
60-
</site>
61-
</distributionManagement>
62-
59+
<scm>
60+
<connection>scm:git:[email protected]:javaee/firstcup.git</connection>
61+
<developerConnection>scm:git:[email protected]:javaee/firstcup.git</developerConnection>
62+
<url>https://github.com/javaee/firstcup</url>
63+
</scm>
6364
<build>
6465
<defaultGoal>package</defaultGoal>
6566
<plugins>
@@ -113,26 +114,6 @@
113114
</dependency>
114115
</dependencies>
115116
</plugin>
116-
<plugin>
117-
<groupId>org.apache.maven.plugins</groupId>
118-
<artifactId>maven-scm-publish-plugin</artifactId>
119-
<version>1.1</version>
120-
<executions>
121-
<execution>
122-
<id>deploy-site</id>
123-
<phase>deploy</phase>
124-
<goals>
125-
<goal>publish-scm</goal>
126-
</goals>
127-
<configuration>
128-
<scmBranch>gh-pages</scmBranch>
129-
<skipDeletedFiles>false</skipDeletedFiles>
130-
<checkinComment>Update site</checkinComment>
131-
</configuration>
132-
</execution>
133-
</executions>
134-
</plugin>
135-
136117
<!--
137118
This is the rule that builds the zip file for download.
138119
-->
@@ -165,4 +146,33 @@
165146
</plugins>
166147
</pluginManagement>
167148
</build>
149+
<profiles>
150+
<profile>
151+
<id>publish-site</id>
152+
<build>
153+
<plugins>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-scm-publish-plugin</artifactId>
157+
<version>1.1</version>
158+
<executions>
159+
<execution>
160+
<id>deploy-site</id>
161+
<phase>deploy</phase>
162+
<goals>
163+
<goal>publish-scm</goal>
164+
</goals>
165+
<configuration>
166+
<scmBranch>gh-pages</scmBranch>
167+
<skipDeletedFiles>false</skipDeletedFiles>
168+
<checkinComment>Update site</checkinComment>
169+
</configuration>
170+
</execution>
171+
</executions>
172+
</plugin>
173+
</plugins>
174+
</build>
175+
</profile>
176+
</profiles>
177+
168178
</project>

release.sh

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#!/bin/sh
2+
#
3+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4+
#
5+
# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
6+
#
7+
# The contents of this file are subject to the terms of either the GNU
8+
# General Public License Version 2 only ("GPL") or the Common Development
9+
# and Distribution License("CDDL") (collectively, the "License"). You
10+
# may not use this file except in compliance with the License. You can
11+
# obtain a copy of the License at
12+
# https://oss.oracle.com/licenses/CDDL+GPL-1.1
13+
# or LICENSE.txt. See the License for the specific
14+
# language governing permissions and limitations under the License.
15+
#
16+
# When distributing the software, include this License Header Notice in each
17+
# file and include the License file at LICENSE.txt.
18+
#
19+
# GPL Classpath Exception:
20+
# Oracle designates this particular file as subject to the "Classpath"
21+
# exception as provided by Oracle in the GPL Version 2 section of the License
22+
# file that accompanied this code.
23+
#
24+
# Modifications:
25+
# If applicable, add the following below the License Header, with the fields
26+
# enclosed by brackets [] replaced by your own identifying information:
27+
# "Portions Copyright [year] [name of copyright owner]"
28+
#
29+
# Contributor(s):
30+
# If you wish your version of this file to be governed by only the CDDL or
31+
# only the GPL Version 2, indicate your decision by adding "[Contributor]
32+
# elects to include this software in this distribution under the [CDDL or GPL
33+
# Version 2] license." If you don't indicate a single choice of license, a
34+
# recipient has the option to distribute your version of this file under
35+
# either the CDDL, the GPL Version 2 or to extend the choice of license to
36+
# its licensees as provided above. However, if you add GPL Version 2 code
37+
# and therefore, elected the GPL Version 2 license, then the option applies
38+
# only if the new code is made subject to such option by the copyright
39+
# holder.
40+
#
41+
42+
#------------------------------------------------------
43+
#-- BE SURE TO HAVE THE FOLLOWING IN YOUR SETTINGS.XML
44+
#------------------------------------------------------
45+
#
46+
# <servers>
47+
# <server>
48+
# <id>jvnet-nexus-staging</id>
49+
# <username>jvnet_id</username>
50+
# <password>password</password>
51+
# </server>
52+
# </servers>
53+
# <profiles>
54+
# <profile>
55+
# <id>release</id>
56+
# <properties>
57+
# <release.arguments>-Dhttps.proxyHost=www-proxy.us.oracle.com -Dhttps.proxyPort=80 -Dgpg.passphrase=glassfish</release.arguments>
58+
# </properties>
59+
# <activation>
60+
# <activeByDefault>false</activeByDefault>
61+
# </activation>
62+
# </profile>
63+
# </profiles>
64+
65+
# see the following URL for gpg issues
66+
# https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven#HowToGeneratePGPSignaturesWithMaven-GenerateaKeyPair
67+
68+
# login to nexus at maven.java.net and release (Close) the artifact
69+
# https://maven.java.net/index.html#stagingRepositories
70+
71+
# More information:
72+
# https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8.ReleaseIt
73+
# http://aseng-wiki.us.oracle.com/asengwiki/display/GlassFish/Migrating+Maven+deployment+to+maven.java.net
74+
75+
ARGS=" $*"
76+
# everything supplied as argument will be provided to every maven command.
77+
# e.g to supply -Dmaven.skip.test or -Dmaven.repo.local=/path/to/repo
78+
79+
mvn -B -e release:prepare -DpreparationGoals="'install' $ARGS" $ARGS -Pjvnet-release,release
80+
mvn -B -e release:perform -Dgoals="'deploy' $ARGS" $ARGS -Pjvnet-release,release

tutorial.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<fileSets>
5151
<fileSet>
5252
<directory>target/staging</directory>
53-
<outputDirectory>docs</outputDirectory>
53+
<outputDirectory>doc</outputDirectory>
5454
<excludes>
5555
<exclude>_config.yml</exclude>
5656
<exclude>_layouts/**</exclude>

0 commit comments

Comments
 (0)