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

Commit 9c12e71

Browse files
markxnelsonmarkxnelson
authored
Merge pull request #2 from oracle/fix-deps
fix dependencies and prepare for 0.1 release
2 parents 3d2fe0d + 8e9956c commit 9c12e71

File tree

19 files changed

+465
-484
lines changed

19 files changed

+465
-484
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
target
2+
.idea
3+
*iml

‎CONTRIBUTING.md‎

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
1-
---
2-
3-
---
4-
5-
# Source Code Submissions
6-
We welcome your contributions and look forward to collaborating with you. We can only accept source code repository
7-
submissions from users who have signed and returned the Oracle
8-
Contributor Agreement. You will find details and the agreement to sign at this OTN web page:
9-
[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html).
10-
11-
# Other Contributions
12-
For all project Submissions other than source code repository contributions, the following also applies: Oracle does
13-
not claim ownership of Your Submissions. However, in order to fulfill
14-
the purposes of this project, You must give Oracle and all Users
15-
the right to post, access, discuss, use, publish, disseminate, and refine
16-
Your Submissions.
17-
18-
In legalese: *You hereby grant to Oracle and all
19-
Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive,
20-
and fully sub-licensable right and license, under Your intellectual
21-
property rights, to reproduce, modify, adapt, publish, translate, create
22-
derivative works from, distribute, perform, display, and use Your
23-
Submissions (in whole or part) and to incorporate or implement them in
24-
other works in any form, media, or technology now known or later
25-
developed, all subject to the obligation to retain any copyright notices
26-
included in Your Submissions. All Users, Oracle, and their
27-
sublicensees are responsible for any modifications they make to the
28-
Submissions of others.*
29-
30-
Copyright © 2017 Oracle and/or its affiliates. All rights reserved.
1+
# Contributing
2+
3+
Oracle welcomes contributions to this repository from anyone.
4+
5+
If you want to submit a pull request to fix a bug or enhance an existing
6+
feature, please first open an issue and link to that issue when you
7+
submit your pull request.
8+
9+
If you have any questions about a possible submission, feel free to open
10+
an issue too.
11+
12+
## Contributing to the WebLogic Logging Exporter repository
13+
14+
Pull requests can be made under
15+
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
16+
17+
For pull requests to be accepted, the bottom of your commit message must have
18+
the following line using your name and e-mail address as it appears in the
19+
OCA Signatories list.
20+
21+
```
22+
Signed-off-by: Your Name <you@example.org>
23+
```
24+
25+
This can be automatically added to pull requests by committing with:
26+
27+
```
28+
git commit --signoff
29+
```
30+
31+
Only pull requests from committers that can be verified as having
32+
signed the OCA can be accepted.
33+
34+
### Pull request process
35+
36+
1. Fork this repository
37+
1. Create a branch in your fork to implement the changes. We recommend using
38+
the issue number as part of your branch name, e.g. `1234-fixes`
39+
1. Ensure that any documentation is updated with the changes that are required
40+
by your fix.
41+
1. Ensure that any samples are updated if the base image has been changed.
42+
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
43+
what your changes are meant to do and provide simple steps on how to validate
44+
your changes. Ensure that you reference the issue you created as well.
45+
We will assign the pull request to 2-3 people for review before it is merged.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ If needed, specify the `proxies` that are required.
125125

126126
#### 3. Clone the project and build it.
127127
```
128-
git clone git@orahub.oraclecorp.com:derek.sharpe/wls-logging-exporter.git
128+
git clone git@orahub.oraclecorp.com:oracle/wls-logging-exporter.git
129129
mvn install
130130
```
131131

@@ -142,4 +142,4 @@ Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c6
142142

143143
## License
144144

145-
This project is licensed under the [_Oracle Universal Permissive License, Version 1.0_](http://oss.oracle.com/licenses/upl)
145+
This project is licensed under the [_Universal Permissive License, Version 1.0_](http://oss.oracle.com/licenses/upl)

‎TEST/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎TEST/pom.xml‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎TEST/src/test/java/weblogic/logging/exporter/config/MapUtilsTest.java‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎TEST/test.jar‎

-2.1 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<groupId>oracle.kubernetes</groupId>
88
<artifactId>weblogic-logging-exporter</artifactId>
99
<packaging>jar</packaging>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>0.1-SNAPSHOT</version>
1111

1212
<name>WebLogic Logging Exporter</name>
13-
<description>An exporter that integrates WLS logs into ElasticSearch and Kibana </description>
13+
<description>An exporter that integrates WLS logs into ElasticSearch and Kibana</description>
1414

15-
<url>https://orahub.oraclecorp.com/derek.sharpe/wls-logging-exporter</url>
15+
<url>https://orahub.oraclecorp.com/oracle/wls-logging-exporter</url>
1616
<inceptionYear>2018</inceptionYear>
1717
<licenses>
1818
<license>
@@ -51,6 +51,19 @@
5151
<target>1.8</target>
5252
</configuration>
5353
</plugin>
54+
<plugin>
55+
<groupId>com.coveo</groupId>
56+
<artifactId>fmt-maven-plugin</artifactId>
57+
<version>2.4.0</version>
58+
<executions>
59+
<execution>
60+
<phase>test</phase>
61+
<goals>
62+
<goal>check</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
</plugin>
5467
</plugins>
5568
</build>
5669

@@ -63,56 +76,50 @@
6376
</dependency>
6477
<dependency>
6578
<groupId>com.oracle.weblogic</groupId>
66-
<artifactId>com-oracle-weblogic-logging</artifactId>
67-
<version>12.2.1-1921971</version>
79+
<artifactId>com.oracle.weblogic.logging</artifactId>
80+
<version>12.2.1-3-0</version>
6881
<scope>provided</scope>
6982
</dependency>
7083
<dependency>
7184
<groupId>com.oracle.weblogic</groupId>
72-
<artifactId>com-bea-core-logging</artifactId>
73-
<version>12.2.1-1921971</version>
85+
<artifactId>com.bea.core.logging</artifactId>
86+
<version>12.2.1-3-0</version>
7487
<scope>provided</scope>
7588
</dependency>
7689
<dependency>
7790
<groupId>com.oracle.weblogic</groupId>
78-
<artifactId>com-bea-core-diagnostics-logging</artifactId>
79-
<version>3.1.0.0-1935420.1783</version>
91+
<artifactId>com.bea.core.diagnostics.logging</artifactId>
92+
<version>12.2.1-3-0</version>
8093
<scope>provided</scope>
8194
</dependency>
8295
<dependency>
8396
<groupId>com.oracle.weblogic</groupId>
84-
<artifactId>com-bea-core-i18n</artifactId>
85-
<version>3.0.0.0-1933919.1781</version>
97+
<artifactId>com.bea.core.i18n</artifactId>
98+
<version>12.2.1-3-0</version>
8699
<scope>provided</scope>
87100
</dependency>
88101
<dependency>
89102
<groupId>com.oracle.weblogic</groupId>
90-
<artifactId>com-bea-core-diagnostics-query</artifactId>
91-
<version>4.0.0.0-1933804.1780</version>
103+
<artifactId>com.bea.core.diagnostics.query</artifactId>
104+
<version>12.2.1-3-0</version>
92105
<scope>provided</scope>
93106
</dependency>
94107
<dependency>
95-
<groupId>junit</groupId>
96-
<artifactId>junit</artifactId>
97-
<version>4.12</version>
98-
<scope>test</scope>
108+
<groupId>junit</groupId>
109+
<artifactId>junit</artifactId>
110+
<version>4.13-beta-2</version>
111+
<scope>test</scope>
99112
</dependency>
100113
<dependency>
101114
<groupId>org.hamcrest</groupId>
102115
<artifactId>hamcrest-junit</artifactId>
103116
<version>2.0.0.0</version>
104117
<scope>test</scope>
105118
</dependency>
106-
<dependency>
107-
<groupId>com.meterware.simplestub</groupId>
108-
<artifactId>simplestub</artifactId>
109-
<version>1.2.8</version>
110-
<scope>test</scope>
111-
</dependency>
112119
<dependency>
113120
<groupId>org.yaml</groupId>
114121
<artifactId>snakeyaml</artifactId>
115-
<version>1.19</version>
122+
<version>1.23</version>
116123
</dependency>
117124
</dependencies>
118125
</project>

‎samples/run-elk-local.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
docker run -d \
3+
--name elasticsearch \
4+
-p 9200:9200 \
5+
-p 9300:9300 \
6+
-e "discovery.type=single-node" \
7+
docker.elastic.co/elasticsearch/elasticsearch:6.2.2
8+
9+
docker run -d \
10+
--name kibana \
11+
-p 5601:5601 \
12+
--link elasticsearch:elasticsearch \
13+
-e "ELASTICSEARCH_URL=http://elasticsearch:9200" \
14+
docker.elastic.co/kibana/kibana:6.2.2

0 commit comments

Comments
 (0)