Skip to content

Commit

Permalink
Merge pull request #1 from gs-rezaem/master
Browse files Browse the repository at this point in the history
prepare ossrh release
  • Loading branch information
motlin authored Sep 13, 2016
2 parents b05fcf2 + 563b11c commit e7377ac
Show file tree
Hide file tree
Showing 11 changed files with 537 additions and 145 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ reladomogen/target/**
reladomogenutil/target/**
reladomogs/target/**
reladomogsi/target/**
reladomoui/target/**
reladomoui/target/**
.idea/**
reladomo.iml
target/**
368 changes: 285 additions & 83 deletions build/build.xml

Large diffs are not rendered by default.

43 changes: 0 additions & 43 deletions build/pom-templates/pom-mithragen.xml

This file was deleted.

66 changes: 66 additions & 0 deletions build/pom-templates/pom-reladomo-gen-util.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright 2016 Goldman Sachs.
Licensed 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.
-->

<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">

<modelVersion>4.0.0</modelVersion>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomo-gen-util</artifactId>
<version>@reladomo.version@</version>
<packaging>bundle</packaging>

<name>Reladomo Generator Utilities</name>
<description>Reladomo generator utilities for creating for round trip ddl/xml generation.</description>
<url>https://github.com/goldmansachs/reladomo</url>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>Mohammad Rezaei</name>
<email>mohammad.rezaei@gs.com</email>
<organization>Goldman Sachs</organization>
</developer>
</developers>

<scm>
<url>https://github.com/goldmansachs/reladomo</url>
<connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
<developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
</scm>

<dependencies>
<dependency>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomo</artifactId>
<version>@reladomo.version@</version>
</dependency>

<dependency>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomogen</artifactId>
<version>@reladomo.version@</version>
</dependency>
</dependencies>
</project>
66 changes: 66 additions & 0 deletions build/pom-templates/pom-reladomo-test-util.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright 2016 Goldman Sachs.
Licensed 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.
-->

<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">

<modelVersion>4.0.0</modelVersion>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomo-test-util</artifactId>
<version>@reladomo.version@</version>
<packaging>bundle</packaging>

<name>Reladomo Test Utilities</name>
<description>Reladomo test utilities faciliate writing tests for projects using Reladomo.</description>
<url>https://github.com/goldmansachs/reladomo</url>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>Mohammad Rezaei</name>
<email>mohammad.rezaei@gs.com</email>
<organization>Goldman Sachs</organization>
</developer>
</developers>

<scm>
<url>https://github.com/goldmansachs/reladomo</url>
<connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
<developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
</scm>

<dependencies>
<dependency>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomo</artifactId>
<version>@reladomo.version@</version>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.169</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,66 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>com.gs.mithra</groupId>
<artifactId>mithra</artifactId>
<version>@mithra.version@</version>
<packaging>jar</packaging>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomo</artifactId>
<version>@reladomo.version@</version>
<packaging>bundle</packaging>

<name>Reladomo</name>
<description>Reladomo is an object-relational mapping framework.</description>
<url>https://github.com/goldmansachs/reladomo</url>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>Mohammad Rezaei</name>
<email>mohammad.rezaei@gs.com</email>
<organization>Goldman Sachs</organization>
</developer>
</developers>

<scm>
<url>https://github.com/goldmansachs/reladomo</url>
<connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
<developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
</scm>

<dependencies>

<dependency>
<groupId>com.goldmansachs</groupId>
<artifactId>gs-collections-api</artifactId>
<version>@gs-collections.version@</version>
<version>5.1.0</version>
</dependency>

<dependency>
<groupId>com.goldmansachs</groupId>
<artifactId>gs-collections</artifactId>
<version>@gs-collections.version@</version>
<version>5.1.0</version>
</dependency>

<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.2</version>
<version>2.9.4</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>@slf4j.version@</version>
<version>1.7.21</version>
</dependency>
</dependencies>
</project>
61 changes: 61 additions & 0 deletions build/pom-templates/pom-reladomogen.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright 2016 Goldman Sachs.
Licensed 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.
-->

<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">

<modelVersion>4.0.0</modelVersion>
<groupId>com.goldmansachs.reladomo</groupId>
<artifactId>reladomogen</artifactId>
<version>@reladomo.version@</version>
<packaging>bundle</packaging>

<name>Reladomo Generator</name>
<description>Reladomo generator is responsible for generating abstract classes used by Reladomo objects.</description>
<url>https://github.com/goldmansachs/reladomo</url>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>Mohammad Rezaei</name>
<email>mohammad.rezaei@gs.com</email>
<organization>Goldman Sachs</organization>
</developer>
</developers>

<scm>
<url>https://github.com/goldmansachs/reladomo</url>
<connection>scm:git:https://github.com/goldmansachs/reladomo.git</connection>
<developerConnection>scm:git:https://github.com/goldmansachs/reladomo.git</developerConnection>
</scm>

<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion build/reladomolib.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ central,com.goldmansachs,gs-collections,5.1.0,jar,lib/compile,07114C5349C816EA64
central,joda-time,joda-time,2.9.4,jar,lib/compile,1C295B462F16702EBE720BBB08F62E1BA80DA41B
central,org.apache.geronimo.specs,geronimo-jta_1.1_spec,1.1.1,jar,lib/compile,AABAB3165B8EA936B9360ABBF448459C0D04A5A4
central,org.slf4j,slf4j-api,1.7.21,jar,lib/compile,139535A69A4239DB087DE9BAB0BEE568BF8E0B70
central,log4j,log4j,1.2.17,jar,lib/compile,5AF35056B4D257E4B64B9E8069C0746E8B08629F

# test libs:
central,log4j,log4j,1.2.17,jar,lib/test,5AF35056B4D257E4B64B9E8069C0746E8B08629F
central,org.slf4j,slf4j-log4j12,1.7.21,jar,lib/test,7238B064D1ABA20DA2AC03217D700D91E02460FA
central,org.slf4j,jcl-over-slf4j,1.7.21,jar,lib/test,331B564A3A42F002A0004B039C1C430DA89062CD
central,org.apache.geronimo.specs,geronimo-jms_1.1_spec,1.1.1,jar,lib/test,C872B46C601D8DC03633288B81269F9E42762CEA
Expand Down
18 changes: 18 additions & 0 deletions build/sign-release.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
setlocal
cd ../target
gpg -ab reladomo-16.0.0-javadoc.jar
gpg -ab reladomo-16.0.0-sources.jar
gpg -ab reladomo-16.0.0.jar
gpg -ab reladomo-16.0.0.pom
gpg -ab reladomo-gen-util-16.0.0-javadoc.jar
gpg -ab reladomo-gen-util-16.0.0-sources.jar
gpg -ab reladomo-gen-util-16.0.0.jar
gpg -ab reladomo-gen-util-16.0.0.pom
gpg -ab reladomo-test-util-16.0.0-javadoc.jar
gpg -ab reladomo-test-util-16.0.0-sources.jar
gpg -ab reladomo-test-util-16.0.0.jar
gpg -ab reladomo-test-util-16.0.0.pom
gpg -ab reladomogen-16.0.0-javadoc.jar
gpg -ab reladomogen-16.0.0-sources.jar
gpg -ab reladomogen-16.0.0.jar
gpg -ab reladomogen-16.0.0.pom
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,4 @@ public void testClient() throws Exception
MithraRuntimeConfigVerifier verifier = new MithraRuntimeConfigVerifier("reladomo/src/test/resources/MithraConfigClientCache.xml");
verifier.verifyClasses();
}

public void testGsIntegrator() throws Exception
{
MithraRuntimeConfigVerifier verifier = new MithraRuntimeConfigVerifier("reladomo/src/test/resources/MithraConfigGsIntegrator.xml");
verifier.verifyClasses();
}
}

0 comments on commit e7377ac

Please sign in to comment.