Skip to content

Commit c8f3c35

Browse files
dezidizondezidizon
authored
Merge pull request #37 from CalSimCalLite/release-iteration5
Release Iteration5 as DWR-EPPT-1.1.1-2019-10-23-225955
2 parents b999ca2 + 3aa606a commit c8f3c35

3,389 files changed

Lines changed: 486410 additions & 5921 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@
55
.idea/workspace.xml
66
.idea/compiler.xml
77
.idea/misc.xml
8-
/*/target/*
8+
/*/target/*
9+
.idea/uiDesigner.xml
10+
eppt-core/logs/callite-debug.log
11+
eppt-ui/logs/callite-debug.log
12+
eppt-trend-reporting/hs_err_pid36188.log
13+
eppt-ui/logs/callite-debug.log
14+
eppt-ui/logs/callite-debug.log
15+
eppt-ui/logs/callite-debug.log

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jsLibraryMappings.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/uiDesigner.xml‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎application/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>gov.ca.water</groupId>
1919
<artifactId>eppt-parent</artifactId>
20-
<version>1.1.0-SNAPSHOT</version>
20+
<version>1.1.1-SNAPSHOT</version>
2121
<relativePath>../eppt-parent</relativePath>
2222
</parent>
2323

@@ -59,6 +59,11 @@
5959
<artifactId>eppt-jasper-engine</artifactId>
6060
<version>${project.version}</version>
6161
</dependency>
62+
<dependency>
63+
<groupId>${project.groupId}</groupId>
64+
<artifactId>eppt-trend-reporting</artifactId>
65+
<version>${project.version}</version>
66+
</dependency>
6267
<!-- NbModuleSuite functional in RELEASE70 or later: -->
6368
<dependency>
6469
<groupId>org.netbeans.api</groupId>
@@ -212,7 +217,9 @@
212217
<target>
213218
<unzip src="${project.build.directory}\jre-1.8.0_202.zip" dest="${project.build.directory}\dwr_eppt\jre"/>
214219
<copy file="${project.basedir}/src/EPPT.exe" todir="${project.build.directory}\dwr_eppt"/>
215-
<move file="${project.build.directory}\dwr_eppt" tofile="${project.build.directory}\${zip-dist-name}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-${maven.build.timestamp}"/>
220+
<copy todir="${project.build.directory}\${zip-dist-name}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-${maven.build.timestamp}">
221+
<fileset dir="${project.build.directory}\dwr_eppt"/>
222+
</copy>
216223
<exec executable="cmd">
217224
<arg value="/c"/>
218225
<arg value="C:\Program Files\7-Zip\7z.exe"/>

‎branding/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>gov.ca.water</groupId>
1919
<artifactId>eppt-parent</artifactId>
20-
<version>1.1.0-SNAPSHOT</version>
20+
<version>1.1.1-SNAPSHOT</version>
2121
<relativePath>../eppt-parent</relativePath>
2222
</parent>
2323

‎branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#
1010
# GNU General Public License
1111
#
12-
currentVersion=DWR Enhanced Post Processing Tool v1.1.0
12+
currentVersion=DWR Enhanced Post Processing Tool v1.1.1
1313
LBL_splash_window_title=Starting DWR Enhanced Post Processing Tool
1414
SPLASH_HEIGHT=511
1515
SPLASH_WIDTH=942

‎branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
#
1010
# GNU General Public License
1111
#
12-
CTL_MainWindow_Title=DWR Enhanced Post Processing Tool v1.1.0
13-
CTL_MainWindow_Title_No_Project=DWR Enhanced Post Processing Tool v1.1.0
12+
CTL_MainWindow_Title=DWR Enhanced Post Processing Tool v1.1.1
13+
CTL_MainWindow_Title_No_Project=DWR Enhanced Post Processing Tool v1.1.1

‎branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
#
1010
# GNU General Public License
1111
#
12-
LBL_ProductInformation=DWR Enhanced Post Processing Tool v1.1.0
12+
LBL_ProductInformation=DWR Enhanced Post Processing Tool v1.1.1
1313
LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE', Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Copyright &copy; 2019 <br/>California Department of Water Resources<br/>All Rights Reserved. DWR PROPRIETARY/CONFIDENTIAL. <br/>Source may not be released without written approval from DWR</div>

‎eppt-calsim-gui/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>gov.ca.water</groupId>
2020
<artifactId>eppt-parent</artifactId>
21-
<version>1.1.0-SNAPSHOT</version>
21+
<version>1.1.1-SNAPSHOT</version>
2222
<relativePath>../eppt-parent</relativePath>
2323
</parent>
2424
<artifactId>eppt-calsim-gui</artifactId>

0 commit comments

Comments
 (0)