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

Jump to bottom

Lps 148497 #114098

Closed
wants to merge 5 commits into from
Closed

Lps 148497 #114098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
add0eff
LPS-148497 Move tagsoup to portal-tika
shuyangzhou Feb 28, 2022
039b7f0
LPS-148497 Remove from git ignore
shuyangzhou Mar 1, 2022
ca861a6
LPS-148497 Remove from IDE files
shuyangzhou Mar 1, 2022
00e4fff
LPS-148497 Remove from lib versions
shuyangzhou Mar 1, 2022
7c37c94
LPS-148497 ant build-lib-versions
shuyangzhou Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@
<classpathentry kind="lib" path="lib/portal/stax.jar"/>
<classpathentry kind="lib" path="lib/portal/stax-ex.jar"/>
<classpathentry kind="lib" path="lib/portal/streambuffer.jar"/>
<classpathentry kind="lib" path="lib/portal/tagsoup.jar"/>
<classpathentry kind="lib" path="lib/portal/tomcat-jdbc.jar"/>
<classpathentry kind="lib" path="lib/portal/tomcat-juli.jar"/>
<classpathentry kind="lib" path="lib/portal/transaction.jar"/>
Expand Down
1 change: 0 additions & 1 deletion lib/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@
/portal/stax-ex.jar
/portal/stax.jar
/portal/streambuffer.jar
/portal/tagsoup.jar
/portal/tomcat-jdbc.jar
/portal/tomcat-juli.jar
/portal/transaction.jar
Expand Down
1 change: 0 additions & 1 deletion lib/portal/dependencies.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ spring-webmvc=org.springframework:spring-webmvc:5.2.10.RELEASE
stax-ex=org.jvnet.staxex:stax-ex:1.2
stax=stax:stax-api:1.0.1
streambuffer=com.sun.xml.stream.buffer:streambuffer:0.9
tagsoup=org.ccil.cowan.tagsoup:tagsoup:1.2.1
tomcat-jdbc=org.apache.tomcat:tomcat-jdbc:9.0.56
tomcat-juli=org.apache.tomcat:tomcat-juli:9.0.56
transaction=javax.transaction:javax.transaction-api:1.3
Expand Down
28 changes: 14 additions & 14 deletions lib/versions-complete.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4008,7 +4008,7 @@
</library>
<library>
<file-name>com.liferay.portal.store.gcs.jar!protobuf-java-util.jar</file-name>
<version>3.15.6</version>
<version>3.16.1</version>
<project-name>Protocol Buffers [Util]</project-name>
<project-url>https://developers.google.com/protocol-buffers/</project-url>
<licenses>
Expand All @@ -4020,7 +4020,7 @@
</library>
<library>
<file-name>com.liferay.portal.store.gcs.jar!protobuf-java.jar</file-name>
<version>3.15.6</version>
<version>3.16.1</version>
<project-name>Protocol Buffers [Core]</project-name>
<project-url>https://developers.google.com/protocol-buffers/</project-url>
<licenses>
Expand Down Expand Up @@ -4338,6 +4338,18 @@
</license>
</licenses>
</library>
<library>
<file-name>com.liferay.portal.tika.jar!tagsoup.jar</file-name>
<version>1.2.1</version>
<project-name>TagSoup</project-name>
<project-url>http://home.ccil.org/~cowan/XML/tagsoup/</project-url>
<licenses>
<license>
<license-name>Apache License 2.0</license-name>
<license-url>http://www.apache.org/licenses/LICENSE-2.0.txt</license-url>
</license>
</licenses>
</library>
<library>
<file-name>com.liferay.portal.tika.jar!tika-core.jar</file-name>
<version>1.26</version>
Expand Down Expand Up @@ -7614,18 +7626,6 @@
</license>
</licenses>
</library>
<library>
<file-name>lib/portal/tagsoup.jar</file-name>
<version>1.2.1</version>
<project-name>TagSoup</project-name>
<project-url>http://home.ccil.org/~cowan/XML/tagsoup</project-url>
<licenses>
<license>
<license-name>Apache License 2.0</license-name>
<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
</license>
</licenses>
</library>
<library>
<file-name>lib/portal/tomcat-jdbc.jar</file-name>
<version>9.0.56</version>
Expand Down
12 changes: 0 additions & 12 deletions lib/versions-ext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2268,18 +2268,6 @@
</license>
</licenses>
</library>
<library>
<file-name>lib/portal/tagsoup.jar</file-name>
<version>1.2.1</version>
<project-name>TagSoup</project-name>
<project-url>http://home.ccil.org/~cowan/XML/tagsoup</project-url>
<licenses>
<license>
<license-name>Apache License 2.0</license-name>
<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
</license>
</licenses>
</library>
<library>
<file-name>lib/portal/tomcat-jdbc.jar</file-name>
<version>9.0.56</version>
Expand Down
14 changes: 7 additions & 7 deletions lib/versions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,12 +1747,12 @@
</td><td></td>
</tr>
<tr>
<td nowrap="nowrap">com.liferay.portal.store.gcs.jar!protobuf-java-util.jar</td><td nowrap="nowrap">3.15.6</td><td nowrap="nowrap"><a href="https://developers.google.com/protocol-buffers/">Protocol Buffers [Util]</a></td><td nowrap><a href="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</a>
<td nowrap="nowrap">com.liferay.portal.store.gcs.jar!protobuf-java-util.jar</td><td nowrap="nowrap">3.16.1</td><td nowrap="nowrap"><a href="https://developers.google.com/protocol-buffers/">Protocol Buffers [Util]</a></td><td nowrap><a href="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</a>
<br>
</td><td></td>
</tr>
<tr>
<td nowrap="nowrap">com.liferay.portal.store.gcs.jar!protobuf-java.jar</td><td nowrap="nowrap">3.15.6</td><td nowrap="nowrap"><a href="https://developers.google.com/protocol-buffers/">Protocol Buffers [Core]</a></td><td nowrap><a href="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</a>
<td nowrap="nowrap">com.liferay.portal.store.gcs.jar!protobuf-java.jar</td><td nowrap="nowrap">3.16.1</td><td nowrap="nowrap"><a href="https://developers.google.com/protocol-buffers/">Protocol Buffers [Core]</a></td><td nowrap><a href="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</a>
<br>
</td><td></td>
</tr>
Expand Down Expand Up @@ -1887,6 +1887,11 @@
</td><td></td>
</tr>
<tr>
<td nowrap="nowrap">com.liferay.portal.tika.jar!tagsoup.jar</td><td nowrap="nowrap">1.2.1</td><td nowrap="nowrap"><a href="http://home.ccil.org/~cowan/XML/tagsoup/">TagSoup</a></td><td nowrap><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License 2.0</a>
<br>
</td><td></td>
</tr>
<tr>
<td nowrap="nowrap">com.liferay.portal.tika.jar!tika-core.jar</td><td nowrap="nowrap">1.26</td><td nowrap="nowrap"><a href="http://tika.apache.org/">Apache Tika core</a></td><td nowrap><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>
<br>
</td><td></td>
Expand Down Expand Up @@ -3335,11 +3340,6 @@
</td><td></td>
</tr>
<tr>
<td nowrap="nowrap">lib/portal/tagsoup.jar</td><td nowrap="nowrap">1.2.1</td><td nowrap="nowrap"><a href="http://home.ccil.org/~cowan/XML/tagsoup">TagSoup</a></td><td nowrap><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
<br>
</td><td></td>
</tr>
<tr>
<td nowrap="nowrap">lib/portal/tomcat-jdbc.jar</td><td nowrap="nowrap">9.0.56</td><td nowrap="nowrap"><a href="http://tomcat.apache.org">Tomcat</a></td><td nowrap><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
<br>
</td><td></td>
Expand Down
1 change: 1 addition & 0 deletions modules/apps/portal/portal-tika/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies {
compileInclude group: "org.apache.poi", name: "poi-scratchpad", version: "4.1.2"
compileInclude group: "org.apache.tika", name: "tika-core", version: "1.26"
compileInclude group: "org.apache.tika", name: "tika-parsers", version: "1.26"
compileInclude group: "org.ccil.cowan.tagsoup", name: "tagsoup", version: "1.2.1"
compileInclude group: "org.gagravarr", name: "vorbis-java-core", version: "0.8"
compileInclude group: "org.tallison", name: "jmatio", version: "1.2"

Expand Down
1 change: 0 additions & 1 deletion nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ javac.classpath=\
lib/portal/stax-ex.jar:\
lib/portal/stax.jar:\
lib/portal/streambuffer.jar:\
lib/portal/tagsoup.jar:\
lib/portal/tomcat-jdbc.jar:\
lib/portal/tomcat-juli.jar:\
lib/portal/transaction.jar:\
Expand Down