Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

contribution 행사 전 병합 #106

Merged
merged 1 commit into from
Jul 12, 2024
Merged

contribution 행사 전 병합 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 표준프레임워크 개발환경 4.1.0 (egovframe-development)
# 표준프레임워크 개발환경 4.2.0 (egovframe-development)

![Eclipse](https://img.shields.io/badge/Eclipse-FE7A16.svg?style=for-the-badge&logo=Eclipse&logoColor=white)
![java](https://img.shields.io/badge/java-007396?style=for-the-badge&logo=JAVA&logoColor=white)
Expand Down
2 changes: 1 addition & 1 deletion egovframeowk.target/egovframework target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<locations>
<location id="org.eclipse.rcp" path="${eclipse_home}" type="Feature"/>
<location path="${workspace_loc}" type="Directory"/>
<location path="E:\eclipse-jee-2022-03-R-win32-x86_64-RCP-TEST\eclipse" type="Directory"/>
<location path="C:\eclipse-jee-2022-12-R-win32-x86_64-RCP-TEST\eclipse" type="Directory"/>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_45"/>
</target>
8 changes: 4 additions & 4 deletions egovframework.bdev.imp.batch/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eGovFramework Batch
Bundle-SymbolicName: egovframework.bdev.imp.batch;singleton:=true
Bundle-Version: 4.1.0.qualifier
Bundle-Version: 4.2.0.qualifier
Bundle-Activator: egovframework.bdev.imp.batch.EgovBatchPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui.ide,
egovframework.dev.imp.core;bundle-version="4.1.0",
egovframework.bdev.imp.confmngt;bundle-version="4.1.0",
egovframework.bdev.imp.ide;bundle-version="4.1.0",
egovframework.dev.imp.core;bundle-version="4.2.0",
egovframework.bdev.imp.confmngt;bundle-version="4.2.0",
egovframework.bdev.imp.ide;bundle-version="4.2.0",
org.eclipse.jdt.ui,
org.eclipse.jdt.core,
org.eclipse.search
Expand Down
383 changes: 0 additions & 383 deletions egovframework.bdev.imp.batch/bin/egovframework/bdev/imp/batch/common/messages.properties
View file
Open in desktop

This file was deleted.

383 changes: 0 additions & 383 deletions egovframework.bdev.imp.batch/bin/egovframework/bdev/imp/batch/common/messages_ko.properties
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions egovframework.bdev.imp.batchnature/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eGovFramework Batch Nature
Bundle-SymbolicName: egovframework.bdev.imp.batchnature;singleton:=true
Bundle-Version: 4.1.0.qualifier
Bundle-Version: 4.2.0.qualifier
Bundle-Activator: egovframework.bdev.imp.batchnature.EgovBatchNaturePlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jdt.core,
org.eclipse.core.expressions,
org.eclipse.search,
egovframework.dev.imp.core;bundle-version="4.1.0",
egovframework.bdev.imp.ide;bundle-version="4.1.0"
egovframework.dev.imp.core;bundle-version="4.2.0",
egovframework.bdev.imp.ide;bundle-version="4.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: MOIS
Expand Down
Binary file modified egovframework.bdev.imp.batchnature/examples/pomFile.zip
View file
Open in desktop
Binary file not shown.
72 changes: 22 additions & 50 deletions egovframework.bdev.imp.batchnature/examples/pomFile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>eGovframeBatch</groupId>
<artifactId>eGovframeBatch.example</artifactId>
<packaging>jar</packaging>
<version>4.1.0</version>
<version>4.2.0</version>
<name>eGovframeBatch.pom</name>
<url>http://www.egovframe.go.kr</url>

Expand All @@ -17,9 +17,9 @@
</licenses>

<properties>
<spring.maven.artifact.version>5.3.20</spring.maven.artifact.version>
<org.egovframe.rte.version>4.1.0</org.egovframe.rte.version>
<batch.maven.artifact.version>4.3.6</batch.maven.artifact.version>
<spring.maven.artifact.version>5.3.27</spring.maven.artifact.version>
<org.egovframe.rte.version>4.2.0</org.egovframe.rte.version>
<batch.maven.artifact.version>4.3.8</batch.maven.artifact.version>
</properties>

<repositories>
Expand Down Expand Up @@ -48,7 +48,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.0</version>
<version>2.7.12</version>
</parent>

<dependencies>
Expand All @@ -57,6 +57,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -104,39 +110,34 @@
<artifactId>org.egovframe.rte.fdl.property</artifactId>
<version>${org.egovframe.rte.version}</version>
</dependency>
<dependency>
<groupId>org.egovframe.rte</groupId>
<artifactId>org.egovframe.rte.itl.integration</artifactId>
<version>${org.egovframe.rte.version}</version>
</dependency>

<!-- For Testing -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.maven.artifact.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

<!-- Persistence 추가 -->
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>2.2</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.2</version>
</dependency>

<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.2</version>
<version>2.7.2</version>
<classifier>jdk8</classifier>
</dependency>

<dependency>
Expand All @@ -145,12 +146,6 @@
<version>3.5</version>
</dependency>

<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>com.googlecode.log4jdbc</groupId>
<artifactId>log4jdbc</artifactId>
Expand All @@ -166,13 +161,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.9.0</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.29</version>
<version>8.0.33</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -232,33 +226,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>hibernate3-maven-plugin</artifactId>
<version>3.0</version>
<configuration>
<components>
<component>
<name>hbm2ddl</name>
<implementation>annotationconfiguration</implementation>
</component>
</components>
</configuration>
<dependencies>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.2</version>
</dependency>
</dependencies>
</plugin>
<!-- EMMA -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -269,7 +243,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.17.0</version>
<version>3.21.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -278,7 +252,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<skipTests>false</skipTests>
<forkMode>once</forkMode>
Expand All @@ -301,7 +274,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
</plugin>
</plugins>
</build>
Expand All @@ -311,7 +283,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.4</version>
<reportSets>
<reportSet>
<id>sunlink</id>
Expand Down
16 changes: 8 additions & 8 deletions ...dev.imp.batchnature/src/egovframework/bdev/imp/batchnature/util/HandlePomXMLFileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ private static void modifyPom(IFile actualFile, IProject project) {
Node oriVersion = XmlUtil.getNode(oriDependency, "./version");

// 현재 3.1.0 버전의 eGovBatch 적용 (2017.07.05 sh.jang)
if (oriVersion != null && !oriVersion.getFirstChild().getNodeValue().equals("3.1.0")) {
oriVersion.getFirstChild().setNodeValue("3.1.0");
if (oriVersion != null && !oriVersion.getFirstChild().getNodeValue().equals("4.2.0")) {
oriVersion.getFirstChild().setNodeValue("4.2.0");
}
}

Expand All @@ -152,27 +152,27 @@ private static void modifyPom(IFile actualFile, IProject project) {
}
}

// 3.1 batch 적용 (2017.07.04 sh.jang)
// 4.2 batch 적용 (2017.07.04 sh.jang)
if (eGovBatchNoExist) {
String xmlStr = "<dependency>" + "\n\t\t\t<groupId>" + "egovframework.rte" + "</groupId>"
+ "\n\t\t\t<artifactId>" + "egovframework.rte.bat.core" + "</artifactId>"
+ "\n\t\t\t<version>" + "4.1.0" + "</version>\n\t\t" + "</dependency>" + "\n ";
String xmlStr = "<dependency>" + "\n\t\t\t<groupId>" + "org.egovframe.rte" + "</groupId>"
+ "\n\t\t\t<artifactId>" + "org.egovframe.rte.bat.core" + "</artifactId>"
+ "\n\t\t\t<version>" + "4.2.0" + "</version>\n\t\t" + "</dependency>" + "\n ";

XmlUtil.addFirstNode(rootNode, "/project/dependencies", xmlStr, "\n\t\t", "\t");
}

if (springBatchInfraNoExist) {
String xmlStr = "<dependency>" + "\n\t\t\t<groupId>" + "org.springframework.batch" + "</groupId>"
+ "\n\t\t\t<artifactId>" + "spring-batch-infrastructure" + "</artifactId>"
+ "\n\t\t\t<version>" + "4.3.6.RELEASE" + "</version>\n\t\t" + "</dependency>" + "\n ";
+ "\n\t\t\t<version>" + "4.3.8.RELEASE" + "</version>\n\t\t" + "</dependency>" + "\n ";

XmlUtil.addFirstNode(rootNode, "/project/dependencies", xmlStr, "\n\t\t", "\t");
}

if (springBatchCoreNoExist) {
String xmlStr = "<dependency>" + "\n\t\t\t<groupId>" + "org.springframework.batch" + "</groupId>"
+ "\n\t\t\t<artifactId>" + "spring-batch-core" + "</artifactId>" + "\n\t\t\t<version>"
+ "4.3.6.RELEASE" + "</version>\n\t\t" + "</dependency>" + "\n ";
+ "4.3.8.RELEASE" + "</version>\n\t\t" + "</dependency>" + "\n ";

XmlUtil.addFirstNode(rootNode, "/project/dependencies", xmlStr, "\n\t\t", "\t");
}
Expand Down
4 changes: 2 additions & 2 deletions egovframework.bdev.imp.confmngt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eGovFramework Batch Confmngt
Bundle-SymbolicName: egovframework.bdev.imp.confmngt; singleton:=true
Bundle-Version: 4.1.0.qualifier
Bundle-Version: 4.2.0.qualifier
Bundle-Activator: egovframework.bdev.imp.confmngt.EgovBatchConfMngtPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
egovframework.dev.imp.core;bundle-version="4.1.0",
egovframework.dev.imp.core;bundle-version="4.2.0",
org.eclipse.jdt.ui,
org.eclipse.jdt.core,
org.eclipse.core.resources
Expand Down
81 changes: 0 additions & 81 deletions ...ramework.bdev.imp.confmngt/bin/egovframework/bdev/imp/confmngt/common/messages.properties
View file
Open in desktop

This file was deleted.

Loading
Loading