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

Commit c28cb6d

Browse files
mskdeepak-oraclemskdeepak-oracle
committed
Update dbschema to release82
1 parent 4966218 commit c28cb6d

File tree

2 files changed

+37
-47
lines changed

2 files changed

+37
-47
lines changed

‎dbschema/pom.xml‎

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
and Distribution License("CDDL") (collectively, the "License"). You
1111
may not use this file except in compliance with the License. You can
1212
obtain a copy of the License at
13-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
14-
or packager/legal/LICENSE.txt. See the License for the specific
13+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14+
or LICENSE.txt. See the License for the specific
1515
language governing permissions and limitations under the License.
1616
1717
When distributing the software, include this License Header Notice in each
18-
file and include the License file at packager/legal/LICENSE.txt.
18+
file and include the License file at LICENSE.txt.
1919
2020
GPL Classpath Exception:
2121
Oracle designates this particular file as subject to the "Classpath"
@@ -40,20 +40,21 @@
4040
holder.
4141
4242
-->
43+
4344
<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">
4445
<modelVersion>4.0.0</modelVersion>
4546
<parent>
4647
<groupId>net.java</groupId>
4748
<artifactId>jvnet-parent</artifactId>
48-
<version>4</version>
49+
<version>5</version>
4950
</parent>
5051
<groupId>org.glassfish.external</groupId>
5152
<artifactId>dbschema</artifactId>
5253
<version>6.6-SNAPSHOT</version>
5354
<name>DBschema repackaged as an OSGI bundle</name>
5455

5556
<properties>
56-
<dbschema.version>RELEASE65</dbschema.version>
57+
<dbschema.version>RELEASE82</dbschema.version>
5758
<dbschema.osgi.version>6.5</dbschema.osgi.version>
5859
<release.arguments />
5960
</properties>
@@ -74,48 +75,21 @@
7475
<licenses>
7576
<license>
7677
<name>CDDL + GPLv2 with classpath exception</name>
77-
<url>http://glassfish.java.net/nonav/public/CDDL+GPL.html</url>
78+
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
7879
<distribution>repo</distribution>
7980
<comments>A business-friendly OSS license</comments>
8081
</license>
8182
</licenses>
8283

8384
<scm>
84-
<connection>scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/external/repackaged/dbschema</connection>
85-
<developerConnection>scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/external/repackaged/dbschema</developerConnection>
86-
<url>https://svn.java.net/svn/glassfish~svn/trunk/external/repackaged/dbschema</url>
85+
<connection>scm:git:git@github.com:javaee/repackaged.git</connection>
86+
<developerConnection>scm:git:git@github.com:javaee/repackaged.git</developerConnection>
87+
<url>https://github.com/javaee/repackaged.git</url>
8788
</scm>
8889

89-
<mailingLists>
90-
<mailingList>
91-
<name>dev</name>
92-
<subscribe>http://java.net/projects/glassfish/lists</subscribe>
93-
<post>dev@glassfish.java.net</post>
94-
<archive>http://java.net/projects/glassfish/lists/dev/archive</archive>
95-
</mailingList>
96-
<mailingList>
97-
<name>users</name>
98-
<subscribe>http://java.net/projects/glassfish/lists</subscribe>
99-
<post>users@glassfish.java.net</post>
100-
<archive>http://java.net/projects/glassfish/lists/users/archive</archive>
101-
</mailingList>
102-
<mailingList>
103-
<name>issues</name>
104-
<subscribe>http://java.net/projects/glassfish/lists</subscribe>
105-
<post>issues@glassfish.java.net</post>
106-
<archive>http://java.net/projects/glassfish/lists/issues/archive</archive>
107-
</mailingList>
108-
<mailingList>
109-
<name>commits</name>
110-
<subscribe>http://java.net/projects/glassfish/lists</subscribe>
111-
<post>commits@glassfish.java.net</post>
112-
<archive>http://java.net/projects/glassfish/lists/commits/archive</archive>
113-
</mailingList>
114-
</mailingLists>
115-
11690
<issueManagement>
11791
<system>IssueTracker</system>
118-
<url>http://java.net/jira/browse/GLASSFISH</url>
92+
<url>https://github.com/javaee/repackaged/issues</url>
11993
</issueManagement>
12094

12195
<build>
@@ -124,7 +98,7 @@
12498
<plugin>
12599
<groupId>org.apache.felix</groupId>
126100
<artifactId>maven-bundle-plugin</artifactId>
127-
<version>1.4.3</version>
101+
<version>3.3.0</version>
128102
</plugin>
129103
<plugin>
130104
<groupId>org.apache.maven.plugins</groupId>
@@ -134,7 +108,7 @@
134108
<plugin>
135109
<groupId>org.apache.maven.plugins</groupId>
136110
<artifactId>maven-source-plugin</artifactId>
137-
<version>2.2.1</version>
111+
<version>3.0.1</version>
138112
</plugin>
139113
<plugin>
140114
<groupId>org.apache.maven.plugins</groupId>
@@ -286,6 +260,23 @@
286260
</execution>
287261
</executions>
288262
</plugin>
263+
<plugin>
264+
<groupId>org.apache.maven.plugins</groupId>
265+
<artifactId>maven-release-plugin</artifactId>
266+
<version>2.5.2</version>
267+
<configuration>
268+
<mavenExecutorId>forked-path</mavenExecutorId>
269+
<useReleaseProfile>false</useReleaseProfile>
270+
<arguments>${release.arguments}</arguments>
271+
</configuration>
272+
<dependencies>
273+
<dependency>
274+
<groupId>org.apache.maven.scm</groupId>
275+
<artifactId>maven-scm-provider-gitexe</artifactId>
276+
<version>1.9.4</version>
277+
</dependency>
278+
</dependencies>
279+
</plugin>
289280
</plugins>
290281
</build>
291282

‎dbschema/release.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
#
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
#
5-
# Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
5+
# Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
66
#
77
# The contents of this file are subject to the terms of either the GNU
88
# General Public License Version 2 only ("GPL") or the Common Development
99
# and Distribution License("CDDL") (collectively, the "License"). You
1010
# may not use this file except in compliance with the License. You can
1111
# obtain a copy of the License at
12-
# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
13-
# or packager/legal/LICENSE.txt. See the License for the specific
12+
# https://oss.oracle.com/licenses/CDDL+GPL-1.1
13+
# or LICENSE.txt. See the License for the specific
1414
# language governing permissions and limitations under the License.
1515
#
1616
# When distributing the software, include this License Header Notice in each
17-
# file and include the License file at packager/legal/LICENSE.txt.
17+
# file and include the License file at LICENSE.txt.
1818
#
1919
# GPL Classpath Exception:
2020
# Oracle designates this particular file as subject to the "Classpath"
@@ -60,7 +60,7 @@
6060
# <id>release</id>
6161
# <properties>
6262
# <user.name>jvnet_id</user.name>
63-
# <release.arguments>-Dhttps.proxyHost=www-proxy.us.oracle.com -Dhttps.proxyPort=80 -Dgpg.passphrase=glassfish</release.arguments>
63+
# <release.arguments>-Dhttps.proxyHost=<proxy-server> -Dhttps.proxyPort=80 -Dgpg.passphrase=glassfish</release.arguments>
6464
# </properties>
6565
# <activation>
6666
# <activeByDefault>false</activeByDefault>
@@ -76,7 +76,6 @@
7676

7777
# More information:
7878
# https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8.ReleaseIt
79-
# http://aseng-wiki.us.oracle.com/asengwiki/display/GlassFish/Migrating+Maven+deployment+to+maven.java.net
8079

8180
# Note: the release process may use ssh key to interact with the SCM. If so, it will use your user.name as define in the release profile of your settings.xml.
8281
# Be sure to have your ssh public key exported in your java.net account.
@@ -85,5 +84,5 @@ ARGS=" $*"
8584
# everything supplied as argument will be provided to every maven command.
8685
# e.g to supply -Dmaven.skip.test or -Dmaven.repo.local=/path/to/repo
8786

88-
mvn -B -e release:prepare -DpreparationGoals="'install' $ARGS" $ARGS -Prelease
89-
mvn -B -e release:perform -Dgoals="'deploy' $ARGS" $ARGS -Prelease
87+
mvn -B -e release:prepare -DpreparationGoals="'install' $ARGS" $ARGS -Pjvnet-release,release
88+
mvn -B -e release:perform -Dgoals="'deploy' $ARGS" $ARGS -Pjvnet-release,release

0 commit comments

Comments
 (0)